Merge pull request #79 from TheDragonCode/3.x

Fixed file names

Author: andrey-helldar

src/Processors/Processor.php

@@ -13,6 +13,7 @@
 use DragonCode\LaravelActions\Repositories\ActionRepository;
 use DragonCode\LaravelActions\Services\Migrator;
 use DragonCode\LaravelActions\Values\Options;
+use DragonCode\Support\Facades\Helpers\Arr;
 use DragonCode\Support\Facades\Helpers\Str;
 use DragonCode\Support\Filesystem\File;
 use Illuminate\Console\OutputStyle;
@@ -47,13 +48,11 @@ protected function getFiles(string $path, ?Closure $filter = null): array
     {
         $file = Str::finish($path, '.php');
 
-        if ($this->file->exists($file) && $this->file->isFile($file)) {
-            return [$file];
-        }
+        $files = $this->isFile($file) ? [$file] : $this->file->names($path, $filter, true);
 
-        return $this->sorter->byValues(
-            $this->file->names($path, $filter, true)
-        );
+        return Arr::of($this->sorter->byValues($files))
+            ->map(fn (string $value) => Str::before($value, '.php'))
+            ->toArray();
     }
 
     protected function runCommand(string $command, array $options = []): void
@@ -76,4 +75,9 @@ protected function fireEvent(string $event, string $method): void
     {
         $this->events->dispatch(new $event($method, $this->options->before));
     }
+
+    protected function isFile(string $path): bool
+    {
+        return $this->file->exists($path) && $this->file->isFile($path);
+    }
 }

src/Services/Migrator.php

@@ -160,8 +160,10 @@ protected function allowLogging(Action $action): bool
 
     protected function resolvePath(string $filename, string $path): string
     {
-        if ($this->file->exists($filename) && $this->file->isFile($filename)) {
-            return $filename;
+        $withExtension = Str::finish($filename, '.php');
+
+        if ($this->file->exists($withExtension) && $this->file->isFile($withExtension)) {
+            return $withExtension;
         }
 
         return Str::finish($path . DIRECTORY_SEPARATOR . $filename, '.php');