Merge remote-tracking branch 'origin/master' into augmentation-improv…

…ements

src/Console/Commands/GenerateMigration.php

@@ -2,16 +2,18 @@
 
 namespace StatamicRadPack\Runway\Console\Commands;
 
+use Facades\Statamic\Facades\Endpoint\Path;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 use Statamic\Console\RunsInPlease;
 use Statamic\Fields\Field;
 use StatamicRadPack\Runway\Resource;
 use StatamicRadPack\Runway\Runway;
-use Symfony\Component\Process\Process;
+use Symfony\Component\Process\PhpExecutableFinder;
 
 use function Laravel\Prompts\confirm;
 
@@ -335,9 +337,20 @@ protected function generateNewTableMigration(Resource $resource, array $columns)
             $migrationContents
         );
 
-        $rules = '@PSR2,@PhpCsFixer,no_space_after_class_name';
+        $rules = '@PSR2,@PhpCsFixer';
 
-        $process = new Process(['./vendor/bin/php-cs-fixer', 'fix', $migrationPath, '--rules='.$rules], base_path());
-        $process->run();
+        Process::path(base_path())->run(
+            (new PhpExecutableFinder())->find().
+            ' /'.Path::makeRelative(__DIR__.'/../../../php-cs-fixer.phar').
+            ' fix '.$migrationPath.' --rules='.$rules
+        );
+
+        // I can't figure out the PHP CS Fixer rule for it, so I'm just going to do it manually for now.
+        File::put(
+            $migrationPath,
+            Str::of(File::get($migrationPath))
+                ->replace('return new class() extends Migration', 'return new class extends Migration')
+                ->__toString()
+        );
     }
 }

tests/Console/Commands/GenerateMigrationTest.php

@@ -31,8 +31,8 @@ public function setUp(): void
 
         Runway::discoverResources();
 
-        collect(File::glob(database_path('migrations/*')))->each(function ($path) {
-            File::delete($path);
+        collect(File::allFiles(database_path('migrations')))->each(function (SplFileInfo $file) {
+            File::delete($file->getRealPath());
         });
     }