wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

src/Console/Concerns/InteractsWithProcess.php

@@ -8,10 +8,8 @@ trait InteractsWithProcess
 {
     /**
      * Run the given command as a process.
-     *
-     * @return void
      */
-    protected function executeCommand(string $command, string $path)
+    protected function executeCommand(string $command, string $path): void
     {
         $process = Process::fromShellCommandline($command, $path)->setTimeout(null);
 

src/Listeners/InstalledWorkbench.php

@@ -9,21 +9,16 @@
 use Orchestra\Workbench\Events\InstallEnded;
 use Orchestra\Workbench\Workbench;
 
+use function Illuminate\Filesystem\join_paths;
+
 class InstalledWorkbench
 {
-    /**
-     * The filesystem instance.
-     *
-     * @var \Illuminate\Filesystem\Filesystem;
-     */
-    public $files;
-
     /**
      * Construct a new event listener.
      */
-    public function __construct(Filesystem $files)
+    public function __construct(public Filesystem $files)
     {
-        $this->files = $files;
+        //
     }
 
     /**
@@ -49,35 +44,35 @@ public function handle(InstallEnded $event)
             components: $event->components,
             workingPath: $workingDirectory,
         ))->handle(
-            $workingDirectory.DIRECTORY_SEPARATOR.'base-resource.stub',
-            Workbench::path('app/Nova/Resource.php')
+            join_paths($workingDirectory, 'base-resource.stub'),
+            Workbench::path(['app', 'Nova', 'Resource.php'])
         );
 
         (new GeneratesFile(
             filesystem: $this->files,
             components: $event->components,
             workingPath: $workingDirectory,
         ))->handle(
-            $workingDirectory.DIRECTORY_SEPARATOR.'UserResource.stub',
-            Workbench::path('app/Nova/User.php')
+            join_paths($workingDirectory, 'UserResource.stub'),
+            Workbench::path(['app', 'Nova', 'User.php'])
         );
 
         (new GeneratesFile(
             filesystem: $this->files,
             components: $event->components,
             workingPath: $workingDirectory,
         ))->handle(
-            $workingDirectory.DIRECTORY_SEPARATOR.'NovaServiceProvider.stub',
-            Workbench::path('app/Providers/NovaServiceProvider.php')
+            join_paths($workingDirectory, 'NovaServiceProvider.stub'),
+            Workbench::path(['app', 'Providers', 'NovaServiceProvider.php'])
         );
 
         (new GeneratesFile(
             filesystem: $this->files,
             components: $event->components,
             workingPath: $workingDirectory,
         ))->handle(
-            $workingDirectory.DIRECTORY_SEPARATOR.'DatabaseSeeder.stub',
-            Workbench::path('database/seeders/DatabaseSeeder.php')
+            join_paths($workingDirectory, 'DatabaseSeeder.stub'),
+            Workbench::path(['database', 'seeders', 'DatabaseSeeder.php'])
         );
 
         Collection::make([

src/Listeners/InstallingWorkbench.php

@@ -7,21 +7,16 @@
 use Orchestra\Workbench\Events\InstallStarted;
 use Orchestra\Workbench\Workbench;
 
+use function Illuminate\Filesystem\join_paths;
+
 class InstallingWorkbench
 {
-    /**
-     * The filesystem instance.
-     *
-     * @var \Illuminate\Filesystem\Filesystem;
-     */
-    public $files;
-
     /**
      * Construct a new event listener.
      */
-    public function __construct(Filesystem $files)
+    public function __construct(public Filesystem $files)
     {
-        $this->files = $files;
+        //
     }
 
     /**
@@ -38,7 +33,7 @@ public function handle(InstallStarted $event)
             components: $event->components,
             workingPath: $workingDirectory,
         ))->handle(
-            $workingDirectory.DIRECTORY_SEPARATOR.'testbench.stub',
+            join_paths($workingDirectory, 'testbench.stub'),
             Workbench::packagePath('testbench.yaml')
         );
     }

tests/Feature/Console/ActionCommandTest.php

@@ -13,8 +13,7 @@ class ActionCommandTest extends TestCase
         'app/Nova/Actions/Sleep.php',
     ];
 
-    /** @test */
-    public function it_can_generate_action_file()
+    public function test_it_can_generate_action_file()
     {
         $this->artisan('nova:action', ['name' => 'Sleep', '--preset' => 'laravel'])
             ->assertSuccessful();
@@ -25,12 +24,12 @@ public function it_can_generate_action_file()
             'use Illuminate\Queue\InteractsWithQueue;',
             'use Laravel\Nova\Actions\Action;',
             'class Sleep extends Action',
-            'use InteractsWithQueue, Queueable;',
+            'use InteractsWithQueue;',
+            'use Queueable;',
         ], 'app/Nova/Actions/Sleep.php');
     }
 
-    /** @test */
-    public function it_can_generate_queued_action_file()
+    public function test_it_can_generate_queued_action_file()
     {
         $this->artisan('nova:action', ['name' => 'Sleep', '--queued' => true, '--preset' => 'laravel'])
             ->assertSuccessful();
@@ -53,8 +52,7 @@ public function it_can_generate_queued_action_file()
         ], 'app/Nova/Actions/Sleep.php');
     }
 
