bug #37563 Fix DBAL deprecation (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 3ae61ec22cff · 2020-07-12T12:25:53.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Fix DBAL deprecation | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Follows doctrine/dbal#4163 Commits ------- 4273aed Fix DBAL deprecation
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -81,7 +81,11 @@ public function deleteTokenBySeries($series)
         $sql = 'DELETE FROM rememberme_token WHERE series=:series';
         $paramValues = ['series' => $series];
         $paramTypes = ['series' => \PDO::PARAM_STR];
-        $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        if (method_exists($this->conn, 'executeStatement')) {
+            $this->conn->executeStatement($sql, $paramValues, $paramTypes);
+        } else {
+            $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        }
     }
 
     /**
@@ -101,7 +105,11 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed)
             'lastUsed' => self::$useDeprecatedConstants ? Type::DATETIME : Types::DATETIME_MUTABLE,
             'series' => \PDO::PARAM_STR,
         ];
-        $updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        if (method_exists($this->conn, 'executeStatement')) {
+            $updated = $this->conn->executeStatement($sql, $paramValues, $paramTypes);
+        } else {
+            $updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        }
         if ($updated < 1) {
             throw new TokenNotFoundException('No token found.');
         }
@@ -129,6 +137,10 @@ public function createNewToken(PersistentTokenInterface $token)
             'value' => \PDO::PARAM_STR,
             'lastUsed' => self::$useDeprecatedConstants ? Type::DATETIME : Types::DATETIME_MUTABLE,
         ];
-        $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        if (method_exists($this->conn, 'executeStatement')) {
+            $this->conn->executeStatement($sql, $paramValues, $paramTypes);
+        } else {
+            $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        }
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
@@ -72,7 +72,7 @@ private function bootstrapProvider()
             'driver' => 'pdo_sqlite',
             'url' => 'sqlite:///:memory:',
         ]);
-        $connection->executeUpdate(<<< 'SQL'
+        $connection->{method_exists($this->conn, 'executeStatement') ? 'executeStatement' : 'executeUpdate'}(<<< 'SQL'
             CREATE TABLE rememberme_token (
                 series   char(88)     UNIQUE PRIMARY KEY NOT NULL,
                 value    char(88)     NOT NULL,
diff --git a/src/Symfony/Component/Cache/Traits/PdoTrait.php b/src/Symfony/Component/Cache/Traits/PdoTrait.php
@@ -107,7 +107,11 @@ public function createTable()
             $table->setPrimaryKey([$this->idCol]);
 
             foreach ($schema->toSql($conn->getDatabasePlatform()) as $sql) {
-                $conn->exec($sql);
+                if (method_exists($conn, 'executeStatement')) {
+                    $conn->executeStatement($sql);
+                } else {
+                    $conn->exec($sql);
+                }
             }
 
             return;
@@ -138,7 +142,11 @@ public function createTable()
                 throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $this->driver));
         }
 
-        $conn->exec($sql);
+        if (method_exists($conn, 'executeStatement')) {
+            $conn->executeStatement($sql);
+        } else {
+            $conn->exec($sql);
+        }
     }
 
     /**
@@ -238,7 +246,11 @@ protected function doClear($namespace)
             $sql = "DELETE FROM $this->table WHERE $this->idCol LIKE '$namespace%'";
         }
 
-        $conn->exec($sql);
+        if (method_exists($conn, 'executeStatement')) {
+            $conn->executeStatement($sql);
+        } else {
+            $conn->exec($sql);
+        }
 
         return true;
     }
