Update for the latest version of the runtime component (#6)

* Update for the latest version of the runtime component

* CS fix

* Remove "Root" tests

* We still need composer.json

composer.json

@@ -21,7 +21,8 @@
     },
     "autoload": {
         "psr-4": {
-            "Runtime\\PsrNyholmLaminas\\": "src/psr-nyholm-laminas/src"
+            "Runtime\\PsrNyholmLaminas\\": "src/psr-nyholm-laminas/src",
+            "Runtime\\React\\": "src/react/src"
         }
     },
     "minimum-stability": "dev",

phpstan.neon.dist

@@ -7,3 +7,4 @@ parameters:
 
     excludes_analyse:
         - src/*/tests/*
+        - src/*/vendor/*

psalm.xml

@@ -10,10 +10,11 @@
 >
     <projectFiles>
         <directory name="src" />
-        <ignoreFiles>
+        <ignoreFiles allowMissingFiles="true">
             <directory name="vendor" />
             <directory name="src/*/tests" />
             <directory name="src/*/runtime" />
+            <directory name="src/*/vendor" />
         </ignoreFiles>
     </projectFiles>
 </psalm>

src/psr-nyholm-laminas/composer.json

@@ -21,7 +21,12 @@
     "autoload": {
         "psr-4": {
             "Runtime\\PsrNyholmLaminas\\": "src/",
-            "Symfony\\Runtime\\Psr\\": "runtime/"
+            "Symfony\\Runtime\\Psr\\Http\\": "runtime/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Runtime\\PsrNyholmLaminas\\Tests\\": "tests/"
         }
     },
     "minimum-stability": "dev",

src/psr-nyholm-laminas/runtime/Message/ResponseInterfaceRuntime.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Runtime\Psr\Message;
+namespace Symfony\Runtime\Psr\Http\Message;
 
 use Runtime\PsrNyholmLaminas\Runtime;
 

src/psr-nyholm-laminas/runtime/Message/ServerRequestInterfaceRuntime.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Runtime\Psr\Message;
+namespace Symfony\Runtime\Psr\Http\Message;
 
 use Runtime\PsrNyholmLaminas\Runtime;
 

src/psr-nyholm-laminas/runtime/Server/RequestHandlerInterfaceRuntime.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Runtime\Psr\Server;
+namespace Symfony\Runtime\Psr\Http\Server;
 
 use Runtime\PsrNyholmLaminas\Runtime;
 

src/psr-nyholm-laminas/src/Runtime.php

@@ -22,8 +22,6 @@ class Runtime extends GenericRuntime
      */
     private $requestCreator;
 
-    private $options = [];
-
     /**
      * @param array{
      *   debug?: ?bool,
@@ -37,8 +35,6 @@ class Runtime extends GenericRuntime
      */
     public function __construct(array $options = [])
     {
-        $this->options = $options;
-
         parent::__construct($options);
     }
 
@@ -67,6 +63,19 @@ protected function getArgument(\ReflectionParameter $parameter, ?string $type)
         return parent::getArgument($parameter, $type);
     }
 
+    protected static function register(parent $runtime): parent
+    {
+        $self = new self($runtime->options + ['runtimes' => []]);
+        $self->options['runtimes'] += [
+            ServerRequestInterface::class => $self,
+            ResponseInterface::class => $self,
+            RequestHandlerInterface::class => $self,
+        ];
+        $runtime->options = $self->options;
+
+        return $self;
+    }
+
     /**
      * @return ServerRequestInterface
      */

src/psr-nyholm-laminas/tests/AutoDiscoverTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Runtime\PsrNyholmLaminas\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Runtime\PsrNyholmLaminas\Runtime;
+
+class AutoDiscoverTest extends TestCase
+{
+    public function testAutoDiscoverClasses()
+    {
+        $classes = [
+            'Symfony\Runtime\Psr\Http\Message\ResponseInterfaceRuntime',
+            'Symfony\Runtime\Psr\Http\Message\ServerRequestInterfaceRuntime',
+            'Symfony\Runtime\Psr\Http\Server\RequestHandlerInterfaceRuntime',
+        ];
+
+        foreach ($classes as $class) {
+            $this->assertTrue(class_exists($class));
+            $this->assertTrue(is_subclass_of($class, Runtime::class));
+        }
+    }
+}

src/psr-nyholm-laminas/tests/phpt/psr15.php

@@ -4,8 +4,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-$_SERVER['APP_RUNTIME'] = \Runtime\PsrNyholmLaminas\Runtime::class;
-
 require __DIR__.'/autoload.php';
 
 return function (array $context) {

src/psr-nyholm-laminas/tests/phpt/psr7.php

@@ -2,8 +2,6 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 
-$_SERVER['APP_RUNTIME'] = \Runtime\PsrNyholmLaminas\Runtime::class;
-
 require __DIR__.'/autoload.php';
 
 return function (ServerRequestInterface $request) {

src/reactphp/composer.json

@@ -20,7 +20,12 @@
     "autoload": {
         "psr-4": {
             "Runtime\\React\\": "src/",
-            "Symfony\\Runtime\\Psr\\": "runtime/"
+            "Symfony\\Runtime\\Psr\\Http\\": "runtime/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Runtime\\React\\Tests\\": "tests/"
         }
     },
     "minimum-stability": "dev",

src/reactphp/runtime/Server/RequestHandlerInterfaceRuntime.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Runtime\Psr\Server;
+namespace Symfony\Runtime\Psr\Http\Server;
 
 use Runtime\React\Runtime;
 

src/reactphp/tests/AutoDiscoverTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Runtime\React\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Runtime\React\Runtime;
+
+class AutoDiscoverTest extends TestCase
+{
+    public function testAutoDiscoverClasses()
+    {
+        $classes = [
+            'Symfony\Runtime\Psr\Http\Server\RequestHandlerInterfaceRuntime',
+        ];
+
+        foreach ($classes as $class) {
+            $this->assertTrue(class_exists($class));
+            $this->assertTrue(is_subclass_of($class, Runtime::class));
+        }
+    }
+}