Cleanup

Author: butschster

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: roadrunner-server

.github/workflows/phpunit.yml

@@ -1,9 +1,9 @@
 on:
+  pull_request: null
   push:
     branches:
       - master
       - '*.*'
-  pull_request: null
 
 name: phpunit
 
@@ -16,4 +16,4 @@ jobs:
       php: >-
         ['8.1', '8.2']
       stability: >-
-        ['prefer-stable', 'prefer-lowest']
+        ['prefer-lowest', 'prefer-stable']

.github/workflows/psalm.yml

@@ -1,9 +1,9 @@
 on:
+  pull_request: null
   push:
     branches:
       - master
       - '*.*'
-  pull_request: null
 
 name: static analysis
 

.gitignore

@@ -15,3 +15,6 @@ clover*
 cover*
 .DS_Store
 *.cache
+
+.phpunit.cache/
+.phpunit.result.cache

composer.json

@@ -5,8 +5,8 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "Anton Titov (Wolfy-J)",
-            "email": "wolfy.jd@gmail.com"
+            "name": "Anton Titov (wolfy-j)",
+            "email": "wolfy-j@spiralscout.com"
         },
         {
             "name": "Valery Piashchynski",
@@ -45,9 +45,9 @@
         "spiral/roadrunner-worker": "^3.0"
     },
     "require-dev": {
+        "jetbrains/phpstorm-attributes": "^1.0",
         "nyholm/psr7": "^1.3",
         "phpunit/phpunit": "^10.0",
-        "jetbrains/phpstorm-attributes": "^1.0",
         "symfony/process": "^6.2",
         "vimeo/psalm": "^5.9"
     },

src/HttpWorker.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of RoadRunner package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace Spiral\RoadRunner\Http;
@@ -77,7 +70,7 @@ public function respond(int $status, string|Generator $body, array $headers = []
             return;
         }
 
