Fixed sorting files

Author: andrey-helldar

src/Helpers/Sorter.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\LaravelActions\Helpers;
+
+use Closure;
+use DragonCode\Support\Facades\Filesystem\Path;
+use DragonCode\Support\Facades\Helpers\Arr;
+
+class Sorter
+{
+    public function byValues(array $items): array
+    {
+        return Arr::sort($items, $this->callback());
+    }
+
+    public function byKeys(array $items): array
+    {
+        return Arr::ksort($items, $this->callback());
+    }
+
+    protected function callback(): Closure
+    {
+        return function (string $a, string $b): int {
+            $current = Path::filename($a);
+            $next    = Path::filename($b);
+
+            if ($current === $next) {
+                return 0;
+            }
+
+            return $current < $next ? -1 : 1;
+        };
+    }
+}

src/Processors/Processor.php

@@ -9,6 +9,7 @@
 use DragonCode\LaravelActions\Contracts\Notification;
 use DragonCode\LaravelActions\Helpers\Config;
 use DragonCode\LaravelActions\Helpers\Git;
+use DragonCode\LaravelActions\Helpers\Sorter;
 use DragonCode\LaravelActions\Repositories\ActionRepository;
 use DragonCode\LaravelActions\Services\Migrator;
 use DragonCode\LaravelActions\Values\Options;
@@ -25,16 +26,17 @@ abstract class Processor
     abstract public function handle(): void;
 
     public function __construct(
-        protected Options $options,
-        protected InputInterface $input,
-        protected OutputStyle $output,
-        protected Config $config,
+        protected Options          $options,
+        protected InputInterface   $input,
+        protected OutputStyle      $output,
+        protected Config           $config,
         protected ActionRepository $repository,
-        protected Git $git,
-        protected File $file,
-        protected Migrator $migrator,
-        protected Notification $notification,
-        protected Dispatcher $events
+        protected Git              $git,
+        protected File             $file,
+        protected Migrator         $migrator,
+        protected Notification     $notification,
+        protected Dispatcher       $events,
+        protected Sorter           $sorter
     ) {
         $this->notification->setOutput($this->output);
         $this->repository->setConnection($this->options->connection);
@@ -49,7 +51,9 @@ protected function getFiles(string $path, ?Closure $filter = null): array
             return [$file];
         }
 
-        return $this->file->names($path, $filter, true);
+        return $this->sorter->byValues(
+            $this->file->names($path, $filter, true)
+        );
     }
 
     protected function runCommand(string $command, array $options = []): void

tests/Commands/MigrateTest.php

@@ -4,6 +4,7 @@
 
 use DragonCode\LaravelActions\Constants\Names;
 use Exception;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Tests\TestCase;
 use Throwable;
@@ -521,4 +522,37 @@ public function testDI(): void
         $this->assertDatabaseMigrationHas($table, 'invoke_down', column: 'value');
         $this->assertDatabaseMigrationHas($table, 'invoke', column: 'value');
     }
+
+    public function testSorting(): void
+    {
+        $files = [];
+
+        $this->artisan(Names::INSTALL)->assertExitCode(0);
+
+        $files[] = date('Y_m_d_His_') . 'test1';
+        $this->artisan(Names::MAKE, ['name' => 'test1'])->assertExitCode(0);
+        sleep(2);
+        $files[] = 'foo/' . date('Y_m_d_His_') . 'test2';
+        $this->artisan(Names::MAKE, ['name' => 'foo/test2'])->assertExitCode(0);
+        sleep(2);
+        $files[] = 'bar/' . date('Y_m_d_His_') . 'test3';
+        $this->artisan(Names::MAKE, ['name' => 'bar/test3'])->assertExitCode(0);
+        sleep(2);
+        $files[] = 'foo/' . date('Y_m_d_His_') . 'test4';
+        $this->artisan(Names::MAKE, ['name' => 'foo/test4'])->assertExitCode(0);
+        sleep(2);
+        $files[] = 'bar/' . date('Y_m_d_His_') . 'test5';
+        $this->artisan(Names::MAKE, ['name' => 'bar/test5'])->assertExitCode(0);
+        sleep(2);
+        $files[] = date('Y_m_d_His_') . 'test6';
+        $this->artisan(Names::MAKE, ['name' => 'test6'])->assertExitCode(0);
+
+        $this->assertDatabaseCount($this->table, 0);
+        $this->artisan(Names::MIGRATE)->assertExitCode(0);
+        $this->assertDatabaseCount($this->table, 6);
+
+        $records = DB::table($this->table)->orderBy('id')->pluck('action')->toArray();
+
+        $this->assertSame($files, $records);
+    }
 }

tests/Services/GitTest.php renamed to tests/Helpers/GitTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Services;
+namespace Tests\Helpers;
 
 use DragonCode\LaravelActions\Helpers\Git;
 use Tests\TestCase;

tests/Helpers/SorterTest.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Helpers;
+
+use DragonCode\LaravelActions\Helpers\Sorter;
+use Tests\TestCase;
+
+class SorterTest extends TestCase
+{
+    public function testByValues(): void
+    {
+        $expected = [
+            '2022_10_13_013321_test1',
+            'foo/2022_10_13_013321_test2',
+            'bar/2022_10_13_013321_test3',
+            'foo/2022_10_13_013321_test4',
+            'bar/2022_10_13_013321_test5',
+            '2022_10_13_013321_test6',
+        ];
+
+        $values = [
+            '2022_10_13_013321_test1',
+            '2022_10_13_013321_test6',
+            'bar/2022_10_13_013321_test3',
+            'bar/2022_10_13_013321_test5',
+            'foo/2022_10_13_013321_test2',
+            'foo/2022_10_13_013321_test4',
+        ];
+
+        $this->assertSame($expected, $this->sorter()->byValues($values));
+    }
+
+    public function testByKeys(): void
+    {
+        $expected = [
+            '2022_10_13_013321_test1'     => 1,
+            'foo/2022_10_13_013321_test2' => 2,
+            'bar/2022_10_13_013321_test3' => 3,
+            'foo/2022_10_13_013321_test4' => 4,
+            'bar/2022_10_13_013321_test5' => 5,
+            '2022_10_13_013321_test6'     => 6,
+        ];
+
+        $values = [
+            '2022_10_13_013321_test1'     => 1,
+            '2022_10_13_013321_test6'     => 6,
+            'bar/2022_10_13_013321_test3' => 3,
+            'bar/2022_10_13_013321_test5' => 5,
+            'foo/2022_10_13_013321_test2' => 2,
+            'foo/2022_10_13_013321_test4' => 4,
+        ];
+
+        $this->assertSame($expected, $this->sorter()->byKeys($values));
+    }
+
+    protected function sorter(): Sorter
+    {
+        return new Sorter();
+    }
+}