test: logic namespace tests

Author: g105b

src/Logic/AppAutoloader.php

@@ -1,5 +1,5 @@
 <?php
-namespace Gt\WebEngine\Logic;
+namespace GT\WebEngine\Logic;
 
 /**
  * This autoloader is only necessary if Composer's PSR-4 autoloader isn't set up

src/Logic/LogicExecutor.php

@@ -24,7 +24,7 @@ public function invoke(Assembly $logicAssembly, string $name, array $extraArgs =
 // TODO: Why convert to array?
 		foreach(iterator_to_array($logicAssembly) as $file) {
 			$nsProject = (string)(new LogicProjectNamespace(
-				$file,
+				$this->relativePath($file),
 				$this->appNamespace
 			));
 
@@ -56,8 +56,7 @@ public function invoke(Assembly $logicAssembly, string $name, array $extraArgs =
 
 				foreach($fnReferenceArray as $fnReference) {
 					if(function_exists($fnReference)) {
-						$closure = $fnReference(...);
-						$refFunction = new ReflectionFunction($closure);
+						$refFunction = new ReflectionFunction($fnReference);
 						foreach($refFunction->getAttributes() as $refAttr) {
 							$functionReference .= "#";
 							$functionReference .= $refAttr->getName();
@@ -91,7 +90,40 @@ public function invoke(Assembly $logicAssembly, string $name, array $extraArgs =
 	}
 
 	private function loadLogicFile(string $file):void {
+		// If the target file already declares a namespace, load it directly.
+		// The LogicStreamWrapper injects a namespace for classless scripts, but
+		// passing an already-namespaced file through the wrapper can cause an
+		// extra namespace to be injected which leads to syntax errors when
+		// executing tests in isolation.
+		if($this->fileHasNamespace($file)) {
+			require_once($file);
+			return;
+		}
+
 		$streamPath = LogicStreamWrapper::STREAM_NAME . "://$file";
 		require_once($streamPath);
 	}
+
+	private function fileHasNamespace(string $file):bool {
+		$fh = fopen($file, "r");
+		$maxLines = 50;
+		$read = "";
+		for($i = 0; $i < $maxLines && !feof($fh); $i++) {
+			$read .= fgets($fh);
+		}
+		fclose($fh);
+		return (bool)preg_match('/^\s*namespace\s+[^;]+;/m', $read);
+	}
+
+	private function relativePath(string $path):string {
+		if(!str_starts_with($path, "/") && !preg_match('/^[A-Za-z]:[\\\\\/]/', $path)) {
+			return $path;
+		}
+		$cwd = rtrim(getcwd(), "/");
+		$real = realpath($path) ?: $path;
+		if(str_starts_with($real, $cwd . "/")) {
+			$path = ltrim(substr($real, strlen($cwd) + 1), "/");
+		}
+		return $path;
+	}
 }

src/Logic/LogicProjectNamespace.php

@@ -1,5 +1,5 @@
 <?php
-namespace Gt\WebEngine\Logic;
+namespace GT\WebEngine\Logic;
 
 use Stringable;
 

src/Logic/LogicStreamHandler.php

@@ -2,7 +2,6 @@
 namespace GT\WebEngine\Logic;
 
 use Closure;
-use Gt\Routing\LogicStream\LogicStreamWrapper;
 
 /**
  * Handles the registration of a custom stream wrapper, as defined by the
@@ -13,8 +12,8 @@ class LogicStreamHandler {
 	private Closure $streamWrapperRegisterCallback;
 
 	public function __construct(
-		private readonly string $streamName = LogicStreamWrapper::STREAM_NAME,
-		private readonly string $logicStreamClassName = LogicStreamWrapper::class,
+		private readonly string $streamName = WebEngineLogicStreamWrapper::STREAM_NAME,
+		private readonly string $logicStreamClassName = WebEngineLogicStreamWrapper::class,
 		?Closure $streamWrapperRegisterCallback = null,
 	) {
 		$this->streamWrapperRegisterCallback = $streamWrapperRegisterCallback ??

test/phpunit/Logic/AppAutoloaderTest.php

@@ -2,98 +2,62 @@
 namespace GT\WebEngine\Test\Logic;
 
 use GT\WebEngine\Logic\AppAutoloader;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use PHPUnit\Framework\TestCase;
 
 class AppAutoloaderTest extends TestCase {
-	private string $classDir;
+	private string $cwd;
+	private string $relBaseDir;
 
 	protected function setUp():void {
-		// Use system temporary directory to avoid writing into the project tree.
-		$sysTmp = rtrim(sys_get_temp_dir(), "/\\");
-		$this->classDir = $sysTmp . "/phpgt-webengine-test--Logic-AppAutoloader-" . uniqid();
-		@mkdir($this->classDir, recursive: true);
+		parent::setUp();
+		$this->cwd = getcwd();
+		$this->relBaseDir = "test-autoload-" . uniqid();
+		mkdir($this->relBaseDir . "/Foo", 0777, true);
 	}
 
 	protected function tearDown():void {
-		// Recursively remove the temporary directory we created.
-		$path = $this->classDir;
-		if(is_dir($path)) {
-			self::rrmdir($path);
+		// Recursively remove created files/dirs
+		$it = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($this->relBaseDir, \FilesystemIterator::SKIP_DOTS),
+			\RecursiveIteratorIterator::CHILD_FIRST
+		);
+		foreach($it as $file) {
+			$file->isDir() ? rmdir($file->getPathname()) : unlink($file->getPathname());
 		}
+		@rmdir($this->relBaseDir);
+		parent::tearDown();
 	}
 
-	private static function rrmdir(string $dir):void {
-		/** @var list<string> $items */
-		$items = @scandir($dir) ?: [];
-		foreach($items as $item) {
-			if($item === "." || $item === "..") {
-				continue;
-			}
-			$full = $dir . "/" . $item;
-			if(is_dir($full)) {
-				self::rrmdir($full);
-			}
-			else {
-				@unlink($full);
-			}
-		}
-		@rmdir($dir);
+	public function testSetup_noDir_doesNotRegisterOrLoad():void {
+		$sut = new AppAutoloader('App', 'non-existent-dir-' . uniqid());
+		// Should not throw, and autoloader should not attempt to load anything
+		$sut->setup();
+		self::assertFalse(class_exists('App\\Nope\\Thing'));
 	}
 
