php85

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,9 +25,9 @@ A request handler adapter for swoole, using PSR-7, PSR-15 and PSR-17.
 
 ## Requirements
 
- * php: ^8.2
- * [ext-swoole][2]: ^5.1.7|^6.0
- * [dflydev/fig-cookies][3]: ^3.1
+ * php: ^8.3
+ * [ext-swoole][2]: ^5.1.8|^6.1.3
+ * [dflydev/fig-cookies][3]: ^3.2
  * [psr/http-factory][4]: ^1.1
  * [psr/http-message][5]: ^1.1|^2.0
  * [psr/http-server-handler][6]: ^1.0.2
@@ -38,7 +38,7 @@ A request handler adapter for swoole, using PSR-7, PSR-15 and PSR-17.
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-swoole-request-handler][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-swoole-request-handler "^1.5"
+composer require chubbyphp/chubbyphp-swoole-request-handler "^1.6"
 ```
 
 ## Usage

composer.json

@@ -17,24 +17,24 @@
         }
     ],
     "require": {
-        "php": "^8.2",
-        "ext-swoole": "^5.1.7|^6.0",
-        "dflydev/fig-cookies": "^3.1",
+        "php": "^8.3",
+        "ext-swoole": "^5.1.8|^6.1.3",
+        "dflydev/fig-cookies": "^3.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.2"
     },
     "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",
-        "swoole/ide-helper": "^5.1.7|^6.0"
+        "phpstan/phpstan": "^2.1.32",
+        "phpunit/phpunit": "^12.4.5",
+        "swoole/ide-helper": "^5.1.8|^6.1.3"
     },
     "autoload": {
         "psr-4": {
@@ -59,7 +59,7 @@
         }
     },
     "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",
@@ -68,7 +68,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=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",

src/Adapter/BlackfireOnRequestAdapter.php

@@ -17,19 +17,12 @@
 
 final class BlackfireOnRequestAdapter implements OnRequestInterface
 {
-    private Configuration $config;
-
-    private LoggerInterface $logger;
-
     public function __construct(
         private OnRequestInterface $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(SwooleRequest $swooleRequest, SwooleResponse $swooleResponse): void
     {

tests/Unit/Adapter/BlackfireOnRequestAdapterTest.php

@@ -6,6 +6,7 @@
 
 use Blackfire\Client;
 use Blackfire\Exception\LogicException;
+use Blackfire\Exception\RuntimeException;
 use Blackfire\Probe;
 use Blackfire\Profile\Configuration;
 use Chubbyphp\Mock\MockMethod\WithCallback;
@@ -121,7 +122,7 @@ public function testInvokeWithConfigAndWithLogger(): void
     }
 
     #[DoesNotPerformAssertions]
-    public function testInvokeWithExceptionOnCreateProbe(): void
+    public function testInvokeWithLogicExceptionOnCreateProbe(): void
     {
         $builder = new MockObjectBuilder();
 
@@ -157,7 +158,43 @@ public function testInvokeWithExceptionOnCreateProbe(): void
     }
 
     #[DoesNotPerformAssertions]
-    public function testInvokeWithExceptionOnProbeEnd(): void
+    public function testInvokeWithRuntimeExceptionOnCreateProbe(): void
+    {
+        $builder = new MockObjectBuilder();
+
+        /** @var SwooleRequest $swooleRequest */
+        $swooleRequest = $builder->create(SwooleRequest::class, []);
+        $swooleRequest->header['x-blackfire-query'] = 'swoole';
+
+        /** @var SwooleResponse $swooleResponse */
+        $swooleResponse = $builder->create(SwooleResponse::class, []);
+
+        /** @var OnRequestInterface $onRequest */
+        $onRequest = $builder->create(OnRequestInterface::class, [
+            new WithoutReturn('__invoke', [$swooleRequest, $swooleResponse]),
+        ]);
+
+        /** @var Configuration $config */
+        $config = $builder->create(Configuration::class, []);
+
+        $exception = new RuntimeException('Something went wrong');
+
+        /** @var Client $client */
+        $client = $builder->create(Client::class, [
+            new WithException('createProbe', [$config, true], $exception),
+        ]);
+
+        /** @var LoggerInterface $logger */
+        $logger = $builder->create(LoggerInterface::class, [
+            new WithoutReturn('error', ['Blackfire exception: Something went wrong', []]),
+        ]);
+
+        $adapter = new BlackfireOnRequestAdapter($onRequest, $client, $config, $logger);
+        $adapter($swooleRequest, $swooleResponse);
+    }
+
+    #[DoesNotPerformAssertions]
+    public function testInvokeWithLogicExceptionOnProbeEnd(): void
     {
         $builder = new MockObjectBuilder();
 
@@ -195,4 +232,44 @@ public function testInvokeWithExceptionOnProbeEnd(): void
         $adapter = new BlackfireOnRequestAdapter($onRequest, $client, $config, $logger);
         $adapter($swooleRequest, $swooleResponse);
     }
+
+    #[DoesNotPerformAssertions]
+    public function testInvokeWithRuntimeExceptionOnProbeEnd(): void
+    {
+        $builder = new MockObjectBuilder();
+
+        /** @var SwooleRequest $swooleRequest */
+        $swooleRequest = $builder->create(SwooleRequest::class, []);
+        $swooleRequest->header['x-blackfire-query'] = 'swoole';
+
+        /** @var SwooleResponse $swooleResponse */
+        $swooleResponse = $builder->create(SwooleResponse::class, []);
+
+        /** @var OnRequestInterface $onRequest */
+        $onRequest = $builder->create(OnRequestInterface::class, [
+            new WithoutReturn('__invoke', [$swooleRequest, $swooleResponse]),
+        ]);
+
+        /** @var Configuration $config */
+        $config = $builder->create(Configuration::class, []);
+
+        /** @var Probe $probe */
+        $probe = $builder->create(Probe::class, []);
+
+        $exception = new RuntimeException('Something went wrong');
+
+        /** @var Client $client */
+        $client = $builder->create(Client::class, [
+            new WithReturn('createProbe', [$config, true], $probe),
+            new WithException('endProbe', [$probe], $exception),
+        ]);
+
+        /** @var LoggerInterface $logger */
+        $logger = $builder->create(LoggerInterface::class, [
+            new WithoutReturn('error', ['Blackfire exception: Something went wrong', []]),
+        ]);
+
+        $adapter = new BlackfireOnRequestAdapter($onRequest, $client, $config, $logger);
+        $adapter($swooleRequest, $swooleResponse);
+    }
 }