php85 / workerman/workerman 5.x

Author: dominikzogg

.github/workflows/ci.yml

@@ -6,36 +6,36 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
-  php82:
-    name: PHP 8.2
+  php83:
+    name: PHP 8.3
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php82:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php83:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  php83:
-    name: PHP 8.3
+  php84:
+    name: PHP 8.4
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php83:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php84:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  php84:
-    name: PHP 8.4
+  php85:
+    name: PHP 8.5
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php84:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php85:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.php-cs-fixer.php

@@ -13,6 +13,7 @@
 $config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';
 
 return (new PhpCsFixer\Config)
+    ->setUnsupportedPhpVersionAllowed(true)
     ->setIndent($config['indent'])
     ->setLineEnding($config['lineEnding'])
     ->setRules($config['rules'])

README.md

@@ -25,19 +25,19 @@ A request handler adapter for workerman, using PSR-7, PSR-15 and PSR-17.
 
 ## Requirements
 
- * php: ^8.2
+ * php: ^8.3
  * [psr/http-factory][2]: ^1.1
  * [psr/http-message][3]: ^1.1|^2.0
  * [psr/http-server-handler][4]: ^1.0.2
  * [psr/log][5]: ^2.0|^3.0.2
- * [workerman/workerman][6]: ^4.2.1
+ * [workerman/workerman][6]: ^5.1.6
 
 ## Installation
 
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-workerman-request-handler][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-workerman-request-handler "^2.2"
+composer require chubbyphp/chubbyphp-workerman-request-handler "^2.3"
 ```
 
 ## Usage

composer.json

@@ -17,22 +17,22 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "psr/http-factory": "^1.1",
         "psr/http-message": "^1.1|^2.0",
         "psr/http-server-handler": "^1.0.2",
         "psr/log": "^2.0|^3.0.2",
-        "workerman/workerman": "^4.2.1"
+        "workerman/workerman": "^5.1.6"
     },
     "require-dev": {
-        "blackfire/php-sdk": "^2.5.7",
+        "blackfire/php-sdk": "^2.5.10",
         "chubbyphp/chubbyphp-dev-helper": "dev-master",
-        "chubbyphp/chubbyphp-mock": "^2.0",
-        "infection/infection": "^0.29.12",
-        "php-coveralls/php-coveralls": "^2.7",
+        "chubbyphp/chubbyphp-mock": "^2.0.1",
+        "infection/infection": "^0.31.9",
+        "php-coveralls/php-coveralls": "^2.9",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.6",
-        "phpunit/phpunit": "^11.5.9"
+        "phpstan/phpstan": "^2.1.32",
+        "phpunit/phpunit": "^12.4.5"
     },
     "autoload": {
         "psr-4": { "Chubbyphp\\WorkermanRequestHandler\\": "src/" }
@@ -49,11 +49,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2-dev"
+            "dev-master": "2.3-dev"
         }
     },
     "scripts": {
-        "fix:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
+        "fix:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
         "test": [
             "@test:lint",
             "@test:unit",
@@ -62,7 +62,7 @@
             "@test:static-analysis",
             "@test:cs"
         ],
-        "test:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
+        "test:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
         "test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --verbose --coverage=build/phpunit",
         "test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-directory=build/phpunit",
         "test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",

src/Adapter/BlackfireOnMessageAdapter.php

@@ -16,19 +16,12 @@
 
 final class BlackfireOnMessageAdapter implements OnMessageInterface
 {
-    private Configuration $config;
-
-    private LoggerInterface $logger;
-
     public function __construct(
         private OnMessageInterface $onRequest,
         private Client $client,
-        ?Configuration $config = null,
-        ?LoggerInterface $logger = null
-    ) {
-        $this->config = $config ?? new Configuration();
-        $this->logger = $logger ?? new NullLogger();
-    }
+        private Configuration $config = new Configuration(),
+        private LoggerInterface $logger = new NullLogger()
+    ) {}
 
     public function __invoke(WorkermanTcpConnection $workermanTcpConnection, WorkermanRequest $workermanRequest): void
     {

tests/Unit/WorkermanResponseEmitterTest.php

@@ -46,10 +46,10 @@ public function testInvoke(): void
         /** @var WorkermanTcpConnection $workermanTcpConnection */
         $workermanTcpConnection = $builder->create(WorkermanTcpConnection::class, [
             new WithCallback('send', static function (WorkermanResponse $workermanResponse, $flag) use ($headers): void {
-                self::assertSame(200, self::getWorkermanResponseProperty($workermanResponse, '_status'));
-                self::assertSame('OK', self::getWorkermanResponseProperty($workermanResponse, '_reason'));
-                self::assertSame($headers, self::getWorkermanResponseProperty($workermanResponse, '_header'));
-                self::assertSame('This is the body.', self::getWorkermanResponseProperty($workermanResponse, '_body'));
+                self::assertSame(200, self::getWorkermanResponseProperty($workermanResponse, 'status'));
+                self::assertSame('OK', self::getWorkermanResponseProperty($workermanResponse, 'reason'));
+                self::assertSame($headers, self::getWorkermanResponseProperty($workermanResponse, 'headers'));
+                self::assertSame('This is the body.', self::getWorkermanResponseProperty($workermanResponse, 'body'));
                 self::assertFalse($flag);
             }),
         ]);