-	#[RunInSeparateProcess]
-	public function testLoadsClassFromConfiguredDirectory():void {
-		// Arrange: create a simple class file under the configured directory.
-		$ns = 'TestApp';
-		$cls = 'Widget';
-		$code = <<<PHP
-		<?php
-		namespace {$ns};
-		class {$cls} {
-			public function ping(): string { return 'pong'; }
-		}
-		PHP;
+	public function testAutoload_relativePathAndUcfirstSegments():void {
+		// Create class file using ucfirst segment mapping: Foo/Bar.php
+		$code = "<?php\nnamespace App\\Foo; class Bar { public static function hello(): string { return 'hi'; } }\n";
+		file_put_contents($this->relBaseDir . "/Foo/Bar.php", $code);
 
-		$filePath = "{$this->classDir}/{$cls}.php";
-		file_put_contents($filePath, $code);
-
-		$sut = new AppAutoloader(namespace: $ns, classDir: $this->classDir);
+		$sut = new AppAutoloader('App', $this->relBaseDir);
 		$sut->setup();
 
-		// Act: reference the class so the autoloader resolves it.
-		$fullClass = "\\{$ns}\\{$cls}";
-		$instance = new $fullClass();
-
-		// Assert
-		self::assertSame('pong', $instance->ping());
+		$class = 'App\\Foo\\Bar';
+		self::assertTrue(class_exists($class));
+		self::assertSame('hi', \call_user_func([$class, 'hello']));
 	}
 
-	#[RunInSeparateProcess]
-	public function testLoadsClassFromNestedNamespaceUsingUcfirstPath():void {
-		// Arrange: nested namespace parts should map to capitalised path segments.
-		$ns = 'TestApp2';
-		$nsParts = ['foo', 'bar'];
-		$class = 'baz';
+	public function testAutoload_ignoresDifferentNamespace():void {
+		// Create class that shouldn't be autoloaded by our AppAutoloader because of namespace mismatch
+		$otherDir = $this->relBaseDir . '/Other';
+		mkdir($otherDir, 0777, true);
+		file_put_contents($otherDir . '/Qux.php', "<?php\nnamespace Other\\Ns; class Qux {}\n");
 
-		// The autoloader ucfirst()s each part, so we create directories capitalised.
-		$dir = "{$this->classDir}/" . implode('/', array_map('ucfirst', $nsParts));
-		@mkdir($dir, recursive: true);
-
-		$code = <<<PHP
-		<?php
-		namespace {$ns}\\foo\\bar;
-		class {$class} { public function id(): string { return 'ok'; } }
-		PHP;
-
-		file_put_contents($dir . '/Baz.php', $code);
-
-		$sut = new AppAutoloader(namespace: $ns, classDir: $this->classDir);
+		$sut = new AppAutoloader('App', $this->relBaseDir);
 		$sut->setup();
 
-		// Use lowercased parts to confirm ucfirst mapping works.
-		$fullClass = "\\{$ns}\\{$nsParts[0]}\\{$nsParts[1]}\\$class";
-		$instance = new $fullClass();
-
-		self::assertSame('ok', $instance->id());
+		// Asserting that merely referencing a different namespace doesn't cause load attempt here.
+		self::assertFalse(class_exists('Other\\Ns\\Qux', false));
 	}
 }