wip: non-static protected globals

Author: g105b

composer.json

@@ -33,7 +33,7 @@
 		"phpgt/input": "^1.3",
 		"phpgt/logger": "^1.0",
 		"phpgt/promise": "^2.4",
-		"phpgt/protectedglobal": "^1.1",
+		"phpgt/protectedglobal": "^2.0",
 		"phpgt/routing": "^1.1",
 		"phpgt/server": "^1.1",
 		"phpgt/servicecontainer": "^1.3",

composer.lock

@@ -34,6 +34,7 @@ class Application {
 	private RequestFactory $requestFactory;
 	/** @var array<string, array<string, string|array<string, string>>> */
 	private array $globals;
+	private Protection $globalProtection;
 	private Config $config;
 	private DispatcherFactory $dispatcherFactory;
 	private Dispatcher $dispatcher;
@@ -52,6 +53,7 @@ public function __construct(
 		?DispatcherFactory $dispatcherFactory = null,
 		?array $globals = null,
 		?Closure $handleShutdown = null,
+		?Protection $globalProtection = null,
 	) {
 		$this->gtCompatibility();
 		$this->redirect = $redirect ?? new Redirect();
@@ -71,6 +73,7 @@ public function __construct(
 			"_ENV" => [],
 			"_COOKIE" => [],
 		], $globals ?? $GLOBALS);
+		$this->globalProtection = $globalProtection ?? new Protection();
 		register_shutdown_function($handleShutdown ?? $this->handleShutdown(...));
 	}
 
@@ -191,9 +194,8 @@ class_alias($legacyClass, $class);
 	}
 
 	private function protectGlobals():void {
-		$protection = new Protection();
-		$protection->overrideInternals(
-			$protection->removeGlobals([
+		$this->globalProtection->overrideInternals(
+			$this->globalProtection->removeGlobals([
 				"server" => $this->globals["_SERVER"],
 				"files" => $this->globals["_FILES"],
 				"get" => $this->globals["_GET"],

src/Application.php

@@ -1,5 +1,5 @@
 <?php
-namespace Gt\WebEngine\Dispatch;
+namespace GT\WebEngine\Dispatch;
 
 use Closure;
 use Gt\Config\Config;

src/Dispatch/DispatcherFactory.php

@@ -1,8 +1,12 @@
 <?php
 namespace GT\WebEngine\Test;
 
+use Gt\Http\Request;
 use Gt\Http\RequestFactory;
 use Gt\Http\Response;
+use Gt\Http\ServerRequest;
+use Gt\Http\Uri;
+use Gt\ProtectedGlobal\Protection;
 use GT\WebEngine\Application;
 use GT\WebEngine\Debug\OutputBuffer;
 use GT\WebEngine\Debug\Timer;
@@ -17,8 +21,19 @@ public function testStart_callsRedirectExecute():void {
 		$redirect->expects(self::once())
 			->method("execute");
 
+		$globalProtection = self::createMock(Protection::class);
+		$serverRequest = self::createMock(ServerRequest::class);
+		$serverRequest->method("getUri")
+			->willReturn(self::createMock(Uri::class));
+		$serverRequest->method("getHeaderLine")
+			->willReturn("Accept: text/test");
+		$requestFactory = self::createMock(RequestFactory::class);
+		$requestFactory->method("createServerRequestFromGlobalState")
+			->willReturn($serverRequest);
 		$sut = new Application(
 			redirect: $redirect,
+			requestFactory: $requestFactory,
+			globalProtection: $globalProtection,
 		);
 		$sut->start();
 	}
@@ -45,8 +60,11 @@ public function testStart_callsOutputBufferFunctions():void {
 		$outputBuffer->expects(self::once())
 			->method("debugOutput");
 
+		$globalProtection = self::createMock(Protection::class);
+
 		$sut = new Application(
 			outputBuffer: $outputBuffer,
+			globalProtection: $globalProtection,
 		);
 		$sut->start();
 	}
@@ -87,8 +105,11 @@ public function testStart_callsDispatcherFactoryFunctions():void {
 		$response->expects(self::once())
 			->method("getBody");
 
+		$globalProtection = self::createMock(Protection::class);
+
 		$sut = new Application(
 			dispatcherFactory: $dispatcherFactory,
+			globalProtection: $globalProtection,
 		);
 		$sut->start();
 	}