Merge pull request #47 from TheDragonCode/andrey-helldar-patch-1

andrey-helldar · web-flow · commit f9b2461ba173 · 2025-03-27T13:06:14.000+03:00
Added Laravel 12 support
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -1,6 +1,6 @@
 name: phpunit
 
-on: [ push, pull_request ]
+on: [ push ]
 
 jobs:
     build:
@@ -10,7 +10,7 @@ jobs:
             fail-fast: true
             matrix:
                 php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
-                laravel: [ "8.0", "9.0", "10.0", "11.0" ]
+                laravel: [ "8.0", "9.0", "10.0", "11.0", "12.0" ]
                 psql: [ "9", "10", "11", "12", "13", "14", "15", "16", "17" ]
                 exclude:
                     - laravel: "8.0"
@@ -42,6 +42,21 @@ jobs:
                       
                     - laravel: "11.0"
                       psql: "11"
+                      
+                    - laravel: "12.0"
+                      php: "8.0"
+                      
+                    - laravel: "12.0"
+                      php: "8.1"
+                      
+                    - laravel: "12.0"
+                      psql: "9"
+                      
+                    - laravel: "12.0"
+                      psql: "10"
+                      
+                    - laravel: "12.0"
+                      psql: "11"
 
         name: php ${{ matrix.php }}, lr ${{ matrix.laravel }}, pg ${{ matrix.psql }}
 
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ Or manually update `require-dev` block of `composer.json` and run `composer upda
 | Service   | Versions                           |
 |:----------|:-----------------------------------|
 | PHP       | ^8.0                               |
-| Laravel   | ^8.0, ^9.0, ^10.0, ^11.0           |
+| Laravel   | ^8.0, ^9.0, ^10.0, ^11.0, ^12.0    |
 | Databases | MySQL 5.7+, PostgreSQL 9.5+, MSSQL |
 
 | Laravel \ PostgreSQL | 9  | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 |
@@ -40,6 +40,7 @@ Or manually update `require-dev` block of `composer.json` and run `composer upda
 | 9                    | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
 | 10                   | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
 | 11                   | ✖️ | ✖️ | ✖️ | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
+| 12                   | ✖️ | ✖️ | ✖️ | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
 
 
 ## Usage
diff --git a/composer.json b/composer.json
@@ -37,19 +37,22 @@
     "require": {
         "php": "^8.0",
         "ext-pdo": "*",
-        "doctrine/dbal": "^3.0 || ^4.0",
         "dragon-code/contracts": "^2.15",
         "dragon-code/support": "^6.0",
-        "illuminate/contracts": "^8.0 || ^9.0 || ^10.0 || ^11.0",
-        "illuminate/database": "^8.0 || ^9.0 || ^10.0 || ^11.0",
-        "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0"
+        "illuminate/contracts": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+        "illuminate/database": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+        "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0"
     },
     "require-dev": {
         "ext-pdo_mysql": "*",
         "ext-pdo_pgsql": "*",
+        "doctrine/dbal": "^3.0 || ^4.0",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "phpunit/phpunit": "^9.6 || ^10.0"
+        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
+        "phpunit/phpunit": "^9.6 || ^10.0 || ^11.0"
+    },
+    "suggest": {
+        "doctrine/dbal": "[For Laravel 8-10] Required to rename columns and drop SQLite columns (^3.5.1)."
     },
     "minimum-stability": "stable",
     "prefer-stable": true,
@@ -80,4 +83,4 @@
             ]
         }
     }
-}
+}
diff --git a/phpunit.xml b/phpunit.xml
@@ -18,20 +18,15 @@
         <include>
             <directory suffix=".php">./src</directory>
         </include>
-        <report>
-            <clover outputFile="build/logs/clover.xml"/>
-            <html outputDirectory="build/logs/coverage"/>
-            <text outputFile="build/logs/coverage.txt"/>
-        </report>
     </coverage>
-    <php>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-        <env name="DB_USERNAME" value="root"/>
-        <env name="DB_PASSWORD" value="root"/>
-    </php>
     <testsuites>
         <testsuite name="Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
