php 8.1

Author: Dominik Zogg

.github/workflows/ci.yml

@@ -41,6 +41,17 @@ jobs:
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
+  php81:
+    name: PHP 8.1
+    runs-on: ubuntu-20.04
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: composer test
+        uses: docker://chubbyphp/ci-php81:latest
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
       - name: sonarcloud.io
         uses: sonarsource/sonarcloud-github-action@master
         env:

README.md

@@ -30,7 +30,7 @@ A request handler adapter for workerman, using PSR-7, PSR-15 and PSR-17.
  * [psr/http-message][3]: ^1.0.1
  * [psr/http-server-handler][4]: ^1.0.1
  * [psr/log][5]: ^1.1.4
- * [workerman/workerman][6]: ^4.0.6
+ * [workerman/workerman][6]: ^4.0.24
 
 ## Installation
 

composer.json

@@ -22,17 +22,17 @@
         "psr/http-message": "^1.0.1",
         "psr/http-server-handler": "^1.0.1",
         "psr/log": "^1.1.4",
-        "workerman/workerman": "^4.0.6"
+        "workerman/workerman": "^4.0.24"
     },
     "require-dev": {
         "blackfire/php-sdk": "^1.23",
         "chubbyphp/chubbyphp-dev-helper": "dev-master",
-        "chubbyphp/chubbyphp-mock": "^1.6",
-        "infection/infection": "^0.25.2",
-        "php-coveralls/php-coveralls": "^2.4.3",
+        "chubbyphp/chubbyphp-mock": "^1.6.1",
+        "infection/infection": "^0.25.3",
+        "php-coveralls/php-coveralls": "^2.5.1",
         "phploc/phploc": "^7.0.2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^0.12.99",
+        "phpstan/phpstan": "^1.1.2",
         "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
@@ -50,7 +50,7 @@
         }
     },
     "scripts": {
-        "fix:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
+        "fix:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --cache-file=build/phpcs.cache",
         "test": [
             "@test:lint",
             "@test:unit",
@@ -60,7 +60,7 @@
             "@test:loc",
             "@test:cs"
         ],
-        "test:cs": "mkdir -p build && vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
+        "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:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",

phpstan.neon

@@ -1,14 +1,5 @@
 parameters:
     ignoreErrors:
-        -
-            message: '/Parameter \#1 \$name of method Workerman\\Protocols\\Http\\Request\:\:header\(\) expects null, string given\./'
-            path: %currentWorkingDirectory%/src/Adapter/BlackfireOnMessageAdapter.php
-        -
-            message: '/Argument of an invalid type string supplied for foreach, only iterables are supported\./'
-            path: %currentWorkingDirectory%/src/PsrRequestFactory.php
-        -
-            message: '/Parameter \#1 \$cookies of method Psr\\Http\\Message\\ServerRequestInterface\:\:withCookieParams\(\) expects array, string\|null given\./'
-            path: %currentWorkingDirectory%/src/PsrRequestFactory.php
         -
             message: '/uploadedFiles/'
             path: %currentWorkingDirectory%/src/PsrRequestFactory.php
@@ -18,6 +9,3 @@ parameters:
         -
             message: '/createUploadedFile/'
             path: %currentWorkingDirectory%/src/PsrRequestFactory.php
-        -
-            message: '/Parameter \#2 \$reason_phrase of method Workerman\\Protocols\\Http\\Response\:\:withStatus\(\) expects null, string given\./'
-            path: %currentWorkingDirectory%/src/WorkermanResponseEmitter.php

src/PsrRequestFactory.php

@@ -36,11 +36,17 @@ public function create(WorkermanRequest $workermanRequest): ServerRequestInterfa
             $workermanRequest->uri()
         );
 
-        foreach ($workermanRequest->header() as $name => $value) {
+        /** @var array<string, string> $headers */
+        $headers = $workermanRequest->header();
+
+        foreach ($headers as $name => $value) {
             $request = $request->withHeader($name, $value);
         }
 
-        $request = $request->withCookieParams($workermanRequest->cookie());
+        /** @var array<string, string> $cookies */
+        $cookies = $workermanRequest->cookie();
+
+        $request = $request->withCookieParams($cookies);
         $request = $request->withQueryParams($workermanRequest->get());
         $request = $request->withParsedBody($workermanRequest->post());
         $request = $request->withUploadedFiles($this->uploadedFiles($workermanRequest->file()));