Fixed table sort

Author: nicklayb

src/Import.php

@@ -258,16 +258,21 @@ public function hashPassword($password)
      */
     public function getSortedSourceTables()
     {
-        $tables = $this->getSourceTables();
         $filteredTables = collect([]);
         $holds = collect([]);
-        foreach ($tables as $table) {
-            if ($this->hasLastTable($table)) {
-                $holds->push($table);
+
+        foreach ($this->getSourceTables() as $table) {
+            $index = $this->hasLastTable($table);
+            if ($index >= 0) {
+                $holds->put($index, $table);
             } elseif (!$this->hasIgnoreTable($table)) {
                 $filteredTables->push($table);
             }
         }
+        $arrayHolds = $holds->toArray();
+        ksort($arrayHolds);
+        $holds = collect($arrayHolds);
+
         return $filteredTables->merge($holds);
     }
 
@@ -282,13 +287,14 @@ public function hasIgnoreTable($table)
     }
 
     /**
-     * Check if a specified table should be last
+     * Gets the index of a table in the last tables array
      *
-     * @return bool
+     * @return int
      */
     public function hasLastTable($table)
     {
-        return in_array($table, $this->lastTables);
+        $index = array_search($table, $this->lastTables);
+        return ($index !== false) ? $index : -1;
     }
 
     /**

tests/ImportTest.php

@@ -11,7 +11,7 @@ class BasicImport extends Nicklayb\LaravelDbImport\Import
 class ExtendedImport extends Nicklayb\LaravelDbImport\Import
 {
     protected $ignoreTables = [ 'migrations' ];
-    protected $lastTables = [ 'relation_one', 'relation_two' ];
+    protected $lastTables = [ 'relation_two','relation_one' ];
     protected $selects = [
         'users' => [
             'id', 'firstname', 'lastname'
@@ -89,12 +89,12 @@ public function testHasIgnoreTableInexistant()
 
     public function testHasLastTable()
     {
-        $this->assertTrue($this->extendedImport->hasLastTable('relation_one'));
+        $this->assertEquals($this->extendedImport->hasLastTable('relation_one'), 1);
     }
 
     public function testHasLastTableInexistant()
     {
-        $this->assertFalse($this->extendedImport->hasLastTable('products'));
+        $this->assertEquals($this->extendedImport->hasLastTable('products'), -1);
     }
 
     public function testHasPasswordReset()
@@ -236,10 +236,12 @@ public function testGetSortedSourceTables()
             'products',
             'roles',
             'orders',
-            'relation_one',
-            'relation_two'
+            'relation_two',
+            'relation_one'
         ];
-
-        $this->assertEquals($expected, $this->extendedImport->getSortedSourceTables()->toArray());
+        $tables = $this->extendedImport->getSortedSourceTables()->toArray();
+        for ($i = 0; $i < count($tables) ; $i++) {
+            $this->assertEquals($expected[$i], $tables[$i]);
+        }
     }
 }