Merge pull request #40: Update dependencies

roxblnfk · web-flow · commit 8d9905b1e667 · 2025-05-05T16:34:50.000+04:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,22 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2
+
+[*.json]
+indent_style = space
+indent_size = 4
diff --git a/.gitattributes b/.gitattributes
@@ -1,10 +1,10 @@
 * text=auto
 
-/.github       export-ignore
-/tests         export-ignore
-/.*            export-ignore
-/phpunit.xml*  export-ignore
-/phpstan.*     export-ignore
-/psalm.*       export-ignore
-/infection.*   export-ignore
-/codecov.*     export-ignore
+/.*                    export-ignore
+/config/               export-ignore
+/resources/scripts/    export-ignore
+/runtime/              export-ignore
+/tests/                export-ignore
+
+/*.xml                 export-ignore
+/*.xml.dist            export-ignore
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/cs-fix.yml b/.github/workflows/cs-fix.yml
@@ -0,0 +1,12 @@
+on:
+  push:
+    branches:
+      - '*'
+
+name: Fix Code Style
+
+jobs:
+  cs-fix:
+    permissions:
+      contents: write
+    uses: spiral/gh-actions/.github/workflows/cs-fix.yml@master
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+require_once 'vendor/autoload.php';
+
+return \Spiral\CodeStyle\Builder::create()
+    ->include(__DIR__ . '/src')
+    ->include(__FILE__)
+    ->allowRisky(true)
+    ->build();
diff --git a/composer.json b/composer.json
@@ -33,7 +33,6 @@
     "support": {
         "docs": "https://docs.roadrunner.dev",
         "issues": "https://github.com/roadrunner-server/roadrunner/issues",
-        "forum": "https://forum.roadrunner.dev/",
         "chat": "https://discord.gg/V6EK4he"
     },
     "require": {
@@ -42,17 +41,21 @@
         "ext-sockets": "*",
         "psr/log": "^2.0 || ^3.0",
         "spiral/goridge": "^4.1.0",
-        "spiral/roadrunner": "^2023.1 || ^2024.1",
+        "spiral/roadrunner": "^2023.1 || ^2024.1 || ^2025.1",
         "composer-runtime-api": "^2.0"
     },
     "require-dev": {
+        "buggregator/trap": "^1.13",
         "jetbrains/phpstorm-attributes": "^1.0",
-        "phpunit/phpunit": "^10.0",
-        "vimeo/psalm": "^5.9",
-        "symfony/var-dumper": "^6.3 || ^7.0"
+        "phpunit/phpunit": "^10.5.45",
+        "spiral/code-style": "^2.2",
+        "vimeo/psalm": "^6.0"
     },
     "scripts": {
-        "analyze": "psalm"
+        "cs:diff": "php-cs-fixer fix --dry-run -v --diff --show-progress dots",
+        "cs:fix": "php-cs-fixer fix -v",
+        "test": "phpunit",
+        "psalm": "psalm"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         cacheResultFile="runtime/.phpunit.result.cache"
          backupGlobals="false"
          colors="true"
          processIsolation="false"
@@ -10,14 +11,23 @@
          stderr="true"
 >
     <testsuites>
-        <testsuite name="RR Worker Tests">
-            <directory>tests</directory>
+        <testsuite name="Unit">
+            <directory>tests/Unit</directory>
         </testsuite>
     </testsuites>
-
     <coverage>
+        <report>
+            <html outputDirectory="runtime/phpunit/coverage"/>
+            <text outputFile="runtime/phpunit/coverage.txt"/>
+            <clover outputFile="runtime/phpunit/logs/clover.xml"/>
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="runtime/report.junit.xml"/>
+    </logging>
+    <source>
         <include>
             <directory>src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
@@ -14,4 +14,19 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <MissingOverrideAttribute errorLevel="suppress" />
+        <ClassMustBeFinal errorLevel="suppress" />
+    </issueHandlers>
+    <forbiddenFunctions>
+        <function name="dd"/>
+        <function name="exit"/>
+        <function name="die"/>
+        <function name="var_dump"/>
+        <function name="echo"/>
+        <function name="print"/>
+        <function name="trap"/>
+        <function name="td"/>
+        <function name="tr"/>
+    </forbiddenFunctions>
 </psalm>
diff --git a/src/Environment.php b/src/Environment.php
@@ -23,7 +23,14 @@ class Environment implements EnvironmentInterface
      */
     public function __construct(
         private array $env = [],
-    ) {
+    ) {}
+
+    public static function fromGlobals(): self
+    {
+        /** @var array<string, string> $env */
+        $env = [...$_ENV, ...$_SERVER];
+
+        return new self($env);
     }
 
     public function getMode(): string
@@ -57,17 +64,9 @@ private function get(string $name, string $default = ''): string
     {
         if (isset($this->env[$name]) || \array_key_exists($name, $this->env)) {
             /** @psalm-suppress RedundantCastGivenDocblockType */
-            return (string)$this->env[$name];
+            return (string) $this->env[$name];
         }
 
         return $default;
     }
