Merge branch '3.5.x' into 3.6.x

* 3.5.x:
  Don't partially mock the AbstractPlatform class (#12114)

Author: derrabus

tests/Tests/ORM/Query/SelectSqlGenerationTest.php

@@ -452,6 +452,8 @@ public function testSupportsMultipleJoins(): void
 
     public function testSupportsTrimFunction(): void
     {
+        $this->entityManager = $this->createTestEntityManagerWithPlatform(new MySQLPlatform());
+
         $this->assertSqlGeneration(
             "SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE TRIM(TRAILING ' ' FROM u.name) = 'someone'",
             "SELECT c0_.name AS name_0 FROM cms_users c0_ WHERE TRIM(TRAILING ' ' FROM c0_.name) = 'someone'",
@@ -461,6 +463,8 @@ public function testSupportsTrimFunction(): void
     #[Group('DDC-2668')]
     public function testSupportsTrimLeadingZeroString(): void
     {
+        $this->entityManager = $this->createTestEntityManagerWithPlatform(new MySQLPlatform());
+
         $this->assertSqlGeneration(
             "SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE TRIM(TRAILING '0' FROM u.name) != ''",
             "SELECT c0_.name AS name_0 FROM cms_users c0_ WHERE TRIM(TRAILING '0' FROM c0_.name) <> ''",
@@ -584,6 +588,8 @@ public function testSupportsNotInExpressionInWherePart(): void
     #[Group('DDC-1802')]
     public function testSupportsNotInExpressionForModFunction(): void
     {
+        $this->entityManager = $this->createTestEntityManagerWithPlatform(new MySQLPlatform());
+
         $this->assertSqlGeneration(
             'SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE MOD(u.id, 5) NOT IN(1,3,4)',
             'SELECT c0_.name AS name_0 FROM cms_users c0_ WHERE MOD(c0_.id, 5) NOT IN (1, 3, 4)',
@@ -1925,6 +1931,8 @@ public function testCaseThenParameterArithmeticExpression(): void
     #[Group('DDC-2268')]
     public function testCaseThenFunction(): void
     {
+        $this->entityManager = $this->createTestEntityManagerWithPlatform(new PostgreSQLPlatform());
+
         $this->assertSqlGeneration(
             'SELECT CASE WHEN LENGTH(u.name) <> 0 THEN CONCAT(u.id, u.name) ELSE u.id END AS name  FROM Doctrine\Tests\Models\CMS\CmsUser u',
             'SELECT CASE WHEN LENGTH(c0_.name) <> 0 THEN c0_.id || c0_.name ELSE c0_.id END AS sclr_0 FROM cms_users c0_',

tests/Tests/OrmTestCase.php

@@ -8,9 +8,7 @@
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\Result;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use Doctrine\DBAL\Schema\Name\UnquotedIdentifierFolding;
-use Doctrine\DBAL\Schema\SchemaConfig;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\ORM\Cache\CacheConfiguration;
 use Doctrine\ORM\Cache\CacheFactory;
 use Doctrine\ORM\Cache\DefaultCacheFactory;
@@ -22,11 +20,14 @@
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
-use function enum_exists;
+use function class_exists;
 use function method_exists;
 use function realpath;
 use function sprintf;
 
+// DBAL 3 compatibility
+class_exists('Doctrine\\DBAL\\Platforms\\SqlitePlatform');
+
 /**
  * Base testcase class for all ORM testcases.
  */
@@ -71,9 +72,7 @@ protected function createAttributeDriver(array $paths = []): AttributeDriver
      */
     protected function getTestEntityManager(): EntityManagerMock
     {
-        return $this->buildTestEntityManagerWithPlatform(
-            $this->createConnectionMock($this->createPlatformMock()),
-        );
+        return $this->createTestEntityManagerWithPlatform(new SQLitePlatform());
     }
 
     protected function createTestEntityManagerWithConnection(Connection $connection): EntityManagerMock
@@ -153,24 +152,6 @@ private function createConnectionMock(AbstractPlatform $platform): Connection
         return $connection;
     }
 
-    private function createPlatformMock(): AbstractPlatform
-    {
-        $schemaManager = $this->createMock(AbstractSchemaManager::class);
-        $schemaManager->method('createSchemaConfig')
-            ->willReturn(new SchemaConfig());
-
-        $platform = $this->getMockBuilder(AbstractPlatform::class)
-            ->setConstructorArgs(enum_exists(UnquotedIdentifierFolding::class) ? [UnquotedIdentifierFolding::UPPER] : [])
-            ->onlyMethods(['supportsIdentityColumns', 'createSchemaManager'])
-            ->getMockForAbstractClass();
-        $platform->method('supportsIdentityColumns')
-            ->willReturn(true);
-        $platform->method('createSchemaManager')
-            ->willReturn($schemaManager);
-
-        return $platform;
-    }
-
     private function createDriverMock(AbstractPlatform $platform): Driver
     {
         $result = $this->createMock(Result::class);