Merge branch '3.7.x' into 4.0.x

Author: morozov

.github/workflows/continuous-integration.yml

@@ -495,19 +495,22 @@ jobs:
       ibm_db2:
         image: "icr.io/db2_community/db2:11.5.8.0"
         env:
+          DB2INSTANCE: "db2inst1"
           DB2INST1_PASSWORD: "Doctrine2018"
           LICENSE: "accept"
           DBNAME: "doctrine"
 
-        options: "--privileged=true"
+        options: >-
+          --health-cmd "su - ${DB2INSTANCE} -c \"db2 -t CONNECT TO ${DBNAME};\""
+          --health-interval 30s
+          --health-timeout 10s
+          --health-retries 5
+          --privileged
 
         ports:
           - "50000:50000"
 
     steps:
-      - name: "Perform healthcheck from the outside"
-        run: "docker logs -f ${{ job.services.ibm_db2.id }} | sed '/(*) Setup has completed./ q'"
-
       - name: "Create temporary tablespace"
         run: "docker exec ${{ job.services.ibm_db2.id }} su - db2inst1 -c 'db2 -t CONNECT TO doctrine; db2 -t CREATE USER TEMPORARY TABLESPACE doctrine_tbsp PAGESIZE 4 K;'"
 

tests/Functional/Schema/MySQL/ComparatorTest.php

@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
+use Doctrine\DBAL\Platforms\MySQL80Platform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Comparator;
@@ -156,6 +157,26 @@ public function testTableAndColumnOptions(array $tableOptions, array $columnOpti
         )->isEmpty());
     }
 
+    public function testSimpleArrayTypeNonChangeNotDetected(): void
+    {
+        $table = new Table('comparator_test');
+
+        $table->addColumn('simple_array_col', Types::SIMPLE_ARRAY, ['length' => 255]);
+        $this->dropAndCreateTable($table);
+
+        self::assertTrue(ComparatorTestUtils::diffFromActualToDesiredTable(
+            $this->schemaManager,
+            $this->comparator,
+            $table,
+        )->isEmpty());
+
+        self::assertTrue(ComparatorTestUtils::diffFromDesiredToActualTable(
+            $this->schemaManager,
+            $this->comparator,
+            $table,
+        )->isEmpty());
+    }
+
     /** @return iterable<string,array{array<string,string>,array<string,string>}> */
     public static function tableAndColumnOptionsProvider(): iterable
     {
@@ -177,7 +198,7 @@ public static function tableAndColumnOptionsProvider(): iterable
 
     public function testMariaDb1043NativeJsonUpgradeDetected(): void
     {
-        if (! $this->platform instanceof MariaDBPlatform) {
+        if (! $this->platform instanceof MariaDBPlatform && ! $this->platform instanceof MySQL80Platform) {
             self::markTestSkipped();
         }