Support PHP 8.1 and Symfony 6.1 (limiting BC to PHP 7.2)

.github/workflows/ci.yml

@@ -17,19 +17,19 @@ jobs:
 
   build:
     name: Build
-    runs-on: Ubuntu-20.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
         composer: ['']
         phpunit: ['']
         deprecation: ['']
         symfony: ['']
         stability: ['']
         include:
           # Minimum supported dependencies with the latest and oldest PHP version
-          - php: 8.0
+          - php: 8.1
             composer: --prefer-stable --prefer-lowest
             deprecation: max[direct]=0
           - php: 7.1
@@ -39,13 +39,16 @@ jobs:
           # symfony version
           - php: 8.0
             symfony: '^3.0'
-          - php: 8.0
+          - php: 8.1
+            symfony: '^3.0'
+            deprecation: max[self]=0 # since Symfony 3 itself causes them...
+          - php: 8.1
             symfony: '^4.0'
-          - php: 8.0
+          - php: 8.1
             symfony: '^5.0'
 
           # dev
-          - php: 8.0
+          - php: 8.1
             stability: 'dev'
 
     steps:

Command/NotifyDeploymentCommand.php

@@ -25,8 +25,6 @@ class NotifyDeploymentCommand extends Command
     public const EXIT_UNAUTHORIZED = 2;
     public const EXIT_HTTP_ERROR = 3;
 
-    protected static $defaultName = 'newrelic:notify-deployment';
-
     private $newrelic;
 
     public function __construct(Config $newrelic)

Logging/AdaptiveHandler.php

@@ -14,6 +14,7 @@
 namespace Ekino\NewRelicBundle\Logging;
 
 use Monolog\Handler\NewRelicHandler;
+use Monolog\LogRecord;
 use Psr\Log\LogLevel;
 
 class AdaptiveHandler extends NewRelicHandler
@@ -28,7 +29,7 @@ public function __construct(
         parent::__construct($level, $bubble, $appName, $explodeArrays, $transactionName);
     }
 
-    protected function write(array $record): void
+    protected function write($record): void
     {
         if (!$this->isNewRelicEnabled()) {
             return;

Resources/config/services.xml

@@ -10,6 +10,10 @@
         <prototype namespace="Ekino\NewRelicBundle\NewRelic\" resource="../../NewRelic/*" />
         <prototype namespace="Ekino\NewRelicBundle\TransactionNamingStrategy\" resource="../../TransactionNamingStrategy/*" />
 
+        <service id="Ekino\NewRelicBundle\Command\NotifyDeploymentCommand" autowire="true" autoconfigure="true">
+            <tag name="console.command" command="newrelic:notify-deployment" />
+        </service>
+
         <service id="Ekino\NewRelicBundle\NewRelic\AdaptiveInteractor">
             <argument type="service" id="Ekino\NewRelicBundle\NewRelic\NewRelicInteractor" />
             <argument type="service" id="Ekino\NewRelicBundle\NewRelic\BlackholeInteractor" />

Tests/AppKernel.php

@@ -98,6 +98,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                     'resource' => 'kernel:loadRoutes',
                     'type' => 'service',
                 ],
+                'http_method_override' => false,
             ]);
 
             // Not setting the router to utf8 is deprecated in symfony 5.1
@@ -158,4 +159,17 @@ public function process(ContainerBuilder $container)
 
         return $container;
     }
+
+    /**
+     * @throws \Exception
+     */
+    public function __serialize(): array
+    {
+        return unserialize($this->serialize());
+    }
+
+    public function __unserialize(array $data): void
+    {
+        $this->unserialize(serialize($data));
+    }
 }

composer.json

@@ -21,7 +21,7 @@
         "symfony/http-kernel": "^3.4|^4.0|^5.0|^6.0"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^3.1|^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "symfony/framework-bundle": "^3.4|^4.0|^5.0|^6.0",
         "symfony/phpunit-bridge": "^5.3",
         "symfony/debug": ">3.4.21",