Bump DBAL to 2.7+

derrabus · derrabus · commit 23f96499418d · 2021-09-01T11:21:30.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/composer.json b/composer.json
@@ -123,7 +123,7 @@
         "doctrine/cache": "^1.6|^2.0",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "^1.1",
-        "doctrine/dbal": "^2.6|^3.0",
+        "doctrine/dbal": "^2.7|^3.0",
         "doctrine/orm": "^2.6.3",
         "guzzlehttp/promises": "^1.4",
         "masterminds/html5": "^2.6",
@@ -143,6 +143,7 @@
         "twig/markdown-extra": "^2.12|^3"
     },
     "conflict": {
+        "doctrine/dbal": "<2.7",
         "egulias/email-validator": "~3.0.0",
         "masterminds/html5": "<2.6",
         "monolog/monolog": ">=2",
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -64,7 +64,7 @@ public function loadTokenBySeries($series)
         $sql = 'SELECT class, username, value, lastUsed AS last_used'
             .' FROM rememberme_token WHERE series=:series';
         $paramValues = ['series' => $series];
-        $paramTypes = ['series' => class_exists(ParameterType::class) ? ParameterType::STRING : \PDO::PARAM_STR];
+        $paramTypes = ['series' => ParameterType::STRING];
         $stmt = $this->conn->executeQuery($sql, $paramValues, $paramTypes);
         $row = $stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchAssociative() : $stmt->fetch(\PDO::FETCH_ASSOC);
 
@@ -82,7 +82,7 @@ public function deleteTokenBySeries($series)
     {
         $sql = 'DELETE FROM rememberme_token WHERE series=:series';
         $paramValues = ['series' => $series];
-        $paramTypes = ['series' => class_exists(ParameterType::class) ? ParameterType::STRING : \PDO::PARAM_STR];
+        $paramTypes = ['series' => ParameterType::STRING];
         if (method_exists($this->conn, 'executeStatement')) {
             $this->conn->executeStatement($sql, $paramValues, $paramTypes);
         } else {
@@ -103,9 +103,9 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed)
             'series' => $series,
         ];
         $paramTypes = [
-            'value' => class_exists(ParameterType::class) ? ParameterType::STRING : \PDO::PARAM_STR,
+            'value' => ParameterType::STRING,
             'lastUsed' => self::$useDeprecatedConstants ? Type::DATETIME : Types::DATETIME_MUTABLE,
-            'series' => class_exists(ParameterType::class) ? ParameterType::STRING : \PDO::PARAM_STR,
+            'series' => ParameterType::STRING,
         ];
         if (method_exists($this->conn, 'executeStatement')) {
             $updated = $this->conn->executeStatement($sql, $paramValues, $paramTypes);
@@ -133,10 +133,10 @@ public function createNewToken(PersistentTokenInterface $token)
             'lastUsed' => $token->getLastUsed(),
         ];
         $paramTypes = [
-            'class' => class_exists(ParameterType::class) ? ParameterType::STRING : \PDO::PARAM_STR,
-            'username' => class_exists(ParameterType::class) ? ParameterType::STRING : \PDO::PARAM_STR,
-            'series' => class_exists(ParameterType::class) ? ParameterType::STRING : \PDO::PARAM_STR,
-            'value' => class_exists(ParameterType::class) ? ParameterType::STRING : \PDO::PARAM_STR,
+            'class' => ParameterType::STRING,
+            'username' => ParameterType::STRING,
+            'series' => ParameterType::STRING,
+            'value' => ParameterType::STRING,
             'lastUsed' => self::$useDeprecatedConstants ? Type::DATETIME : Types::DATETIME_MUTABLE,
         ];
         if (method_exists($this->conn, 'executeStatement')) {
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -43,11 +43,11 @@
         "doctrine/annotations": "^1.10.4",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "^1.1",
-        "doctrine/dbal": "^2.6|^3.0",
+        "doctrine/dbal": "^2.7|^3.0",
         "doctrine/orm": "^2.6.3"
     },
     "conflict": {
-        "doctrine/dbal": "<2.6",
+        "doctrine/dbal": "<2.7",
         "doctrine/orm": "<2.6.3",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/dependency-injection": "<3.4",
