Merge pull request #75 from TheDragonCode/3.x

Fixed information messages

Author: andrey-helldar

docs/prologue/changelog/3.x.md

@@ -1,9 +1,5 @@
 # 3.x
 
-# 3.0.0
-
-- Coming Soon
-
 ## v3.0-RC2 - 2022-10-12
 
 **Full Changelog**: https://github.com/TheDragonCode/laravel-migration-actions/compare/v3.0-RC1...v3.0-RC2

src/Processors/Processor.php

@@ -43,7 +43,7 @@ public function __construct(
         $this->migrator->setConnection($this->options->connection)->setOutput($this->output);
     }
 
-    protected function getFiles(?Closure $filter = null, ?string $path = null, bool $realpath = false, bool $fullpath = false): array
+    protected function getFiles(?Closure $filter = null, ?string $path = null, bool $realpath = false, bool $fullpath = false, bool $withExtension = true): array
     {
         $path = $this->getActionsPath($path, $realpath);
 
@@ -55,6 +55,11 @@ protected function getFiles(?Closure $filter = null, ?string $path = null, bool
                 fn (Arrayable $array) => $array
                     ->map(fn (string $value) => Str::of(realpath($value))->after(realpath($path))->ltrim('\\/')->toString())
             )
+            ->when(
+                ! $withExtension,
+                fn (Arrayable $array) => $array
+                    ->map(fn (string $value) => Str::before($value, '.php'))
+            )
             ->toArray();
     }
 

src/Processors/Status.php

@@ -50,7 +50,7 @@ protected function showStatus(array $actions, array $completed): void
 
     protected function getData(): array
     {
-        $files     = $this->getFiles();
+        $files     = $this->getFiles(withExtension: false);
         $completed = $this->getCompleted();
 
         return [$files, $completed];

src/Processors/Upgrade.php

@@ -4,6 +4,7 @@
 
 namespace DragonCode\LaravelActions\Processors;
 
+use DragonCode\LaravelActions\Concerns\Anonymous;
 use DragonCode\LaravelActions\ServiceProvider;
 use DragonCode\Support\Facades\Filesystem\Directory;
 use DragonCode\Support\Facades\Filesystem\File;
@@ -12,6 +13,8 @@
 
 class Upgrade extends Processor
 {
+    use Anonymous;
+
     public function handle(): void
     {
         if ($this->alreadyUpgraded()) {
@@ -27,6 +30,7 @@ protected function run(): void
     {
         $this->moveFiles();
         $this->moveConfig();
+        $this->callMigration();
         $this->clean();
     }
 
@@ -137,6 +141,21 @@ protected function moveConfig(): void
         });
     }
 
+    protected function callMigration(): void
+    {
+        $this->notification->task('Call migration', function () {
+            $path = $this->allowAnonymousMigrations()
+                ? __DIR__ . '/../../database/migrations/anonymous/2022_08_18_180137_change_migration_actions_table.php'
+                : __DIR__ . '/../../database/migrations/named/2022_08_18_180137_change_migration_actions_table.php';
+
+            $this->artisan('migrate', [
+                '--path'     => $path,
+                '--realpath' => true,
+                '--force'    => true,
+            ]);
+        });
+    }
+
     protected function getOldFiles(): array
     {
         return $this->getFiles(path: database_path('actions'), realpath: true);

src/Services/Migrator.php

@@ -77,20 +77,23 @@ protected function hasAction(Action $action, string $method): bool
 
     protected function runAction(Action $action, string $name, string $method): void
     {
-        $this->notification->task("Action: $name", function () use ($action, $method) {
-            if ($this->hasAction($action, $method)) {
-                try {
-                    $this->runMethod($action, $method, $action->enabledTransactions(), $action->transactionAttempts());
-
-                    $action->success();
-                }
-                catch (Throwable $e) {
-                    $action->failed();
-
-                    throw $e;
+        $this->notification->task(
+            Str::of($name)->before('.php')->prepend('Action: ')->toString(),
+            function () use ($action, $method) {
+                if ($this->hasAction($action, $method)) {
+                    try {
+                        $this->runMethod($action, $method, $action->enabledTransactions(), $action->transactionAttempts());
+
+                        $action->success();
+                    }
+                    catch (Throwable $e) {
+                        $action->failed();
+
+                        throw $e;
+                    }
                 }
             }
-        });
+        );
     }
 
     protected function runMethod(Action $action, string $method, bool $transactions, int $attempts): void