Merge branch '4.4' into 5.3

* 4.4:
  Fix tests failing with DBAL 3

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

Security/RememberMe/DoctrineTokenProvider.php

@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\Result as DriverResult;
+use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
@@ -57,7 +58,7 @@ public function loadTokenBySeries(string $series)
         // the alias for lastUsed works around case insensitivity in PostgreSQL
         $sql = 'SELECT class, username, value, lastUsed AS last_used FROM rememberme_token WHERE series=:series';
         $paramValues = ['series' => $series];
-        $paramTypes = ['series' => \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);
 
@@ -75,7 +76,7 @@ public function deleteTokenBySeries(string $series)
     {
         $sql = 'DELETE FROM rememberme_token WHERE series=:series';
         $paramValues = ['series' => $series];
-        $paramTypes = ['series' => \PDO::PARAM_STR];
+        $paramTypes = ['series' => ParameterType::STRING];
         if (method_exists($this->conn, 'executeStatement')) {
             $this->conn->executeStatement($sql, $paramValues, $paramTypes);
         } else {
@@ -95,9 +96,9 @@ public function updateToken(string $series, string $tokenValue, \DateTime $lastU
             'series' => $series,
         ];
         $paramTypes = [
-            'value' => \PDO::PARAM_STR,
+            'value' => ParameterType::STRING,
             'lastUsed' => Types::DATETIME_MUTABLE,
-            'series' => \PDO::PARAM_STR,
+            'series' => ParameterType::STRING,
         ];
         if (method_exists($this->conn, 'executeStatement')) {
             $updated = $this->conn->executeStatement($sql, $paramValues, $paramTypes);
@@ -124,10 +125,10 @@ public function createNewToken(PersistentTokenInterface $token)
             'lastUsed' => $token->getLastUsed(),
         ];
         $paramTypes = [
-            'class' => \PDO::PARAM_STR,
-            'username' => \PDO::PARAM_STR,
-            'series' => \PDO::PARAM_STR,
-            'value' => \PDO::PARAM_STR,
+            'class' => ParameterType::STRING,
+            'username' => ParameterType::STRING,
+            'series' => ParameterType::STRING,
+            'value' => ParameterType::STRING,
             'lastUsed' => Types::DATETIME_MUTABLE,
         ];
         if (method_exists($this->conn, 'executeStatement')) {

Tests/DataCollector/DoctrineDataCollectorTest.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\DataCollector;
 
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Logging\DebugStack;
-use Doctrine\DBAL\Platforms\MySqlPlatform;
-use Doctrine\DBAL\Version;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector;
@@ -22,6 +22,9 @@
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
 
+// Doctrine DBAL 2 compatibility
+class_exists(\Doctrine\DBAL\Platforms\MySqlPlatform::class);
+
 class DoctrineDataCollectorTest extends TestCase
 {
     public function testCollectConnections()
@@ -93,6 +96,8 @@ public function testCollectQueries($param, $types, $expected, $explainable, bool
             $dumper->setColors(false);
             $collectedParam->dump($dumper);
             $this->assertStringMatchesFormat($expected, print_r(stream_get_contents($out, -1, 0), true));
+        } elseif (\is_string($expected)) {
+            $this->assertStringMatchesFormat($expected, $collectedParam);
         } else {
             $this->assertEquals($expected, $collectedParam);
         }
@@ -150,7 +155,7 @@ public function testReset()
     /**
      * @dataProvider paramProvider
      */
-    public function testSerialization($param, $types, $expected, $explainable, bool $runnable = true)
+    public function testSerialization($param, array $types, $expected, $explainable, bool $runnable = true)
     {
         $queries = [
             ['sql' => 'SELECT * FROM table1 WHERE field1 = ?1', 'params' => [$param], 'types' => $types, 'executionMS' => 1],
@@ -167,6 +172,8 @@ public function testSerialization($param, $types, $expected, $explainable, bool
             $dumper->setColors(false);
             $collectedParam->dump($dumper);
             $this->assertStringMatchesFormat($expected, print_r(stream_get_contents($out, -1, 0), true));
+        } elseif (\is_string($expected)) {
+            $this->assertStringMatchesFormat($expected, $collectedParam);
         } else {
             $this->assertEquals($expected, $collectedParam);
         }
@@ -175,9 +182,9 @@ public function testSerialization($param, $types, $expected, $explainable, bool
         $this->assertSame($runnable, $collectedQueries['default'][0]['runnable']);
     }
 
-    public function paramProvider()
+    public function paramProvider(): array
     {
-        $tests = [
+        return [
             ['some value', [], 'some value', true],
             [1, [], 1, true],
             [true, [], true, true],
@@ -207,30 +214,25 @@ public function paramProvider()
                 ,
                 false,
             ],
-        ];
-
-        if (version_compare(Version::VERSION, '2.6', '>=')) {
-            $tests[] = ['this is not a date', ['date'], "⚠ Could not convert PHP value 'this is not a date' of type 'string' to type 'date'. Expected one of the following types: null, DateTime", false, false];
-            $tests[] = [
+            ['this is not a date', ['date'], "⚠ Could not convert PHP value 'this is not a date'%S to type %Sdate%S. Expected one of the following types: null, DateTime", false, false],
+            [
                 new \stdClass(),
                 ['date'],
                 <<<EOTXT
 {#%d
-  ⚠: "Could not convert PHP value of type 'stdClass' to type 'date'. Expected one of the following types: null, DateTime"
+  ⚠: "Could not convert PHP value of type %SstdClass%S to type %Sdate%S. Expected one of the following types: null, DateTime"
 }
 EOTXT
                 ,
                 false,
                 false,
-            ];
-        }
-
-        return $tests;
+            ],
+        ];
     }
 
-    private function createCollector($queries)
+    private function createCollector(array $queries): DoctrineDataCollector
     {
-        $connection = $this->getMockBuilder(\Doctrine\DBAL\Connection::class)
+        $connection = $this->getMockBuilder(Connection::class)
             ->disableOriginalConstructor()
             ->getMock();
         $connection->expects($this->any())

Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php

@@ -103,9 +103,12 @@ public function testInvalidEntityManagerThrowsException()
 
     public function testMiddlewareNoPingInNonWorkerContext()
     {
-        $this->connection->expects($this->never())
-            ->method('ping')
-            ->willReturn(false);
+        // This method has been removed in DBAL 3.0
+        if (method_exists(Connection::class, 'ping')) {
+            $this->connection->expects($this->never())
+                ->method('ping')
+                ->willReturn(false);
+        }
 
         $this->connection->expects($this->never())
             ->method('close')

composer.json

@@ -52,6 +52,7 @@
     },
     "conflict": {
         "doctrine/dbal": "<2.10",
+        "doctrine/orm": "<2.7.3",
         "phpunit/phpunit": "<5.4.3",
         "symfony/dependency-injection": "<4.4",
         "symfony/form": "<5.1",