+    <php>
+        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+        <env name="DB_USERNAME" value="root"/>
+        <env name="DB_PASSWORD" value="root"/>
+    </php>
 </phpunit>
diff --git a/src/Console/Migrate.php b/src/Console/Migrate.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB\Console;
 
 use DragonCode\Contracts\MigrateDB\Builder;
@@ -135,9 +137,9 @@ protected function migrateTable(string $table, string $column): void
         $this->builder($this->source(), $table)
             ->orderBy($column)
             ->chunk(1000, function (Collection $items) use ($table) {
-                $items = Arr::resolve($items);
-
-                $this->builder($this->target(), $table)->insert($items);
+                $this->builder($this->target(), $table)->insert(
+                    Arr::resolve($items)
+                );
             });
 
         $this->migrated[] = $table;
diff --git a/src/Constants/Drivers.php b/src/Constants/Drivers.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB\Constants;
 
 class Drivers
diff --git a/src/Database/Builder.php b/src/Database/Builder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB\Database;
 
 use DragonCode\Contracts\MigrateDB\Builder as BuilderContract;
@@ -33,9 +35,13 @@ public function schema(): SchemaBuilder
 
     public function getAllTables(): array
     {
+        $schema = method_exists($this->schema(), 'getCurrentSchemaName')
+            ? $this->schema()->getCurrentSchemaName()
+            : null;
+        
         $tables = method_exists($this->schema(), 'getAllTables')
             ? $this->schema()->getAllTables()
-            : $this->schema()->getTables();
+            : $this->schema()->getTables($schema);
 
         $key = $this->tableNameColumn();
 
diff --git a/src/Database/Manager.php b/src/Database/Manager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB\Database;
 
 use DragonCode\Contracts\MigrateDB\Builder as BuilderContract;
diff --git a/src/Database/MySQLBuilder.php b/src/Database/MySQLBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB\Database;
 
 class MySQLBuilder extends Builder
diff --git a/src/Database/PostgresBuilder.php b/src/Database/PostgresBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB\Database;
 
 class PostgresBuilder extends Builder
diff --git a/src/Database/SqlServerBuilder.php b/src/Database/SqlServerBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB\Database;
 
 class SqlServerBuilder extends Builder
diff --git a/src/Exceptions/InvalidArgumentException.php b/src/Exceptions/InvalidArgumentException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB\Exceptions;
 
 use Symfony\Component\Console\Exception\InvalidArgumentException as BaseException;
diff --git a/src/Facades/BuilderManager.php b/src/Facades/BuilderManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB\Facades;
 
 use DragonCode\Contracts\MigrateDB\Builder;
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\MigrateDB;
 
 use DragonCode\MigrateDB\Console\Migrate;
diff --git a/tests/Concerns/Connections.php b/tests/Concerns/Connections.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Concerns;
 
 use Illuminate\Database\Schema\Builder;
diff --git a/tests/Concerns/Database.php b/tests/Concerns/Database.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Concerns;
 
 use DragonCode\MigrateDB\Constants\Drivers;
@@ -101,8 +103,12 @@ protected function runMigrations(): void
 
     protected function getTables(SchemaBuilder $builder): array
     {
+        $schema = method_exists($builder, 'getCurrentSchemaName')
+            ? $builder->getCurrentSchemaName()
+            : null;
+
         return method_exists($builder, 'getAllTables')
             ? $builder->getAllTables()
-            : $builder->getTables();
+            : $builder->getTables($schema);
     }
 }
diff --git a/tests/Concerns/Migration.php b/tests/Concerns/Migration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Concerns;
 
 use Illuminate\Database\Migrations\Migration as BaseMigration;
diff --git a/tests/Concerns/Seeders.php b/tests/Concerns/Seeders.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Concerns;
 
 use Illuminate\Support\Facades\DB;
diff --git a/tests/Configurations/BaseConfiguration.php b/tests/Configurations/BaseConfiguration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Configurations;
 
 use DragonCode\Support\Concerns\Makeable;
