Merge pull request #22 from TheDragonCode/3.x

Added `dragon-code/support` 6 support, removed PHP < 8.0 support

Author: Andrey Helldar

.github/workflows/laravel-8.yml

@@ -9,7 +9,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "7.3", "7.4", "8.0", "8.1" ]
+                php: [ "8.0", "8.1" ]
                 laravel: [ "8.0" ]
                 psql: [ "9", "10", "11", "12", "13", "14" ]
 

composer.json

@@ -24,11 +24,11 @@
         "source": "https://github.com/TheDragonCode/migrate-db"
     },
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.0",
         "ext-pdo": "*",
-        "doctrine/dbal": "^2.6 || ^3.0",
+        "doctrine/dbal": "^3.0",
         "dragon-code/contracts": "^2.15",
-        "dragon-code/support": "^5.6",
+        "dragon-code/support": "^6.0",
         "illuminate/contracts": "^8.0 || ^9.0",
         "illuminate/database": "^8.0 || ^9.0",
         "illuminate/support": "^8.0 || ^9.0"
@@ -38,7 +38,7 @@
         "ext-pdo_pgsql": "*",
         "mockery/mockery": "^1.0",
         "orchestra/testbench": "^6.0 || ^7.0",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.5"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,

src/Console/Migrate.php

@@ -16,10 +16,10 @@
 class Migrate extends Command
 {
     protected $signature = 'db:migrate'
-        . ' {--schema-from= : Source connection name}'
-        . ' {--schema-to= : Target connection name}'
-        . ' {--exclude=* : Comma separated table names to exclude}'
-        . ' {--tables=* : Comma separated table names to migrate only}';
+                           . ' {--schema-from= : Source connection name}'
+                           . ' {--schema-to= : Target connection name}'
+                           . ' {--exclude=* : Comma separated table names to exclude}'
+                           . ' {--tables=* : Comma separated table names to migrate only}';
 
     protected $description = 'Data transfer from one database to another';
 
@@ -144,7 +144,7 @@ function ($query) use ($table, $column) {
             )
             ->orderBy($column)
             ->chunk(1000, function (Collection $items) use ($table) {
-                $items = Arr::toArray($items);
+                $items = Arr::resolve($items);
 
                 $this->builder($this->target(), $table)->insert($items);
             });
@@ -301,7 +301,7 @@ protected function resolveBuilders(): void
 
     protected function resolveOptions(): void
     {
-        $this->tables   = $this->getTablesOption();
+        $this->tables = $this->getTablesOption();
         $this->excludes = $this->getExcludeOption();
 
         if (empty($this->tables) && $this->confirmTableListOption()) {

tests/Unit/MysqlToMysqlTest.php

@@ -274,7 +274,7 @@ protected function tableData(string $connection, string $table): array
     {
         $items = DB::connection($connection)->table($table)->get();
 
-        return Arr::toArray($items);
+        return Arr::resolve($items);
     }
 
     protected function defaultSourceConnectionName(): string

tests/Unit/MysqlToPostgresTest.php

@@ -274,7 +274,7 @@ protected function tableData(string $connection, string $table): array
     {
         $items = DB::connection($connection)->table($table)->get();
 
-        return Arr::toArray($items);
+        return Arr::resolve($items);
     }
 
     protected function defaultSourceConnectionName(): string

tests/Unit/PostgresToMysqlTest.php

@@ -274,7 +274,7 @@ protected function tableData(string $connection, string $table): array
     {
         $items = DB::connection($connection)->table($table)->get();
 
-        return Arr::toArray($items);
+        return Arr::resolve($items);
     }
 
     protected function defaultSourceConnectionName(): string

tests/Unit/PostgresToPostgresTest.php

@@ -144,9 +144,9 @@ public function testExcludeTablesOption()
         $this->assertDatabaseCount($this->table_baz, 3, $this->source_connection);
 
         $this->artisan('db:migrate', [
-            '--schema-from'  => $this->source_connection,
-            '--schema-to'    => $this->target_connection,
-            '--exclude'      => [$this->table_foo, $this->table_bar],
+            '--schema-from' => $this->source_connection,
+            '--schema-to'   => $this->target_connection,
+            '--exclude'     => [$this->table_foo, $this->table_bar],
         ])
             ->expectsConfirmation('Please confirm table list should be retrieved from target connection? (incase if source connection does not support it)', 'no')
             ->expectsConfirmation('Please confirm whether to truncate target table before transfer?', 'no')
@@ -274,7 +274,7 @@ protected function tableData(string $connection, string $table): array
     {
         $items = DB::connection($connection)->table($table)->get();
 
-        return Arr::toArray($items);
+        return Arr::resolve($items);
     }
 
     protected function defaultSourceConnectionName(): string