-        $head = (string)\json_encode([
+        $head = \json_encode([
             'status'  => $status,
             'headers' => $headers ?: (object)[],
         ], \JSON_THROW_ON_ERROR);
@@ -87,7 +80,7 @@ public function respond(int $status, string|Generator $body, array $headers = []
 
     private function respondStream(int $status, Generator $body, array $headers = []): void
     {
-        $head = (string)\json_encode([
+        $head = \json_encode([
             'status'  => $status,
             'headers' => $headers ?: (object)[],
         ], \JSON_THROW_ON_ERROR);
@@ -124,11 +117,11 @@ private function createRequest(string $body, array $context): Request
             cookies: (array)($context['cookies'] ?? []),
             uploads: (array)($context['uploads'] ?? []),
             attributes: [
-                Request::PARSED_BODY_ATTRIBUTE_NAME => (bool)$context['parsed'],
+                Request::PARSED_BODY_ATTRIBUTE_NAME => $context['parsed'],
             ] + (array)($context['attributes'] ?? []),
             query: $query,
             body: $body,
-            parsed: (bool)$context['parsed'],
+            parsed: $context['parsed'],
         );
     }
 

src/HttpWorkerInterface.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of RoadRunner package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace Spiral\RoadRunner\Http;
@@ -22,8 +15,6 @@ interface HttpWorkerInterface extends WorkerAwareInterface
 {
     /**
      * Wait for incoming http request.
-     *
-     * @return Request|null
      */
     public function waitRequest(): ?Request;
 

src/PSR7Worker.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of RoadRunner package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace Spiral\RoadRunner\Http;
@@ -37,65 +30,31 @@ class PSR7Worker implements PSR7WorkerInterface
      */
     public int $chunkSize = 0;
 
-    /**
-     * @var HttpWorker
-     */
-    private HttpWorker $httpWorker;
-
-    /**
-     * @var ServerRequestFactoryInterface
-     */
-    private ServerRequestFactoryInterface $requestFactory;
-
-    /**
-     * @var StreamFactoryInterface
-     */
-    private StreamFactoryInterface $streamFactory;
-
-    /**
-     * @var UploadedFileFactoryInterface
-     */
-    private UploadedFileFactoryInterface $uploadsFactory;
+    private readonly HttpWorker $httpWorker;
 
-    /**
-     * @var array
-     */
-    private array $originalServer;
+    private readonly array $originalServer;
 
     /**
      * @var string[] Valid values for HTTP protocol version
      */
     private static array $allowedVersions = ['1.0', '1.1', '2'];
 
-    /**
-     * @param WorkerInterface $worker
-     * @param ServerRequestFactoryInterface $requestFactory
-     * @param StreamFactoryInterface $streamFactory
-     * @param UploadedFileFactoryInterface $uploadsFactory
-     */
     public function __construct(
         WorkerInterface $worker,
-        ServerRequestFactoryInterface $requestFactory,
-        StreamFactoryInterface $streamFactory,
-        UploadedFileFactoryInterface $uploadsFactory
+        private readonly ServerRequestFactoryInterface $requestFactory,
+        private readonly StreamFactoryInterface $streamFactory,
+        private readonly UploadedFileFactoryInterface $uploadsFactory,
     ) {
         $this->httpWorker = new HttpWorker($worker);
-        $this->requestFactory = $requestFactory;
-        $this->streamFactory = $streamFactory;
-        $this->uploadsFactory = $uploadsFactory;
         $this->originalServer = $_SERVER;
     }
 
-    /**
-     * @return WorkerInterface
-     */
     public function getWorker(): WorkerInterface
     {
         return $this->httpWorker->getWorker();
     }
 
     /**
-     * @return ServerRequestInterface|null
      * @throws \JsonException
      */
     public function waitRequest(): ?ServerRequestInterface
@@ -113,7 +72,6 @@ public function waitRequest(): ?ServerRequestInterface
     /**
      * Send response to the application server.
      *
-     * @param ResponseInterface $response
      * @throws \JsonException
      */
     public function respond(ResponseInterface $response): void
@@ -158,7 +116,6 @@ private function streamToGenerator(StreamInterface $stream): Generator
      * Returns altered copy of _SERVER variable. Sets ip-address,
      * request-time and other values.
      *
-     * @param Request $request
      * @return non-empty-array<array-key|string, mixed|string>
      */
     protected function configureServer(Request $request): array
@@ -173,7 +130,7 @@ protected function configureServer(Request $request): array
 
         $server['HTTP_USER_AGENT'] = '';
         foreach ($request->headers as $key => $value) {
-            $key = \strtoupper(\str_replace('-', '_', (string)$key));
+            $key = \strtoupper(\str_replace('-', '_', $key));
             if (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
                 $server[$key] = \implode(', ', $value);
             } else {
@@ -184,26 +141,17 @@ protected function configureServer(Request $request): array
         return $server;
     }
 
-    /**
-     * @return int
-     */
     protected function timeInt(): int
     {
         return \time();
     }
 
-    /**
-     * @return float
-     */
     protected function timeFloat(): float
     {
         return \microtime(true);
     }
 
     /**
-     * @param Request $httpRequest
-     * @param array $server
-     * @return ServerRequestInterface
      * @throws \JsonException
      */
     protected function mapRequest(Request $httpRequest, array $server): ServerRequestInterface
@@ -278,9 +226,6 @@ protected function wrapUploads(array $files): array
 
     /**
      * Normalize HTTP protocol version to valid values
-     *
-     * @param string $version
-     * @return string
      */
     private static function fetchProtocolVersion(string $version): string
     {

src/PSR7WorkerInterface.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of RoadRunner package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace Spiral\RoadRunner\Http;

src/Request.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * This file is part of RoadRunner package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace Spiral\RoadRunner\Http;
@@ -59,16 +52,12 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @return string
-     */
     public function getRemoteAddr(): string
     {
         return (string)($this->attributes['ipAddress'] ?? $this->remoteAddr);
     }
 
     /**
-     * @return array|null
      * @throws \JsonException
      */
     public function getParsedBody(): ?array