-    /** @test */
-    public function it_can_generate_destructive_action_file()
+    public function test_it_can_generate_destructive_action_file()
     {
         $this->artisan('nova:action', ['name' => 'Sleep', '--destructive' => true, '--preset' => 'laravel'])
             ->assertSuccessful();
@@ -66,8 +64,7 @@ public function it_can_generate_destructive_action_file()
         ], 'app/Nova/Actions/Sleep.php');
     }
 
-    /** @test */
-    public function it_can_generate_queued_destructive_action_file()
+    public function test_it_can_generate_queued_destructive_action_file()
     {
         $this->artisan('nova:action', ['name' => 'Sleep', '--queued' => true, '--destructive' => true, '--preset' => 'laravel'])
             ->assertSuccessful();

tests/Feature/Console/BaseResourceCommandTest.php

@@ -13,8 +13,7 @@ class BaseResourceCommandTest extends TestCase
         'app/Nova/Post.php',
     ];
 
-    /** @test */
-    public function it_can_generate_resource_file()
+    public function test_it_can_generate_resource_file()
     {
         $this->artisan('nova:base-resource', ['name' => 'Resource', '--preset' => 'laravel'])
             ->assertSuccessful();

tests/Feature/Console/DashboardCommandTest.php

@@ -14,8 +14,7 @@ class DashboardCommandTest extends TestCase
         'app/Nova/Dashboards/Post.php',
     ];
 
-    /** @test */
-    public function it_can_generate_dashboard_file()
+    public function test_it_can_generate_dashboard_file()
     {
         $this->artisan('nova:dashboard', ['name' => 'Post', '--preset' => 'laravel'])
             ->assertSuccessful();
@@ -27,8 +26,7 @@ public function it_can_generate_dashboard_file()
         ], 'app/Nova/Dashboards/Post.php');
     }
 
-    /** @test */
-    public function it_can_generate_the_main_dashboard_file()
+    public function test_it_can_generate_the_main_dashboard_file()
     {
         $this->artisan('nova:dashboard', ['name' => 'Main', '--preset' => 'laravel'])
             ->assertSuccessful();

tests/Feature/Console/FilterCommandTest.php

@@ -13,8 +13,7 @@ class FilterCommandTest extends TestCase
         'app/Nova/Filters/Post.php',
     ];
 
-    /** @test */
-    public function it_can_generate_filter_file()
+    public function test_it_can_generate_filter_file()
     {
         $this->artisan('nova:filter', ['name' => 'Post', '--preset' => 'laravel'])
             ->assertSuccessful();
@@ -28,8 +27,7 @@ public function it_can_generate_filter_file()
         ], 'app/Nova/Filters/Post.php');
     }
 
-    /** @test */
-    public function it_can_generate_filter_file_with_boolean_type()
+    public function test_it_can_generate_filter_file_with_boolean_type()
     {
         $this->artisan('nova:filter', ['name' => 'Post', '--boolean' => true, '--preset' => 'laravel'])
             ->assertSuccessful();
@@ -42,8 +40,7 @@ public function it_can_generate_filter_file_with_boolean_type()
         ], 'app/Nova/Filters/Post.php');
     }
 
-    /** @test */
-    public function it_can_generate_filter_file_with_date_type()
+    public function test_it_can_generate_filter_file_with_date_type()
     {
         $this->artisan('nova:filter', ['name' => 'Post', '--date' => true, '--preset' => 'laravel'])
             ->assertSuccessful();

tests/Feature/Console/LensCommandTest.php

@@ -13,8 +13,7 @@ class LensCommandTest extends TestCase
         'app/Nova/Lenses/Post.php',
     ];
 
-    /** @test */
-    public function it_can_generate_lens_file()
+    public function test_it_can_generate_lens_file()
     {
         $this->artisan('nova:lens', ['name' => 'Post', '--preset' => 'laravel'])
             ->assertSuccessful();
@@ -25,7 +24,7 @@ public function it_can_generate_lens_file()
             'use Laravel\Nova\Http\Requests\NovaRequest;',
             'use Laravel\Nova\Lenses\Lens;',
             'class Post extends Lens',
-            'public static function query(LensRequest $request, $query)',
+            'public static function query(LensRequest $request, Builder $query): Builder|Paginator',
         ], 'app/Nova/Lenses/Post.php');
     }
 }

tests/Feature/Console/ResourceCommandTest.php

@@ -14,8 +14,7 @@ class ResourceCommandTest extends TestCase
         'app/Nova/Resource.php',
     ];
 
-    /** @test */
-    public function it_can_generate_resource_file()
+    public function test_it_can_generate_resource_file()
     {
         $this->artisan('nova:resource', ['name' => 'Post', '--preset' => 'laravel'])
             ->assertSuccessful();