Fixed resolving file names

Author: andrey-helldar

src/Helpers/Sorter.php

@@ -22,7 +22,7 @@ public function byKeys(array $items): array
 
     public function byRan(array $actions, array $completed): array
     {
-        foreach ($this->byValues($actions) as $value) {
+        foreach ($actions as $value) {
             if (! in_array($value, $completed, true)) {
                 $completed[] = $value;
             }

src/Services/Migrator.php

@@ -46,7 +46,7 @@ public function runUp(string $filename, int $batch, Options $options): void
     {
         $path   = $this->resolvePath($filename, $options->path);
         $action = $this->resolveAction($path);
-        $name   = $this->resolveActionName($filename);
+        $name   = $this->resolveActionName($path);
 
         if ($this->allowAction($action, $name, $options)) {
             $this->hasAction($action, '__invoke')
@@ -63,7 +63,7 @@ public function runDown(string $filename, Options $options): void
     {
         $path   = $this->resolvePath($filename, $options->path);
         $action = $this->resolveAction($path);
-        $name   = $this->resolveActionName($filename);
+        $name   = $this->resolveActionName($path);
 
         if (! $this->hasAction($action, '__invoke') && $this->hasAction($action, 'down')) {
             $this->runAction($action, $name, 'down');
@@ -176,11 +176,11 @@ protected function resolveAction(string $path): Action
         throw new FileNotFoundException($path);
     }
 
-    protected function resolveActionName(string $filename): string
+    protected function resolveActionName(string $path): string
     {
-        return Str::of($filename)
-            ->ltrim('\\/')
-            ->replace('\\', '/')
+        return Str::of(realpath($path))
+            ->after(realpath($this->config->path()) . DIRECTORY_SEPARATOR)
+            ->replace(['\\', '/'], '/')
             ->before('.php')
             ->toString();
     }

tests/Commands/MigrateTest.php

@@ -352,6 +352,8 @@ public function testPathAsFileWithExtension()
         $this->assertDatabaseCount($table, 1);
         $this->assertDatabaseCount($this->table, 1);
         $this->assertDatabaseMigrationHas($this->table, 'baz');
+
+        $this->assertSame('sub_path/2021_12_15_205804_baz', $this->table()->first()->action);
     }
 
     public function testPathAsFileWithoutExtension()
@@ -372,6 +374,8 @@ public function testPathAsFileWithoutExtension()
         $this->assertDatabaseCount($table, 1);
         $this->assertDatabaseCount($this->table, 1);
         $this->assertDatabaseMigrationHas($this->table, 'baz');
+
+        $this->assertSame($path, $this->table()->first()->action);
     }
 
     public function testPathAsDirectory()
@@ -392,6 +396,8 @@ public function testPathAsDirectory()
         $this->assertDatabaseCount($table, 1);
         $this->assertDatabaseCount($this->table, 1);
         $this->assertDatabaseMigrationHas($this->table, 'baz');
+
+        $this->assertSame('sub_path/2021_12_15_205804_baz', $this->table()->first()->action);
     }
 
     public function testMigrationNotFound()