Merge pull request #38 from TheDragonCode/2.x

Added support for anonymous migrations on Laravel 8.37+

Author: Andrey Helldar

composer.json

@@ -26,7 +26,7 @@
     "require": {
         "php": "^7.3 || ^8.0",
         "dragon-code/contracts": "^2.15",
-        "dragon-code/laravel-support": "^3.2",
+        "dragon-code/laravel-support": "^3.3",
         "illuminate/console": "^6.0 || ^7.0 || ^8.0 || ^9.0",
         "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0",
         "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",

resources/stubs/action-9.x.stub renamed to resources/stubs/action-anonymous.stub

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\LaravelActions\Concerns;
+
+use DragonCode\LaravelSupport\Facades\AppVersion;
+
+trait Anonymous
+{
+    protected function allowAnonymous(): bool
+    {
+        return AppVersion::is('8.37.0');
+    }
+
+    protected function disallowAnonymous(): bool
+    {
+        return ! $this->allowAnonymous();
+    }
+}

resources/stubs/action-prev.stub renamed to resources/stubs/action-named.stub

@@ -2,12 +2,14 @@
 
 namespace DragonCode\LaravelActions\Support;
 
-use DragonCode\LaravelSupport\Facades\AppVersion;
+use DragonCode\LaravelActions\Concerns\Anonymous;
 use Illuminate\Database\Migrations\MigrationCreator as BaseMigrationCreator;
 use Illuminate\Filesystem\Filesystem;
 
 class MigrationCreator extends BaseMigrationCreator
 {
+    use Anonymous;
+
     protected $customStubPath;
 
     public function __construct(Filesystem $files, ?string $custom_stub_path)
@@ -31,7 +33,7 @@ public function stubPath()
 
     protected function getStub($table, $create): string
     {
-        $stub = AppVersion::is9x() ? '/action-9.x.stub' : '/action-prev.stub';
+        $stub = $this->allowAnonymous() ? '/action-anonymous.stub' : '/action-named.stub';
 
         return $this->files->get(
             $this->stubPath() . $stub

src/Concerns/Anonymous.php

@@ -4,15 +4,15 @@
 
 use DragonCode\Contracts\LaravelActions\Actionable as ActionableContract;
 use DragonCode\LaravelActions\Concerns\Infoable;
-use DragonCode\LaravelActions\Concerns\Versionable;
+use DragonCode\LaravelActions\Concerns\Anonymous;
 use Illuminate\Database\Migrations\Migrator as BaseMigrator;
 use Illuminate\Support\Facades\DB;
 use Throwable;
 
 class Migrator extends BaseMigrator
 {
     use Infoable;
-    use Versionable;
+    use Anonymous;
 
     public function usingConnection($name, callable $callback)
     {
@@ -39,7 +39,7 @@ protected function runUp($file, $batch, $pretend)
         // First we will resolve a "real" instance of the migration class from this
         // migration file name. Once we have the instances we can run the actual
         // command such as "up" or "down", or we can just simulate the action.
-        if ($this->isLatestApp()) {
+        if ($this->allowAnonymous()) {
             $migration = $this->resolvePath($file);
 
             $name = $this->getMigrationName($file);
@@ -90,7 +90,7 @@ protected function runUp($file, $batch, $pretend)
      */
     protected function runDown($file, $migration, $pretend)
     {
-        if ($this->isLatestApp()) {
+        if ($this->allowAnonymous()) {
             $instance = $this->resolvePath($file);
 
             $name = $this->getMigrationName($file);

src/Concerns/Versionable.php

@@ -24,7 +24,7 @@ public function testCreateAction()
 
     public function testDuplicateOnPrev()
     {
-        if ($this->isLatestApp()) {
+        if ($this->allowAnonymous()) {
             $this->assertTrue(true);
 
             return;
@@ -41,7 +41,7 @@ public function testDuplicateOnPrev()
 
     public function testDuplicateOnLatest()
     {
-        if ($this->isPrevApp()) {
+        if ($this->disallowAnonymous()) {
             $this->assertTrue(true);
 
             return;

src/Support/MigrationCreator.php

@@ -2,7 +2,6 @@
 
 namespace Tests\Commands;
 
-use DragonCode\LaravelSupport\Facades\AppVersion;
 use Tests\TestCase;
 
 class MakeTest extends TestCase
@@ -21,9 +20,9 @@ public function testMakingFiles()
 
         $this->assertFileExists($path);
 
-        $expected = AppVersion::is9x()
-            ? __DIR__ . '/../fixtures/app/9.x/stubs/make_example.stub'
-            : __DIR__ . '/../fixtures/app/prev/stubs/make_example.stub';
+        $expected = $this->allowAnonymous()
+            ? __DIR__ . '/../fixtures/app/anonymous/stubs/make_example.stub'
+            : __DIR__ . '/../fixtures/app/named/stubs/make_example.stub';
 
         $this->assertEquals(file_get_contents($expected), file_get_contents($path));
     }

src/Support/Migrator.php

@@ -2,14 +2,12 @@
 
 namespace Tests\Concerns;
 
-use DragonCode\LaravelSupport\Facades\AppVersion;
-
 trait Actionable
 {
     protected function getMigrationPath(): string
     {
-        return AppVersion::is9x()
-            ? __DIR__ . '/../fixtures/app/9.x/actions'
-            : __DIR__ . '/../fixtures/app/prev/actions';
+        return $this->allowAnonymous()
+            ? __DIR__ . '/../fixtures/app/anonymous/actions'
+            : __DIR__ . '/../fixtures/app/named/actions';
     }
 }