Shortended Adapter namespaces.

Author: hsehszroc

Tests/BridgeTest.php

@@ -11,19 +11,23 @@
 
 use LogicException;
 use MiddlewareAdapter;
+use Psr7Adapter\Request;
+use Psr7Adapter\Response;
+use Psr15Adapter\Middleware;
 use PHPUnit\Framework\TestCase;
+use Psr7Adapter\ResponseInterface;
+use Psr15Adapter\MiddlewareInterface;
+use Psr7Adapter\ServerRequestInterface;
+use Psr15Adapter\RequestHandlerInterface;
 use TheWebSolver\Codegarage\Lib\PipelineBridge;
-use TheWebSolver\Codegarage\Lib\Psr7Adapter\Request;
-use TheWebSolver\Codegarage\Lib\Psr7Adapter\Response;
-use TheWebSolver\Codegarage\Lib\Psr15Adapter\Middleware;
-use TheWebSolver\Codegarage\Lib\Psr7Adapter\ResponseInterface;
-use TheWebSolver\Codegarage\Lib\Psr15Adapter\MiddlewareInterface;
-use TheWebSolver\Codegarage\Lib\Psr7Adapter\ServerRequestInterface;
-use TheWebSolver\Codegarage\Lib\Psr15Adapter\RequestHandlerInterface;
 
 class BridgeTest extends TestCase {
+	private bool $PSRPackageInstalled;
 	protected function setUp(): void {
+		$this->PSRPackageInstalled = interface_exists( '\\Psr\\Http\\Server\\MiddlewareInterface' );
+
 		require_once __DIR__ . '/Stub/PsrStubs.php';
+
 	}
 
 	public function testPSRBridge() {
@@ -68,7 +72,7 @@ public function process(
 		PipelineBridge::resetMiddlewareAdapter();
 
 		// Must always throw exception if core PSR-15 implementation not used.
-		if ( ! interface_exists( '\\Psr\\Http\\Server\\MiddlewareInterface' ) ) {
+		if ( ! $this->PSRPackageInstalled ) {
 			$this->expectException( LogicException::class );
 			$this->expectExceptionMessage( 'Cannot find implementation of PSR15 HTTP Server Middleware.' );
 

Tests/Stub/PsrStubs.php

@@ -12,7 +12,7 @@
 
 declare( strict_types = 1 );
 
-namespace TheWebSolver\Codegarage\Lib\Psr7Adapter {
+namespace Psr7Adapter {
 	interface ServerRequestInterface {
 		public function withAttribute( string $name, mixed $value ): static;
 		public function getAttribute( string $name, mixed $default = null ): mixed;
@@ -55,9 +55,9 @@ public function getStatusCode(): int {
 	}
 }
 
-namespace TheWebSolver\Codegarage\Lib\Psr15Adapter {
+namespace Psr15Adapter {
 	use TheWebSolver\Codegarage\Lib\PipelineBridge;
-	use TheWebSolver\Codegarage\Lib\Psr7Adapter\{ ServerRequestInterface, ResponseInterface };
+	use Psr7Adapter\{ ServerRequestInterface, ResponseInterface };
 
 	interface RequestHandlerInterface {
 		public function handle( ServerRequestInterface $request ): ResponseInterface;
@@ -85,8 +85,8 @@ public function process(
 }
 
 namespace {
-	use TheWebSolver\Codegarage\Lib\Psr7Adapter\{ ServerRequestInterface, ResponseInterface };
-	use TheWebSolver\Codegarage\Lib\Psr15Adapter\{ MiddlewareInterface, RequestHandlerInterface };
+	use Psr7Adapter\{ ServerRequestInterface, ResponseInterface };
+	use Psr15Adapter\{ MiddlewareInterface, RequestHandlerInterface };
 
 	class MiddlewareAdapter implements MiddlewareInterface {
 		public function __construct( private readonly \Closure $middleware ) {}