wip

calebporzio · Jan 26, 2025 · 1775e2b · 1775e2b
1 parent 2b4fc9a
commit 1775e2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,12 +18,6 @@ jobs:
         laravel: [5.8.*, 6.*, 7.*, 8.*, 9.*, 10.*, 11.*, 12.*]
         os: [ubuntu-latest]
         include:
-          - laravel: 12.*
-            testbench: 10.*
-            dbal: 3.*
-          - laravel: 11.*
-            testbench: 9.*
-            dbal: 3.*
           - laravel: 10.*
             testbench: 8.*
             dbal: 3.*
@@ -131,6 +125,11 @@ jobs:
           extension: mbstring, pdo, pdo_sqlite
           coverage: none
 
+      - name: Require DBAL
+        run: |
+          composer require "doctrine/dbal:${{ matrix.dbal }}" --dev --no-interaction --no-update
+        if: matrix.dbal
+
       - name: Install dependencies
         run: |
           composer require "doctrine/dbal:${{ matrix.dbal }}" --dev --no-interaction --no-update

diff --git a/tests/SushiTest.php b/tests/SushiTest.php
@@ -60,7 +60,7 @@ function columns_with_varying_types()
         $this->assertEquals('float', $connectionBuilder->getColumnType('model_with_varying_type_columns', 'float'));
         $this->assertEquals('datetime', $connectionBuilder->getColumnType('model_with_varying_type_columns', 'dateTime'));
         $this->assertEquals(
-            function_exists(laravel_version_compare::class) && laravel_version_compare('12.0.0', '>=') ? 'varchar' : 'string', 
+            function_exists(laravel_version_compare::class) && laravel_version_compare('11.0.0', '>=') ? 'varchar' : 'string', 
             $connectionBuilder->getColumnType('model_with_varying_type_columns', 'string')
         );
         $this->assertEquals(null, $row->null);