diff --git a/tests/Configurations/Configuration.php b/tests/Configurations/Configuration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Configurations;
 
 use DragonCode\Support\Concerns\Makeable;
diff --git a/tests/Configurations/Manager.php b/tests/Configurations/Manager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Configurations;
 
 use DragonCode\MigrateDB\Constants\Drivers;
diff --git a/tests/Configurations/MySQL.php b/tests/Configurations/MySQL.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Configurations;
 
 use DragonCode\MigrateDB\Constants\Drivers;
diff --git a/tests/Configurations/Postgres.php b/tests/Configurations/Postgres.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Configurations;
 
 use DragonCode\MigrateDB\Constants\Drivers;
diff --git a/tests/Configurations/SqlServer.php b/tests/Configurations/SqlServer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Configurations;
 
 use DragonCode\MigrateDB\Constants\Drivers;
diff --git a/tests/Connectors/BaseConnection.php b/tests/Connectors/BaseConnection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Connectors;
 
 use DragonCode\Support\Concerns\Makeable;
diff --git a/tests/Connectors/MySqlConnection.php b/tests/Connectors/MySqlConnection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Connectors;
 
 use Illuminate\Database\Connectors\ConnectorInterface;
@@ -11,7 +13,9 @@ class MySqlConnection extends BaseConnection
 {
     protected function grammar(): Grammar
     {
-        return new MySqlGrammar();
+        return new MySqlGrammar(
+            $this->databaseConnection()
+        );
     }
 
     protected function connector(): ConnectorInterface
diff --git a/tests/Connectors/PostgresConnection.php b/tests/Connectors/PostgresConnection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Connectors;
 
 use Illuminate\Database\Connectors\ConnectorInterface;
@@ -28,7 +30,9 @@ protected function dropSessions(string $name): string
 
     protected function grammar(): Grammar
     {
-        return new PostgresGrammar();
+        return new PostgresGrammar(
+            $this->databaseConnection()
+        );
     }
 
     protected function connector(): ConnectorInterface
diff --git a/tests/Connectors/SqlServerConnection.php b/tests/Connectors/SqlServerConnection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Connectors;
 
 use Illuminate\Database\Connectors\ConnectorInterface;
@@ -11,7 +13,9 @@ class SqlServerConnection extends BaseConnection
 {
     protected function grammar(): Grammar
     {
-        return new SqlServerGrammar();
+        return new SqlServerGrammar(
+            $this->databaseConnection()
+        );
     }
 
     protected function connector(): ConnectorInterface
diff --git a/tests/Providers/TestServiceProvider.php b/tests/Providers/TestServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Providers;
 
 use Illuminate\Support\ServiceProvider;
diff --git a/tests/TestCase.php b/tests/TestCase.php
diff --git a/tests/Unit/MysqlToMysqlTest.php b/tests/Unit/MysqlToMysqlTest.php
diff --git a/tests/Unit/MysqlToPostgresTest.php b/tests/Unit/MysqlToPostgresTest.php
diff --git a/tests/Unit/PostgresToMysqlTest.php b/tests/Unit/PostgresToMysqlTest.php
diff --git a/tests/Unit/PostgresToPostgresTest.php b/tests/Unit/PostgresToPostgresTest.php
diff --git a/tests/fixtures/migrations/2021_02_11_153247_create_foo_table.php b/tests/fixtures/migrations/2021_02_11_153247_create_foo_table.php
diff --git a/tests/fixtures/migrations/2021_02_11_153324_create_bar_table.php b/tests/fixtures/migrations/2021_02_11_153324_create_bar_table.php
diff --git a/tests/fixtures/migrations/2021_02_11_153348_create_baz_table.php b/tests/fixtures/migrations/2021_02_11_153348_create_baz_table.php
diff --git a/tests/fixtures/migrations/2023_12_15_014834_create_ulid_primary_key.php b/tests/fixtures/migrations/2023_12_15_014834_create_ulid_primary_key.php
diff --git a/tests/fixtures/migrations/2023_12_15_014834_create_uuid_primary_key.php b/tests/fixtures/migrations/2023_12_15_014834_create_uuid_primary_key.php
