feat: support Symfony 6

.github/workflows/test.yml

@@ -20,16 +20,26 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        symfony:
-          - '4.4.*'
-          - '5.3.*'
-        php:
-          - '7.4'
-          - '8.0'
-          - '8.1'
+        include:
+          - symfony: '4.4.*'
+            php: '7.4'
+          - symfony: '4.4.*'
+            php: '8.0'
+          - symfony: '4.4.*'
+            php: '8.1'
+          - symfony: '5.4.*'
+            php: '7.4'
+          - symfony: '5.4.*'
+            php: '8.0'
+          - symfony: '5.4.*'
+            php: '8.1'
+          - symfony: '6.0.*'
+            php: '8.0'
+          - symfony: '6.0.*'
+            php: '8.1'
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
         with:
@@ -63,16 +73,26 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        symfony:
-          - '4.4.*'
-          - '5.3.*'
-        php:
-          - '7.4'
-          - '8.0'
-          - '8.1'
+        include:
+          - symfony: '4.4.*'
+            php: '7.4'
+          - symfony: '4.4.*'
+            php: '8.0'
+          - symfony: '4.4.*'
+            php: '8.1'
+          - symfony: '5.4.*'
+            php: '7.4'
+          - symfony: '5.4.*'
+            php: '8.0'
+          - symfony: '5.4.*'
+            php: '8.1'
+          - symfony: '6.0.*'
+            php: '8.0'
+          - symfony: '6.0.*'
+            php: '8.1'
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
         with:

DBAL/SQLSpanFactory.php

