Fix psalm issues; update composer.json; migrate phpunit config

Author: roxblnfk

composer.json

@@ -5,14 +5,37 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "Anton Titov / Wolfy-J",
+            "name": "Anton Titov (Wolfy-J)",
             "email": "[email protected]"
         },
+        {
+            "name": "Valery Piashchynski",
+            "homepage": "https://github.com/rustatian"
+        },
+        {
+            "name": "Aleksei Gagarin (roxblnfk)",
+            "homepage": "https://github.com/roxblnfk"
+        },
+        {
+            "name": "Pavel Buchnev (butschster)",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Maksim Smakouz (msmakouz)",
+            "email": "[email protected]"
+        },
         {
             "name": "RoadRunner Community",
-            "homepage": "https://github.com/spiral/roadrunner/graphs/contributors"
+            "homepage": "https://github.com/roadrunner-server/roadrunner/graphs/contributors"
         }
     ],
+    "homepage": "https://spiral.dev/",
+    "support": {
+        "docs": "https://roadrunner.dev/docs",
+        "issues": "https://github.com/roadrunner-server/roadrunner/issues",
+        "forum": "https://forum.roadrunner.dev/",
+        "chat": "https://discord.gg/V6EK4he"
+    },
     "require": {
         "php": ">=8.1",
         "ext-json": "*",
@@ -26,7 +49,7 @@
         "phpunit/phpunit": "^10.0",
         "jetbrains/phpstorm-attributes": "^1.0",
         "symfony/process": "^6.2",
-        "vimeo/psalm": "^5.8"
+        "vimeo/psalm": "^5.9"
     },
     "autoload": {
         "psr-4": {
@@ -38,6 +61,12 @@
             "Spiral\\RoadRunner\\Tests\\Http\\": "tests"
         }
     },
+    "funding": [
+        {
+            "type": "github",
+            "url": "https://github.com/sponsors/roadrunner-server"
+        }
+    ],
     "scripts": {
         "analyze": "psalm"
     },

phpunit.xml

@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
+         backupGlobals="false" colors="true"
          processIsolation="false"
          executionOrder="random"
          stopOnFailure="false"
          stopOnError="false"
          stderr="true"
+         cacheDirectory=".phpunit.cache"
 >
     <testsuites>
         <testsuite name="RR Worker Tests">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-
     <coverage>
         <include>
             <directory>src</directory>

src/HttpWorker.php

@@ -22,10 +22,10 @@
  * @psalm-import-type UploadedFilesList from Request
  * @psalm-import-type CookiesList from Request
  *
- * @psalm-type RequestContext = array {
- *      remoteAddr: string,
- *      protocol:   string,
- *      method:     string,
+ * @psalm-type RequestContext = array{
+ *      remoteAddr: non-empty-string,
+ *      protocol:   non-empty-string,
+ *      method:     non-empty-string,
  *      uri:        string,
  *      attributes: AttributesList,
  *      headers:    HeadersList,

src/Request.php

@@ -16,10 +16,10 @@
 /**
  * @psalm-immutable
  *
- * @psalm-type UploadedFile = array {
- *      name:       string,
+ * @psalm-type UploadedFile = array{
+ *      name:       non-empty-string,
  *      error:      int<0, max>,
- *      tmpName:    string,
+ *      tmpName:    non-empty-string,
  *      size:       int<0, max>,
  *      mime:       string
  * }

tests/Feature/StreamResponseTest.php

@@ -5,7 +5,6 @@
 namespace Spiral\RoadRunner\Tests\Http\Feature;
 
 use PHPUnit\Framework\TestCase;
-use Spiral\Goridge\Frame;
 use Spiral\Goridge\SocketRelay;
 use Spiral\RoadRunner\Http\HttpWorker;
 use Spiral\RoadRunner\Payload;
@@ -94,6 +93,34 @@ public function testStopStreamResponse(): void
         self::assertSame(\implode("\n", ['Hel', 'lo,']), \trim(ServerRunner::getBuffer()));
     }
 
+    /**
+     * StopStream should be ignored if stream is already ended.
+     */
+    public function testStopStreamAfterStreamEnd(): void
+    {
+        $httpWorker = $this->makeHttpWorker();
+
+        // Flush buffer
+        ServerRunner::getBuffer();
+
+        $httpWorker->respond(
+            200,
+            (function () {
+                yield 'Hello';
+                yield 'World!';
+            })(),
+        );
+
+        $this->assertFalse($this->getWorker()->hasPayload(\Spiral\RoadRunner\Message\Command\StreamStop::class));
+        $this->sendCommand(new StreamStop());
+
+
+        \usleep(200_000);
+        self::assertSame(\implode("\n", ['Hello', 'World!']), \trim(ServerRunner::getBuffer()));
+        $this->assertTrue($this->getWorker()->hasPayload(\Spiral\RoadRunner\Message\Command\StreamStop::class));
+        $this->assertFalse($this->getWorker()->hasPayload());
+    }
+
     private function getRelay(): SocketRelay
     {
         return $this->relay ??= SocketRelay::create($this->serverAddress);