php 8.4 and phpunit 11

Author: dominikzogg

.github/workflows/ci.yml

@@ -6,36 +6,36 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  php81:
-    name: PHP 8.1
-    runs-on: ubuntu-22.04
+  php82:
+    name: PHP 8.2
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php81:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php82:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  php82:
-    name: PHP 8.2
-    runs-on: ubuntu-22.04
+  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
-    runs-on: ubuntu-22.04
+  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 }}

README.md

@@ -25,19 +25,19 @@ A request handler adapter for workerman, using PSR-7, PSR-15 and PSR-17.
 
 ## Requirements
 
- * php: ^8.1
- * [psr/http-factory][2]: ^1.0.2
+ * php: ^8.2
+ * [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
- * [workerman/workerman][6]: ^4.1.13
+ * [psr/log][5]: ^2.0|^3.0.2
+ * [workerman/workerman][6]: ^4.2.1
 
 ## Installation
 
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-workerman-request-handler][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-workerman-request-handler "^2.1"
+composer require chubbyphp/chubbyphp-workerman-request-handler "^2.2"
 ```
 
 ## Usage

composer.json

@@ -17,22 +17,22 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "psr/http-factory": "^1.0.2",
+        "php": "^8.2",
+        "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",
-        "workerman/workerman": "^4.1.13"
+        "psr/log": "^2.0|^3.0.2",
+        "workerman/workerman": "^4.2.1"
     },
     "require-dev": {
-        "blackfire/php-sdk": "^2.3.5",
+        "blackfire/php-sdk": "^2.5.4",
         "chubbyphp/chubbyphp-dev-helper": "dev-master",
-        "chubbyphp/chubbyphp-mock": "^1.7",
-        "infection/infection": "^0.27.8",
+        "chubbyphp/chubbyphp-mock": "^1.8",
+        "infection/infection": "^0.29.8",
         "php-coveralls/php-coveralls": "^2.7",
-        "phpstan/extension-installer": "^1.3.1",
-        "phpstan/phpstan": "^1.10.45",
-        "phpunit/phpunit": "^10.4.2"
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan": "^2.0.3",
+        "phpunit/phpunit": "^11.5.0"
     },
     "autoload": {
         "psr-4": { "Chubbyphp\\WorkermanRequestHandler\\": "src/" }
@@ -49,7 +49,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "2.2-dev"
         }
     },
     "scripts": {
@@ -64,9 +64,9 @@
         ],
         "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:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --verbose --coverage=build/phpunit",
-        "test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-result-file=build/phpunit/result.cache",
+        "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",
         "test:static-analysis": "mkdir -p build && bash -c 'vendor/bin/phpstan analyse src --no-progress --level=7 --error-format=junit | tee build/phpstan.junit.xml; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
-        "test:unit": "vendor/bin/phpunit --testsuite=Unit --coverage-text --coverage-clover=build/phpunit/clover.xml --coverage-html=build/phpunit/coverage-html --coverage-xml=build/phpunit/coverage-xml --log-junit=build/phpunit/junit.xml --cache-result-file=build/phpunit/result.cache"
+        "test:unit": "vendor/bin/phpunit --testsuite=Unit --coverage-text --coverage-clover=build/phpunit/clover.xml --coverage-html=build/phpunit/coverage-html --coverage-xml=build/phpunit/coverage-xml --log-junit=build/phpunit/junit.xml --cache-directory=build/phpunit"
     }
 }

src/Adapter/BlackfireOnMessageAdapter.php

@@ -54,7 +54,7 @@ private function startProbe(): ?Probe
         try {
             return $this->client->createProbe($this->config);
         } catch (ExceptionInterface $exception) {
-            $this->logger->error(sprintf('Blackfire exception: %s', $exception->getMessage()));
+            $this->logger->error(\sprintf('Blackfire exception: %s', $exception->getMessage()));
         }
 
         return null;
@@ -65,7 +65,7 @@ private function endProbe(Probe $probe): void
         try {
             $this->client->endProbe($probe);
         } catch (ExceptionInterface $exception) {
-            $this->logger->error(sprintf('Blackfire exception: %s', $exception->getMessage()));
+            $this->logger->error(\sprintf('Blackfire exception: %s', $exception->getMessage()));
         }
     }
 }