php 8.4 and phpunit 11

dominikzogg · dominikzogg · commit b45df812446b · 2024-12-07T15:35:29.000+01:00
diff --git a/.github/workflows/ci.yml b/.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 }}
diff --git a/README.md b/README.md
@@ -25,20 +25,20 @@ A request handler adapter for swoole, using PSR-7, PSR-15 and PSR-17.
 
 ## Requirements
 
- * php: ^8.1
- * [ext-swoole][2]: ^5.1.1
+ * php: ^8.2
+ * [ext-swoole][2]: ^5.1.6|6.0.0-RC1|^6.0
  * [dflydev/fig-cookies][3]: ^3.1
- * [psr/http-factory][4]: ^1.0.2
+ * [psr/http-factory][4]: ^1.1
  * [psr/http-message][5]: ^1.1|^2.0
  * [psr/http-server-handler][6]: ^1.0.2
- * [psr/log][7]: ^2.0|^3.0
+ * [psr/log][7]: ^2.0|^3.0.2
 
 ## Installation
 
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-swoole-request-handler][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-swoole-request-handler "^1.3"
+composer require chubbyphp/chubbyphp-swoole-request-handler "^1.5"
 ```
 
 ## Usage
diff --git a/composer.json b/composer.json
@@ -17,24 +17,24 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "ext-swoole": "^5.1.1",
+        "php": "^8.2",
+        "ext-swoole": "^5.1.6|6.0.0-RC1|^6.0",
         "dflydev/fig-cookies": "^3.1",
-        "psr/http-factory": "^1.0.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"
+        "psr/log": "^2.0|^3.0.2"
     },
     "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",
-        "swoole/ide-helper": "^5.1"
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan": "^2.0.3",
+        "phpunit/phpunit": "^11.5.0",
+        "swoole/ide-helper": "^5.1.6|^6.0.0-RC1|^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -55,7 +55,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4-dev"
+            "dev-master": "1.5-dev"
         }
     },
     "scripts": {
@@ -69,10 +69,10 @@
             "@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: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:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=96 --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",
         "test:static-analysis": "mkdir -p build && bash -c 'vendor/bin/phpstan analyse src --no-progress --level=8 --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"
     }
 }
diff --git a/src/Adapter/BlackfireOnRequestAdapter.php b/src/Adapter/BlackfireOnRequestAdapter.php
@@ -5,7 +5,8 @@
 namespace Chubbyphp\SwooleRequestHandler\Adapter;
 
 use Blackfire\Client;
-use Blackfire\Exception\ExceptionInterface;
+use Blackfire\Exception\LogicException;
+use Blackfire\Exception\RuntimeException;
 use Blackfire\Probe;
 use Blackfire\Profile\Configuration;
 use Chubbyphp\SwooleRequestHandler\OnRequestInterface;
@@ -53,8 +54,8 @@ private function startProbe(): ?Probe
     {
         try {
             return $this->client->createProbe($this->config);
-        } catch (ExceptionInterface $exception) {
-            $this->logger->error(sprintf('Blackfire exception: %s', $exception->getMessage()));
+        } catch (LogicException|RuntimeException $exception) {
+            $this->logger->error(\sprintf('Blackfire exception: %s', $exception->getMessage()));
         }
 
         return null;
@@ -64,8 +65,8 @@ private function endProbe(Probe $probe): void
     {
         try {
             $this->client->endProbe($probe);
-        } catch (ExceptionInterface $exception) {
-            $this->logger->error(sprintf('Blackfire exception: %s', $exception->getMessage()));
+        } catch (LogicException|RuntimeException $exception) {
+            $this->logger->error(\sprintf('Blackfire exception: %s', $exception->getMessage()));
         }
     }
 }
diff --git a/src/SwooleResponseEmitter.php b/src/SwooleResponseEmitter.php
@@ -15,6 +15,7 @@ public function emit(ResponseInterface $response, SwooleResponse $swooleResponse
     {
         $swooleResponse->status($response->getStatusCode(), $response->getReasonPhrase());
 
+        /** @var string $name */
         foreach ($response->withoutHeader(SetCookies::SET_COOKIE_HEADER)->getHeaders() as $name => $values) {
             $swooleResponse->header($name, implode(', ', $values));
         }
diff --git a/tests/Unit/SwooleResponseEmitterTest.php b/tests/Unit/SwooleResponseEmitterTest.php
@@ -49,26 +49,52 @@ public function testInvoke(): void
             Call::create('getBody')->with()->willReturn($responseBody),
         ]);
 
-        /** @var MockObject|SwooleResponse $swooleResponse */
-        $swooleResponse = $this->getMockByCalls(SwooleResponse::class, [
-            Call::create('status')->with(200, 'OK')->willReturn(true),
-            Call::create('header')->with('Content-Type', 'application/json', true)->willReturn(true),
-            Call::create('cookie')
-                ->with(
-                    'id',
-                    'a3fWa',
-                    1_445_412_480,
-                    '/some/path',
-                    'some-domain.org',
-                    true,
-                    true,
-                    'Strict',
-                    ''
-                )
-                ->willReturn(true),
-            Call::create('write')->with('This is the body.')->willReturn(true),
-            Call::create('end')->with(null)->willReturn(true),
-        ]);
+        $installedVersion = phpversion('swoole');
+
+        if (version_compare($installedVersion, '6.0.0-RC1', '>=')) {
+            /** @var MockObject|SwooleResponse $swooleResponse */
+            $swooleResponse = $this->getMockByCalls(SwooleResponse::class, [
+                Call::create('status')->with(200, 'OK')->willReturn(true),
+                Call::create('header')->with('Content-Type', 'application/json', true)->willReturn(true),
+                Call::create('cookie')
+                    ->with(
+                        'id',
+                        'a3fWa',
+                        1_445_412_480,
+                        '/some/path',
+                        'some-domain.org',
+                        true,
+                        true,
+                        'Strict',
+                        '',
+                        false
+                    )
+                    ->willReturn(true),
+                Call::create('write')->with('This is the body.')->willReturn(true),
+                Call::create('end')->with(null)->willReturn(true),
+            ]);
+        } else {
+            /** @var MockObject|SwooleResponse $swooleResponse */
+            $swooleResponse = $this->getMockByCalls(SwooleResponse::class, [
+                Call::create('status')->with(200, 'OK')->willReturn(true),
+                Call::create('header')->with('Content-Type', 'application/json', true)->willReturn(true),
+                Call::create('cookie')
+                    ->with(
+                        'id',
+                        'a3fWa',
+                        1_445_412_480,
+                        '/some/path',
+                        'some-domain.org',
+                        true,
+                        true,
+                        'Strict',
+                        '',
+                    )
+                    ->willReturn(true),
+                Call::create('write')->with('This is the body.')->willReturn(true),
+                Call::create('end')->with(null)->willReturn(true),
+            ]);
+        }
 
         $swooleResponseEmitter = new SwooleResponseEmitter();
         $swooleResponseEmitter->emit($response, $swooleResponse);
@@ -101,24 +127,48 @@ public function testInvokeWithEmptyBody(): void
             Call::create('getBody')->with()->willReturn($responseBody),
         ]);
 
-        /** @var MockObject|SwooleResponse $swooleResponse */
-        $swooleResponse = $this->getMockByCalls(SwooleResponse::class, [
-            Call::create('status')->with(200, 'OK')->willReturn(true),
-            Call::create('header')->with('Content-Type', 'application/json', true)->willReturn(true),
-            Call::create('cookie')
-                ->with(
-                    'id',
-                    'a3fWa',
-                    1_445_412_480,
-                    '/',
-                    '',
-                    true,
-                    true,
-                    '',
-                    ''
-                )->willReturn(true),
-            Call::create('end')->with(null)->willReturn(true),
-        ]);
+        $installedVersion = phpversion('swoole');
+
+        if (version_compare($installedVersion, '6.0.0-RC1', '>=')) {
+            /** @var MockObject|SwooleResponse $swooleResponse */
+            $swooleResponse = $this->getMockByCalls(SwooleResponse::class, [
+                Call::create('status')->with(200, 'OK')->willReturn(true),
+                Call::create('header')->with('Content-Type', 'application/json', true)->willReturn(true),
+                Call::create('cookie')
+                    ->with(
+                        'id',
+                        'a3fWa',
+                        1_445_412_480,
+                        '/',
+                        '',
+                        true,
+                        true,
+                        '',
+                        '',
+                        false,
+                    )->willReturn(true),
+                Call::create('end')->with(null)->willReturn(true),
+            ]);
+        } else {
+            /** @var MockObject|SwooleResponse $swooleResponse */
+            $swooleResponse = $this->getMockByCalls(SwooleResponse::class, [
+                Call::create('status')->with(200, 'OK')->willReturn(true),
+                Call::create('header')->with('Content-Type', 'application/json', true)->willReturn(true),
+                Call::create('cookie')
+                    ->with(
+                        'id',
+                        'a3fWa',
+                        1_445_412_480,
+                        '/',
+                        '',
+                        true,
+                        true,
+                        '',
+                        '',
+                    )->willReturn(true),
+                Call::create('end')->with(null)->willReturn(true),
+            ]);
+        }
 
         $swooleResponseEmitter = new SwooleResponseEmitter();
         $swooleResponseEmitter->emit($response, $swooleResponse);

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`	`namespace Chubbyphp\SwooleRequestHandler\Adapter;`
`6`	`6`
`7`	`7`	`use Blackfire\Client;`
`8`		`-use Blackfire\Exception\ExceptionInterface;`
	`8`	`+use Blackfire\Exception\LogicException;`
	`9`	`+use Blackfire\Exception\RuntimeException;`
`9`	`10`	`use Blackfire\Probe;`
`10`	`11`	`use Blackfire\Profile\Configuration;`
`11`	`12`	`use Chubbyphp\SwooleRequestHandler\OnRequestInterface;`
`@@ -53,8 +54,8 @@ private function startProbe(): ?Probe`
`53`	`54`	`{`
`54`	`55`	`try {`
`55`	`56`	`return $this->client->createProbe($this->config);`
`56`		`- } catch (ExceptionInterface $exception) {`
`57`		`- $this->logger->error(sprintf('Blackfire exception: %s', $exception->getMessage()));`
	`57`	`+ } catch (LogicException\|RuntimeException $exception) {`
	`58`	`+ $this->logger->error(\sprintf('Blackfire exception: %s', $exception->getMessage()));`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`return null;`
`@@ -64,8 +65,8 @@ private function endProbe(Probe $probe): void`
`64`	`65`	`{`
`65`	`66`	`try {`
`66`	`67`	`$this->client->endProbe($probe);`
`67`		`- } catch (ExceptionInterface $exception) {`
`68`		`- $this->logger->error(sprintf('Blackfire exception: %s', $exception->getMessage()));`
	`68`	`+ } catch (LogicException\|RuntimeException $exception) {`
	`69`	`+ $this->logger->error(\sprintf('Blackfire exception: %s', $exception->getMessage()));`
`69`	`70`	`}`
`70`	`71`	`}`
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public function emit(ResponseInterface $response, SwooleResponse $swooleResponse`
`15`	`15`	`{`
`16`	`16`	`$swooleResponse->status($response->getStatusCode(), $response->getReasonPhrase());`
`17`	`17`
	`18`	`+ /** @var string $name */`
`18`	`19`	`foreach ($response->withoutHeader(SetCookies::SET_COOKIE_HEADER)->getHeaders() as $name => $values) {`
`19`	`20`	`$swooleResponse->header($name, implode(', ', $values));`
`20`	`21`	`}`