@@ -16,12 +16,12 @@
 
 final class SQLSpanFactory implements SpanFactory
 {
-    private $statementFormatter;
-    private $tracing;
-    private $tagFullStatement;
-    private $tagParameters;
-    private $tagRowCount;
-    private $tagUser;
+    private SQLStatementFormatter $statementFormatter;
+    private Tracing $tracing;
+    private bool $tagFullStatement;
+    private bool $tagParameters;
+    private bool $tagRowCount;
+    private bool $tagUser;
 
     public function __construct(
         SQLStatementFormatter $statementFormatter,

DBAL/TracingConnectionFactory.php

@@ -15,8 +15,8 @@
 
 final class TracingConnectionFactory
 {
-    private $connectionFactory;
-    private $eventListener;
+    private DoctrineConnectionFactory $connectionFactory;
+    private TracingEventListener $eventListener;
 
     public function __construct(
         DoctrineConnectionFactory $connectionFactory,

DBAL/TracingDriverConnection.php

@@ -13,10 +13,10 @@
  */
 final class TracingDriverConnection implements DBALDriverConnection, WrappingDriverConnection
 {
-    private $decoratedConnection;
-    private $tracing;
-    private $spanFactory;
-    private $username;
+    private DBALDriverConnection $decoratedConnection;
+    private Tracing $tracing;
+    private SpanFactory $spanFactory;
+    private ?string $username;
 
     public function __construct(
         DBALDriverConnection $decoratedConnection,
@@ -49,7 +49,7 @@ public function query()
         $parameters = array_slice($args, 1);
         $this->spanFactory->beforeOperation($args[0]);
         $result = $this->decoratedConnection->query(...$args);
-        $this->spanFactory->afterOperation($args[0], $parameters, $this->username, $result->rowCount());
+        $this->spanFactory->afterOperation($args[0], $parameters, $this->username, (int) $result->rowCount());
         return new TracingStatement($result, $this->spanFactory, $args[0], $this->username);
     }
 
@@ -70,7 +70,7 @@ public function exec($statement)
     {
         $this->spanFactory->beforeOperation($statement);
         $result = $this->decoratedConnection->exec($statement);
-        $this->spanFactory->afterOperation($statement, [], $this->username, $result);
+        $this->spanFactory->afterOperation($statement, [], $this->username, (int) $result);
         return $result;
     }
 

DBAL/TracingEventListener.php

@@ -12,8 +12,8 @@
 
 final class TracingEventListener
 {
-    private $tracing;
-    private $spanFactory;
+    private Tracing $tracing;
+    private SpanFactory $spanFactory;
 
     public function __construct(
         Tracing $tracing,

DBAL/TracingStatement.php

@@ -16,9 +16,9 @@ final class TracingStatement implements IteratorAggregate, StatementCombinedResu
      * @var Statement<Statement>
      */
     private $statement;
-    private $sql;
-    private $spanFactory;
-    private $username;
+    private string $sql;
+    private SpanFactory $spanFactory;
+    private ?string $username;
     /**
      * @var array<mixed>
      */
@@ -138,7 +138,7 @@ public function execute($params = null): bool
             $this->sql,
             $params ?? $this->params,
             $this->username,
-            $this->statement->rowCount()
+            (int) $this->statement->rowCount()
         );
         return $result;
     }

README.md

@@ -1,7 +1,7 @@
 # auxmoney OpentracingBundle - Doctrine DBAL
 
 [![test](https://github.com/auxmoney/OpentracingBundle-Doctrine-DBAL/workflows/test/badge.svg)](https://github.com/auxmoney/OpentracingBundle-Doctrine-DBAL/actions?query=workflow%3Atest)
-![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/auxmoney/OpentracingBundle-Doctrine-DBAL)
+[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/auxmoney/OpentracingBundle-Doctrine-DBAL)](https://github.com/auxmoney/OpentracingBundle-Doctrine-DBAL/releases/latest)
 ![Coveralls github](https://img.shields.io/coveralls/github/auxmoney/OpentracingBundle-Doctrine-DBAL)
 ![Codacy Badge](https://api.codacy.com/project/badge/Grade/5ccaae3d94cf41c68ad8de83ddcbca1a)
 ![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/auxmoney/OpentracingBundle-Doctrine-DBAL)

Tests/DBAL/SQLSpanFactoryTest.php

@@ -16,12 +16,11 @@ class SQLSpanFactoryTest extends TestCase
 
     private $statementFormatter;
     private $tracing;
-    private $tagFullStatement;
-    private $tagParameters;
-    private $tagRowCount;
-    private $tagUser;
-    /** @var SQLSpanFactory */
-    private $subject;
+    private string $tagFullStatement;
+    private string $tagParameters;
+    private string $tagRowCount;
+    private string $tagUser;
+    private SQLSpanFactory $subject;
 
     public function setUp(): void
     {

Tests/DBAL/SQLStatementFormatterServiceTest.php

@@ -9,8 +9,7 @@
 
 class SQLStatementFormatterServiceTest extends TestCase
 {
-    /** @var SQLStatementFormatterService */
-    private $subject;
+    private SQLStatementFormatterService $subject;
 
     public function setUp(): void
     {

Tests/DBAL/TracingConnectionFactoryTest.php

@@ -19,20 +19,17 @@ class TracingConnectionFactoryTest extends TestCase
     use ProphecyTrait;
 
     private $connectionFactory;
-    private $tracing;
-    private $spanFactory;
-    /** @var TracingConnectionFactory */
-    private $subject;
+    private TracingConnectionFactory $subject;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->connectionFactory = $this->prophesize(DoctrineConnectionFactory::class);
-        $this->tracing = $this->prophesize(Tracing::class);
-        $this->spanFactory = $this->prophesize(SpanFactory::class);
+        $tracing = $this->prophesize(Tracing::class);
+        $spanFactory = $this->prophesize(SpanFactory::class);
 
         $this->subject = new TracingConnectionFactory(
-            $this->connectionFactory->reveal(), $this->tracing->reveal(), $this->spanFactory->reveal()
+            $this->connectionFactory->reveal(), $tracing->reveal(), $spanFactory->reveal()
         );
     }
 

Tests/DBAL/TracingDriverConnectionTest.php

@@ -20,9 +20,8 @@ class TracingDriverConnectionTest extends TestCase
     private $decoratedConnection;
     private $tracing;
     private $spanFactory;
-    private $username;
-    /** @var TracingDriverConnection */
-    private $subject;
+    private string $username;
+    private TracingDriverConnection $subject;
 
     public function setUp(): void
     {

Tests/DBAL/TracingEventListenerTest.php

@@ -20,9 +20,7 @@ class TracingEventListenerTest extends TestCase
 
     private $tracing;
     private $spanFactory;
-
-    /** @var TracingEventListener */
-    private $subject;
+    private TracingEventListener $subject;
 
     public function setUp(): void
     {

Tests/DBAL/TracingStatementTest.php

@@ -16,10 +16,9 @@ class TracingStatementTest extends TestCase
 
     private $statement;
     private $spanFactory;
-    private $sql;
-    private $username;
-    /** @var TracingStatement */
-    private $subject;
+    private string $sql;
+    private string $username;
+    private TracingStatement $subject;
 
     public function setUp(): void
     {

Tests/DependencyInjection/OpentracingDoctrineDBALExtensionTest.php

@@ -10,8 +10,7 @@
 
 class OpentracingDoctrineDBALExtensionTest extends TestCase
 {
-    /** @var OpentracingDoctrineDBALExtension */
-    private $subject;
+    private OpentracingDoctrineDBALExtension $subject;
 
     public function setUp(): void
     {

composer.json

@@ -26,9 +26,9 @@
     "roave/security-advisories": "dev-latest",
     "phpunit/phpunit": "^9.5",
     "phpspec/prophecy-phpunit": "^2.0",
-    "phpstan/phpstan": "^1.1",
+    "phpstan/phpstan": "^1.5",
     "squizlabs/php_codesniffer": "^3.6",
-    "phpmd/phpmd": "^2.10",
+    "phpmd/phpmd": "^2.12",
     "php-coveralls/php-coveralls": "^2.5",
     "symfony/filesystem": "*",
     "symfony/process": "*",