-
-    public static function fromGlobals(): self
-    {
-        /** @var array<string, string> $env */
-        $env = [...$_ENV, ...$_SERVER];
-
-        return new self($env);
-    }
 }
diff --git a/src/Exception/RoadRunnerException.php b/src/Exception/RoadRunnerException.php
@@ -4,6 +4,4 @@
 
 namespace Spiral\RoadRunner\Exception;
 
-final class RoadRunnerException extends \RuntimeException
-{
-}
+final class RoadRunnerException extends \RuntimeException {}
diff --git a/src/Informer/Worker.php b/src/Informer/Worker.php
@@ -24,6 +24,5 @@ public function __construct(
         public float $cpuUsage,
         public string $command,
         public string $status,
-    ) {
-    }
+    ) {}
 }
diff --git a/src/Informer/Workers.php b/src/Informer/Workers.php
@@ -11,8 +11,7 @@ final class Workers implements \Countable
      */
     public function __construct(
         private readonly array $workers = [],
-    ) {
-    }
+    ) {}
 
     /**
      * @return array<Worker>
diff --git a/src/Internal/StdoutHandler.php b/src/Internal/StdoutHandler.php
@@ -36,7 +36,7 @@ final class StdoutHandler
      */
     public static function register(int $chunkSize = self::OB_CHUNK_SIZE): void
     {
-        assert($chunkSize >= 0, 'Invalid chunk size argument value');
+        \assert($chunkSize >= 0, 'Invalid chunk size argument value');
 
         self::restreamOutputBuffer($chunkSize);
         self::restreamHeaders();
@@ -50,7 +50,7 @@ public static function register(int $chunkSize = self::OB_CHUNK_SIZE): void
      */
     private static function restreamHeaders(): void
     {
-        \header_register_callback(static function(): void {
+        \header_register_callback(static function (): void {
             $headers = \headers_list();
 
             if ($headers !== []) {
diff --git a/src/Logger.php b/src/Logger.php
@@ -16,10 +16,10 @@ class Logger implements LoggerInterface
      */
     public function log(mixed $level, string|\Stringable $message, array $context = []): void
     {
-        assert(\is_scalar($level), 'Invalid log level type');
-        assert(\is_string($message), 'Invalid log message type');
+        \assert(\is_scalar($level), 'Invalid log level type');
+        \assert(\is_string($message), 'Invalid log message type');
 
-        $this->write($this->format((string)$level, $message, $context));
+        $this->write($this->format((string) $level, $message, $context));
     }
 
     protected function write(string $message): void
diff --git a/src/Message/Command/GetProcessId.php b/src/Message/Command/GetProcessId.php
@@ -10,6 +10,4 @@
 /**
  * @psalm-immutable
  */
-final class GetProcessId extends Payload implements ControlMessage
-{
-}
+final class GetProcessId extends Payload implements ControlMessage {}
diff --git a/src/Message/Command/Pong.php b/src/Message/Command/Pong.php
@@ -10,6 +10,4 @@
 /**
  * @psalm-immutable
  */
-final class Pong extends Payload implements SkipMessage
-{
-}
+final class Pong extends Payload implements SkipMessage {}
diff --git a/src/Message/Command/StreamStop.php b/src/Message/Command/StreamStop.php
@@ -10,6 +10,4 @@
 /**
  * @psalm-immutable
  */
-final class StreamStop extends Payload implements SkipMessage
-{
-}
+final class StreamStop extends Payload implements SkipMessage {}
diff --git a/src/Message/Command/WorkerStop.php b/src/Message/Command/WorkerStop.php
@@ -10,6 +10,4 @@
 /**
  * @psalm-immutable
  */
-final class WorkerStop extends Payload implements ControlMessage
-{
-}
+final class WorkerStop extends Payload implements ControlMessage {}
diff --git a/src/Message/ControlMessage.php b/src/Message/ControlMessage.php
@@ -7,6 +7,4 @@
 /**
  * @internal
  */
-interface ControlMessage
-{
-}
+interface ControlMessage {}
diff --git a/src/Message/SkipMessage.php b/src/Message/SkipMessage.php
@@ -10,6 +10,4 @@
  * after stream end because async and should be skipped in main worker loop.
  * @internal
  */
-interface SkipMessage
-{
-}
+interface SkipMessage {}
diff --git a/src/PayloadFactory.php b/src/PayloadFactory.php
@@ -70,4 +70,4 @@ private static function decode(string $json): array
 
         return $result;
     }
-}
+}
diff --git a/src/Version.php b/src/Version.php
@@ -12,14 +12,13 @@ final class Version
         'spiral/roadrunner',
         'spiral/roadrunner-worker',
     ];
-
     public const VERSION_FALLBACK = 'dev-master';
 
     public static function current(): string
     {
         foreach (self::PACKAGE_NAMES as $name) {
             if (InstalledVersions::isInstalled($name)) {
-                return \ltrim((string)InstalledVersions::getPrettyVersion($name), 'v');
+                return \ltrim((string) InstalledVersions::getPrettyVersion($name), 'v');
             }
         }
 
diff --git a/src/Worker.php b/src/Worker.php
