Merge pull request #8 from drewblin/migrate-to-doctrine-dbal-4

Add support of doctrine/dbal 4.0

Author: andrew-demb

composer.json

@@ -2,12 +2,13 @@
   "name": "code-tool/doctrine-dbal-jaeger",
   "license": "MIT",
   "require": {
-    "php": "^7.4 || ^8",
-    "doctrine/dbal": "^3.0",
+    "php": "^8.1",
+    "doctrine/dbal": "^4.0",
     "code-tool/jaeger-client-php": "^3"
-  },
+  }
+  ,
   "require-dev": {
-    "phpunit/phpunit": "^7.2 || ^8"
+    "roave/security-advisories": "dev-latest"
   },
   "config": {
     "sort-packages": true

src/Wrapper/JaegerConnectionWrapper.php

@@ -14,16 +14,12 @@
 
 class JaegerConnectionWrapper extends AbstractConnectionMiddleware
 {
-    private TracerInterface $tracer;
-
-    private ?int $maxSqlLength;
-
-    public function __construct(Connection $wrappedConnection, TracerInterface $tracer, ?int $maxSqlLength = null)
-    {
+    public function __construct(
+        Connection $wrappedConnection,
+        private readonly TracerInterface $tracer,
+        private readonly ?int $maxSqlLength = null
+    ) {
         parent::__construct($wrappedConnection);
-
-        $this->tracer = $tracer;
-        $this->maxSqlLength = $maxSqlLength;
     }
 
     public function prepare(string $sql): Statement
@@ -89,13 +85,13 @@ public function exec(string $sql): int
         }
     }
 
-    public function beginTransaction(): bool
+    public function beginTransaction(): void
     {
         $span = $this->tracer
             ->start('dbal.transaction');
 
         try {
-            return parent::beginTransaction();
+            parent::beginTransaction();
         } catch (\Throwable $t) {
             $span
                 ->addTag(new DbalErrorCodeTag($t->getCode()))
@@ -107,13 +103,13 @@ public function beginTransaction(): bool
         }
     }
 
-    public function commit(): bool
+    public function commit(): void
     {
         $span = $this->tracer
             ->start('dbal.commit');
 
         try {
-            return parent::commit();
+            parent::commit();
         } catch (\Throwable $t) {
             $span
                 ->addTag(new DbalErrorCodeTag($t->getCode()))
@@ -125,13 +121,13 @@ public function commit(): bool
         }
     }
 
-    public function rollBack(): bool
+    public function rollBack(): void
     {
         $span = $this->tracer
             ->start('dbal.rollback');
 
         try {
-            return parent::rollBack();
+            parent::rollBack();
         } catch (\Throwable $t) {
             $span
                 ->addTag(new DbalErrorCodeTag($t->getCode()))

src/Wrapper/JaegerDriverWrapper.php

@@ -13,16 +13,12 @@
 
 class JaegerDriverWrapper extends AbstractDriverMiddleware
 {
-    private TracerInterface $tracer;
-
-    private ?int $maxSqlLength;
-
-    public function __construct(Driver $wrappedDriver, TracerInterface $tracer, ?int $maxSqlLength = null)
-    {
+    public function __construct(
+        private readonly Driver $wrappedDriver,
+        private readonly TracerInterface $tracer,
+        private readonly ?int $maxSqlLength = null
+    ) {
         parent::__construct($wrappedDriver);
-
-        $this->tracer = $tracer;
-        $this->maxSqlLength = $maxSqlLength;
     }
 
     public function connect(array $params): DriverConnection
@@ -42,7 +38,7 @@ public function connect(array $params): DriverConnection
 
             throw $t;
         } finally {
-            $span->addTag(new DbType(\get_class($this->getDatabasePlatform())));
+            $span->addTag(new DbType($this->wrappedDriver::class));
 
             $this->tracer->finish($span);
         }

src/Wrapper/JaegerMiddleware.php

@@ -9,14 +9,10 @@
 
 class JaegerMiddleware implements Middleware
 {
-    private TracerInterface $tracer;
-
-    private ?int $maxSqlLength;
-
-    public function __construct(TracerInterface $tracer, ?int $maxSqlLength = null)
-    {
-        $this->tracer = $tracer;
-        $this->maxSqlLength = $maxSqlLength;
+    public function __construct(
+        private readonly TracerInterface $tracer,
+        private readonly ?int $maxSqlLength = null
+    ) {
     }
 
     public function wrap(Driver $driver): Driver

src/Wrapper/JaegerStatementWrapper.php

@@ -13,26 +13,22 @@
 
 class JaegerStatementWrapper extends AbstractStatementMiddleware
 {
-    private TracerInterface $tracer;
-
-    private string $sql;
-
-    public function __construct(Statement $wrappedStatement, TracerInterface $tracer, string $sql)
-    {
+    public function __construct(
+        Statement $wrappedStatement,
+        private readonly TracerInterface $tracer,
+        private readonly string $sql
+    ) {
         parent::__construct($wrappedStatement);
-
-        $this->tracer = $tracer;
-        $this->sql = $sql;
     }
 
-    public function execute($params = null): Result
+    public function execute(): Result
     {
         $span = $this->tracer
             ->start('dbal.stmt.execute')
             ->addTag(new DbStatementTag($this->sql));
 
         try {
-            return parent::execute($params);
+            return parent::execute();
         } catch (\Throwable $t) {
             $span
                 ->addTag(new DbalErrorCodeTag($t->getCode()))