Try to work around Roave/infection-static-analysis-plugin#465 by chan…

…ging trait override technique
facile-it · Sep 26, 2024 · 720014e · 720014e
1 parent 1a39930
commit 720014e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/Connection.php b/src/Connection.php
@@ -2,6 +2,7 @@
 
 namespace Facile\DoctrineMySQLComeBack\Doctrine\DBAL;
 
+/** @psalm-suppress PropertyNotSetInConstructor */
 class Connection extends \Doctrine\DBAL\Connection
 {
     use ConnectionTrait;

diff --git a/src/ConnectionTrait.php b/src/ConnectionTrait.php
@@ -40,6 +40,18 @@ public function __construct(
         Driver $driver,
         ?Configuration $config = null
     ) {
+        $this->commonConstructor($params, $driver, $config);
+    }
+
+    /**
+     * @param array $params
+     * @param Driver $driver
+     * @param Configuration|null $config
+     *
+     * @return void
+     */
+    private function commonConstructor(array &$params, Driver $driver, ?Configuration $config): void
+    {
         if (isset($params['driverOptions']['x_reconnect_attempts'])) {
             $this->maxReconnectAttempts = $this->validateAttemptsOption($params['driverOptions']['x_reconnect_attempts']);
             unset($params['driverOptions']['x_reconnect_attempts']);

diff --git a/src/Connections/PrimaryReadReplicaConnection.php b/src/Connections/PrimaryReadReplicaConnection.php
@@ -8,9 +8,7 @@
 
 class PrimaryReadReplicaConnection extends \Doctrine\DBAL\Connections\PrimaryReadReplicaConnection
 {
-    use ConnectionTrait {
-        __construct as __traitConstruct;
-    }
+    use ConnectionTrait;
 
     public function __construct(array $params, Driver $driver, ?Configuration $config = null)
     {
@@ -19,6 +17,6 @@ public function __construct(array $params, Driver $driver, ?Configuration $confi
             unset($params['primary']['driverOptions']['x_reconnect_attempts']);
         }
 
-        self::__traitConstruct($params, $driver, $config);
+        $this->commonConstructor($params, $driver, $config);
     }
 }