test: init namespace tests

Author: g105b

composer.lock

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.4/phpunit.xsd"
 	colors="true"
 	cacheDirectory="test/phpunit/.phpunit.cache"
 	bootstrap="vendor/autoload.php"
@@ -18,8 +18,6 @@
 		</testsuite>
 	</testsuites>
 
-	<logging />
-
 	<source>
 		<include>
 			<directory>

phpunit.xml

@@ -2,9 +2,9 @@
 namespace GT\WebEngine\Init;
 
 use Closure;
-use GT\Input\Input;
-use GT\Http\Uri;
-use GT\Http\ServerInfo;
+use Gt\Input\Input;
+use Gt\Http\Uri;
+use Gt\Http\ServerInfo;
 use GT\WebEngine\Dispatch\PathNormaliser;
 
 class RequestInit {

src/Init/RequestInit.php

@@ -51,9 +51,13 @@ public function __construct(
 		);
 		$this->baseRouter->route($request);
 		$viewClass = $this->baseRouter->getViewClass() ?? NullView::class;
+
+		// @codeCoverageIgnoreStart
 		if(str_starts_with($viewClass, "Gt\\")) {
 			$viewClass = str_replace("Gt\\", "GT\\", $viewClass);
 		}
+		// @codeCoverageIgnoreEnd
+
 		$this->view = new $viewClass($response->getBody());
 
 		$this->viewAssembly = $this->baseRouter->getViewAssembly();

src/Init/RouterInit.php

@@ -17,6 +17,8 @@ public function __construct(
 		bool $useTransSid,
 		bool $useCookies,
 		array $currentCookieArray,
+		?SessionSetup $sessionSetup = null,
+		string|Session $sessionClass = Session::class,
 	) {
 		$originalCookie = $_COOKIE;
 		$_COOKIE = $currentCookieArray;
@@ -30,14 +32,21 @@ public function __construct(
 		];
 
 		$sessionId = $_COOKIE[$sessionConfig["name"]] ?? null;
-		$sessionSetup = new SessionSetup();
+		$sessionSetup = $sessionSetup ?? new SessionSetup();
 		$sessionHandler = $sessionSetup->attachHandler($sessionConfig["handler"]);
 
-		$this->session = new Session(
-			$sessionHandler,
-			$sessionConfig,
-			$sessionId,
-		);
+		if($sessionClass instanceof Session) {
+			$this->session = $sessionClass;
+		}
+		else {
+// @codeCoverageIgnoreStart
+			$this->session = new $sessionClass(
+				$sessionHandler,
+				$sessionConfig,
+				$sessionId,
+			);
+// @codeCoverageIgnoreEnd
+		}
 
 		$_COOKIE = $originalCookie;
 	}

src/Init/SessionInit.php

@@ -35,11 +35,13 @@ public function testStart_callsRedirectExecute():void {
 		$requestFactory->method("createServerRequestFromGlobalState")
 			->willReturn($serverRequest);
 		$dispatcher = self::createMock(Dispatcher::class);
+
 		$response = self::createMock(Response::class);
 		$response->method('getStatusCode')->willReturn(200);
 		$response->method('getHeaders')->willReturn(['Content-Type' => ['text/html']]);
 		$response->method('getBody')->willReturn(new \Gt\Http\Stream());
 		$dispatcher->method('generateResponse')->willReturn($response);
+
 		$dispatcherFactory = self::createMock(DispatcherFactory::class);
 		$dispatcherFactory->method('create')->willReturn($dispatcher);
 

test/phpunit/ApplicationTest.php

@@ -0,0 +1,73 @@
+<?php
+namespace GT\WebEngine\Test\Init;
+
+use Closure;
+use Gt\Http\ServerInfo;
+use Gt\Http\Uri;
+use Gt\Input\Input;
+use GT\WebEngine\Init\RequestInit;
+use GT\WebEngine\Dispatch\PathNormaliser;
+use PHPUnit\Framework\TestCase;
+
+class RequestInitTest extends TestCase {
+	public function testConstructor_normalisesPath_andBuildsInputAndServerInfo():void {
+		$pathNormaliser = self::createMock(PathNormaliser::class);
+
+		$uri = self::createMock(Uri::class);
+		$uri->method("getPath")
+			->willReturn("https://example.test/section");
+
+		$forceTrailing = true;
+		$redirectCalled = false;
+		$redirectArg = null;
+		$redirect = function($u) use (&$redirectCalled, &$redirectArg) {
+			$redirectCalled = true;
+			$redirectArg = $u;
+		};
+
+		$pathNormaliser->expects(self::once())
+			->method('normaliseTrailingSlash')
+			->with($uri, $forceTrailing, self::isInstanceOf(Closure::class))
+			->willReturnCallback(function(Uri $u, bool $force, Closure $redirectCallback) {
+				// Call the provided redirect to simulate a normalisation.
+				$redirectCallback($u);
+			});
+
+		$get = ['a' => '1'];
+		$post = ['b' => '2'];
+		$tmp = tempnam(sys_get_temp_dir(), 'upload');
+		file_put_contents($tmp, 'x');
+		$files = [
+			'f' => [
+				'name' => 'x.txt',
+				'type' => 'text/plain',
+				'tmp_name' => $tmp,
+				'error' => 0,
+				'size' => 1,
+			],
+		];
+		$server = ['REQUEST_URI' => '/section'];
+
+		$sut = new RequestInit(
+			$pathNormaliser,
+			$uri,
+			$forceTrailing,
+			$redirect,
+			$get,
+			$post,
+			$files,
+			$server,
+		);
+
+		// Assert redirect path normalisation collaboration occurred
+		self::assertTrue($redirectCalled);
+		self::assertSame($uri, $redirectArg);
+
+		// Call getters to ensure full coverage and type expectations
+		$input = $sut->getInput();
+		$serverInfo = $sut->getServerInfo();
+		self::assertInstanceOf(Input::class, $input);
+		self::assertInstanceOf(ServerInfo::class, $serverInfo);
+		self::assertSame('/section', $serverInfo->getRequestUri()->getPath());
+	}
+}