Merge pull request #74 from TheDragonCode/3.x

Fixed paths

Author: andrey-helldar

docs/prologue/upgrade.md

@@ -10,6 +10,7 @@
 - PHP 7.3 and 7.4 was dropped
 - Laravel 6.0 was dropped
 - Dragon Code: Contracts (`dragon-code/contracts`) was dropped
+- Added property typing
 
 ## Medium Impact Changes
 
@@ -91,3 +92,16 @@ If your class does not contain a `down` method, then you can replace the `up` me
 ### Changed Migration Repository
 
 Just call the `php artisan migrate` command to make changes to the action repository table. 
+
+### Added property typing
+
+Make sure all overridden properties are typed:
+
+```
+protected $once                 >>  protected bool $once
+protected $transactions         >>  protected bool $transactions
+protected $transactionAttempts  >>  protected int $transactionAttempts
+protected $environment          >>  protected string|array|null $environment
+protected $exceptEnvironment    >>  protected string|array|null $exceptEnvironment
+protected $before               >>  protected bool $before
+```

src/Processors/Install.php

@@ -35,7 +35,7 @@ protected function create(): void
     protected function ensureDirectory(): void
     {
         Directory::ensureDirectory(
-            $this->getActionsPath()
+            $this->getActionsPath(realpath: $this->options->realpath)
         );
     }
 }

src/Processors/Make.php

@@ -22,7 +22,7 @@ public function handle(): void
     protected function run(): void
     {
         $name = $this->getName();
-        $path = $this->getActionsPath($name);
+        $path = $this->getActionsPath($name, realpath: $this->options->realpath);
 
         $this->create($path);
     }

src/Processors/Migrate.php

@@ -67,7 +67,11 @@ protected function getNewFiles(): array
     {
         $completed = $this->repository->getCompleted()->pluck('action')->toArray();
 
-        return $this->getFiles(fn (string $file) => ! Str::of($file)->replace('\\', '/')->contains($completed), $this->options->path);
+        return $this->getFiles(
+            filter  : fn (string $file) => ! Str::of($file)->replace('\\', '/')->contains($completed),
+            path    : $this->options->path,
+            fullpath: true
+        );
     }
 
     protected function getBatch(): int

src/Processors/Processor.php

@@ -12,8 +12,10 @@
 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 DragonCode\Support\Helpers\Ables\Arrayable;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Input\InputInterface;
@@ -41,16 +43,22 @@ public function __construct(
         $this->migrator->setConnection($this->options->connection)->setOutput($this->output);
     }
 
-    protected function getFiles(?Closure $filter = null, ?string $path = null): array
+    protected function getFiles(?Closure $filter = null, ?string $path = null, bool $realpath = false, bool $fullpath = false): array
     {
-        $path = $this->getActionsPath($path);
+        $path = $this->getActionsPath($path, $realpath);
 
-        return $this->file->exists($path) ? [$path] : $this->file->allPaths($path, $filter, true);
+        $names = $this->file->exists($path) ? [$path] : $this->file->allPaths($path, $filter, true);
+
+        return Arr::of($names)
+            ->when(! $fullpath, fn (Arrayable $array) => $array
+                ->map(fn (string $value) => Str::of(realpath($value))->after(realpath($path))->ltrim('\\/')->toString())
+            )
+            ->toArray();
     }
 
-    protected function getActionsPath(?string $path = null): string
+    protected function getActionsPath(?string $path = null, bool $realpath = false): string
     {
-        $path = $this->options->realpath ? $path : $this->config->path($path);
+        $path = $realpath ? $path : $this->config->path($path);
 
         if (! is_dir($path) && ! Str::endsWith($path, '.php')) {
             return $this->file->exists($path . '.php') ? $path . '.php' : $path;

src/Processors/Rollback.php

@@ -51,7 +51,7 @@ protected function getActions(?int $step): array
     protected function rollbackAction(string $action): void
     {
         $this->migrator->runDown(
-            $this->getActionsPath($action)
+            $this->getActionsPath($action, realpath: $this->options->realpath)
         );
     }
 

src/Processors/Upgrade.php

@@ -45,9 +45,9 @@ protected function move(string $filename): void
         $content = $this->replaceClassName($content);
         $content = $this->replaceDeclareStrictType($content);
         $content = $this->replaceWithInvoke($content);
+        $content = $this->replaceProperties($content);
 
         $this->store($filename, $content);
-        $this->delete($filename);
     }
 
     protected function clean(): void
@@ -57,19 +57,19 @@ protected function clean(): void
         ));
     }
 
-    protected function open(string $path): string
+    protected function open(string $filename): string
     {
-        return file_get_contents(base_path('database/actions/' . $path));
+        return file_get_contents(base_path('database/actions/' . $filename));
     }
 
-    protected function store(string $path, string $content): void
+    protected function store(string $filename, string $content): void
     {
-        file_put_contents($this->config->path($path), $content);
+        File::store($this->config->path($filename), $content);
     }
 
-    protected function delete(string $path): void
+    protected function delete(string $filename): void
     {
-        File::ensureDelete($this->config->path($path));
+        File::ensureDelete($filename);
     }
 
     protected function replaceNamespace(string $content): string
@@ -83,8 +83,9 @@ protected function replaceNamespace(string $content): string
     protected function replaceClassName(string $content): string
     {
         return Str::of($content)
-            ->pregReplace('/^([final\s|class]+.+extends\sAction)$/', 'return new class () extends Action')
+            ->pregReplace('/((?:return\s+new\s+class\s*\(?\s*\)?|final\s+class|class)\s*.+extends\s+Action)/', 'return new class () extends Action')
             ->trim()
+            ->trim(';')
             ->append(';')
             ->append(PHP_EOL)
             ->toString();
@@ -106,6 +107,18 @@ protected function replaceWithInvoke(string $content): string
             })->toString();
     }
 
+    protected function replaceProperties(string $content): string
+    {
+        return Str::of($content)
+            ->pregReplace('/protected\s+\$once/', 'protected bool $once')
+            ->pregReplace('/protected\s+\$transactions/', 'protected bool $transactions')
+            ->pregReplace('/protected\s+\$transaction_attempts/', 'protected int $transactionAttempts')
+            ->pregReplace('/protected\s+\$environment/', 'protected string|array|null $environment')
+            ->pregReplace('/protected\s+\$except_environment/', 'protected string|array|null $exceptEnvironment')
+            ->pregReplace('/protected\s+\$before/', 'protected bool $before')
+            ->toString();
+    }
+
     protected function moveConfig(): void
     {
         $this->notification->task('Moving config file', function () {
@@ -126,7 +139,7 @@ protected function moveConfig(): void
 
     protected function getOldFiles(): array
     {
-        return $this->getFiles(path: database_path('actions'));
+        return $this->getFiles(path: database_path('actions'), realpath: true);
     }
 
     protected function alreadyUpgraded(): bool