Merge 70f882b into ed7212e

umbrellio · Dec 23, 2020 · d860a65 · d860a65
2 parents ed7212e + 70f882b
commit d860a65
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 103 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,7 +66,7 @@ jobs:
       fail-fast: false
       matrix:
         exclude_group:
-          - WithoutSchema
+          - WithoutSchema,forPHP8
         experimental:
           - false
         operating_system:
@@ -83,37 +83,37 @@ jobs:
             php_versions: '7.3'
             postgres: '9.6'
             experimental: false
-            exclude_group: WithoutSchema
+            exclude_group: WithoutSchema,forPHP8
           - operating_system: 'ubuntu-latest'
             php_versions: '7.3'
             postgres: '13'
             experimental: false
-            exclude_group: WithoutSchema
+            exclude_group: WithoutSchema,forPHP8
           - operating_system: 'ubuntu-latest'
             php_versions: '7.4'
             postgres: '13'
             experimental: false
-            exclude_group: WithoutSchema
+            exclude_group: WithoutSchema,forPHP8
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '10'
-            experimental: true
-            exclude_group: WithSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP7
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '11'
-            experimental: true
-            exclude_group: WithSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP7
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '12'
-            experimental: true
-            exclude_group: WithSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP7
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '13'
-            experimental: true
-            exclude_group: WithSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP7
     runs-on: '${{ matrix.operating_system }}'
     services:
       postgres:

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
   },
   "require": {
     "php": "^7.2|^7.3|^7.4|^8.0",
-    "doctrine/dbal": "2.9.*|2.12.*",
+    "doctrine/dbal": "2.9.*|^3.0",
     "laravel/framework": "^5.8|^6.0|^7.0|^8.0"
   },
   "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,7 +5,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="true">
     <php>
         <var name="db_type" value="pdo_pgsql"/>
         <var name="db_host" value="localhost" />

diff --git a/tests.sh b/tests.sh
@@ -5,5 +5,5 @@ composer lint
 if [ "x$EXCLUDE_GROUP" != "x" ]; then
     php -d pcov.directory='.' vendor/bin/phpunit --exclude-group $EXCLUDE_GROUP --coverage-html build
 else
-    php -d pcov.directory='.' vendor/bin/phpunit --exclude-group WithoutSchema --coverage-html build
+    php -d pcov.directory='.' vendor/bin/phpunit --exclude-group WithoutSchema,forPHP7,forPHP8 --coverage-html build
 fi
diff --git a/tests/Functional/Subscribers/ChangeColumnSubscriberTest.php b/tests/Functional/Subscribers/ChangeColumnSubscriberTest.php
@@ -70,9 +70,10 @@ public function getSubscriberEvents(): void
 
     /**
      * @test
+     * @group forPHP7
      * @dataProvider provideSchemas
      */
-    public function changeSchema(string $column, Closure $callback, array $expectedSQL): void
+    public function changeSchema7(string $column, Closure $callback, array $expectedSQL): void
     {
         $callback($this->blueprint, $column);
         $eventArgs = $this->getEventArgsForColumn($column);
@@ -81,6 +82,20 @@ public function changeSchema(string $column, Closure $callback, array $expectedS
         $this->assertSame($expectedSQL, $eventArgs->getSql());
     }
 
+    /**
+     * @test
+     * @group forPHP8
+     * @dataProvider provideSchemas
+     */
+    public function changeSchema8(string $column, Closure $callback, array $expectedSQL): void
+    {
+        $callback($this->blueprint, $column);
+        $eventArgs = $this->getEventArgsForColumn($column, 'tableColumn');
+        $this->subscriber->onSchemaAlterTableChangeColumn($eventArgs);
+
+        $this->assertSame($expectedSQL, $eventArgs->getSql());
+    }
+
     public function provideSchemas(): Generator
     {
         yield $this->dropCommentCase();
@@ -94,8 +109,10 @@ public function provideSchemas(): Generator
         yield $this->changeLengthCase();
     }
 
-    private function getEventArgsForColumn(string $columnName): SchemaAlterTableChangeColumnEventArgs
-    {
+    private function getEventArgsForColumn(
+        string $columnName,
+        string $argumentName = 'tableName'
+    ): SchemaAlterTableChangeColumnEventArgs {
         /** @var PostgresConnection $connection */
         $connection = DB::connection();
         $schemaManager = $connection->getDoctrineSchemaManager();
@@ -106,7 +123,7 @@ private function getEventArgsForColumn(string $columnName): SchemaAlterTableChan
                 $schemaManager,
                 '_getPortableTableColumnDefinition',
                 [
-                    'tableName' => $listColumn,
+                    $argumentName => $listColumn,
                 ]
             );
         }