Merge pull request #11 from lukeraymonddowning/allow-spread-operators

Allows parameters for setup methods to be passed in as a spread array

Author: freekmurze

src/Package.php

@@ -38,6 +38,11 @@ public function hasConfigFile(string $configFileName = null): self
         return $this;
     }
 
+    public function shortName(): string
+    {
+        return Str::after($this->name, 'laravel-');
+    }
+
     public function hasViews(): self
     {
         $this->hasViews = true;
@@ -66,9 +71,12 @@ public function hasMigration(string $migrationFileName): self
         return $this;
     }
 
-    public function hasMigrations(array $migrationFileNames): self
+    public function hasMigrations(...$migrationFileNames): self
     {
-        $this->migrationFileNames = array_merge($this->migrationFileNames, $migrationFileNames);
+        $this->migrationFileNames = array_merge(
+            $this->migrationFileNames,
+            collect($migrationFileNames)->flatten()->toArray()
+        );
 
         return $this;
     }
@@ -80,9 +88,9 @@ public function hasCommand(string $commandClassName): self
         return $this;
     }
 
-    public function hasCommands(array $commandClassNames): self
+    public function hasCommands(...$commandClassNames): self
     {
-        $this->commands = array_merge($this->commands, $commandClassNames);
+        $this->commands = array_merge($this->commands, collect($commandClassNames)->flatten()->toArray());
 
         return $this;
     }
@@ -94,9 +102,9 @@ public function hasRoute(string $routeFileName): self
         return $this;
     }
 
-    public function hasRoutes(array $routeFileNames): self
+    public function hasRoutes(...$routeFileNames): self
     {
-        $this->routeFileNames = array_merge($this->routeFileNames, $routeFileNames);
+        $this->routeFileNames = array_merge($this->routeFileNames, collect($routeFileNames)->flatten()->toArray());
 
         return $this;
     }
@@ -116,9 +124,4 @@ public function setBasePath(string $path): self
 
         return $this;
     }
-
-    public function shortName(): string
-    {
-        return Str::after($this->name, 'laravel-');
-    }
 }

tests/PackageServiceProviderTests/PackageCommandsTest.php

@@ -3,8 +3,10 @@
 namespace Spatie\LaravelPackageTools\Tests\PackageServiceProviderTests;
 
 use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\Tests\TestClasses\FourthTestCommand;
 use Spatie\LaravelPackageTools\Tests\TestClasses\OtherTestCommand;
 use Spatie\LaravelPackageTools\Tests\TestClasses\TestCommand;
+use Spatie\LaravelPackageTools\Tests\TestClasses\ThirdTestCommand;
 
 class PackageCommandsTest extends PackageServiceProviderTestCase
 {
@@ -13,7 +15,8 @@ public function configurePackage(Package $package)
         $package
             ->name('laravel-package-tools')
             ->hasCommand(TestCommand::class)
-            ->hasCommands([OtherTestCommand::class]);
+            ->hasCommands([OtherTestCommand::class])
+            ->hasCommands(ThirdTestCommand::class, FourthTestCommand::class);
     }
 
     /** @test */

tests/PackageServiceProviderTests/PackageMigrationsTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Spatie\LaravelPackageTools\Tests\PackageServiceProviderTests;
+
+use Spatie\LaravelPackageTools\Package;
+use Spatie\TestTime\TestTime;
+
+class PackageMigrationsTest extends PackageServiceProviderTestCase
+{
+    public function configurePackage(Package $package)
+    {
+        TestTime::freeze('Y-m-d H:i:s', '2020-01-01 00:00:00');
+
+        $package
+            ->name('laravel-package-tools')
+            ->hasMigrations(['create_laravel_package_tools_table'])
+            ->hasMigrations('create_other_laravel_package_tools_table', 'create_third_laravel_package_tools_table');
+    }
+
+    /** @test */
+    public function it_can_publish_the_migration()
+    {
+        $this
+            ->artisan('vendor:publish --tag=laravel-package-tools-migrations')
+            ->assertExitCode(0);
+
+        $this->assertFileExists(database_path('migrations/2020_01_01_000000_create_laravel_package_tools_table.php'));
+        $this->assertFileExists(database_path('migrations/2020_01_01_000000_create_other_laravel_package_tools_table.php'));
+        $this->assertFileExists(database_path('migrations/2020_01_01_000000_create_third_laravel_package_tools_table.php'));
+    }
+}

tests/PackageServiceProviderTests/PackageRoutesTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Spatie\LaravelPackageTools\Tests\PackageServiceProviderTests;
+
+use Spatie\LaravelPackageTools\Package;
+use Spatie\TestTime\TestTime;
+
+class PackageRoutesTest extends PackageServiceProviderTestCase
+{
+    public function configurePackage(Package $package)
+    {
+        TestTime::freeze('Y-m-d H:i:s', '2020-01-01 00:00:00');
+
+        $package
+            ->name('laravel-package-tools')
+            ->hasRoutes('web', 'other');
+    }
+
+    /** @test */
+    public function it_can_load_the_route()
+    {
+        $response = $this->get('my-route');
+
+        $response->assertSeeText('my response');
+    }
+
+    /** @test */
+    public function it_can_load_multiple_route()
+    {
+        $adminResponse = $this->get('other-route');
+
+        $adminResponse->assertSeeText('other response');
+    }
+}

tests/TestClasses/FourthTestCommand.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Spatie\LaravelPackageTools\Tests\TestClasses;
+
+use Illuminate\Console\Command;
+
+class FourthTestCommand extends Command
+{
+    public $name = 'fourth-test-command';
+
+    public function handle()
+    {
+        $this->info('output of test command');
+    }
+}

tests/TestClasses/ThirdTestCommand.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Spatie\LaravelPackageTools\Tests\TestClasses;
+
+use Illuminate\Console\Command;
+
+class ThirdTestCommand extends Command
+{
+    public $name = 'third-test-command';
+
+    public function handle()
+    {
+        $this->info('output of test command');
+    }
+}

tests/TestPackage/database/migrations/create_other_laravel_package_tools_table.php.stub

@@ -0,0 +1,17 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateLaravelPackageToolsTable extends Migration
+{
+    public function up()
+    {
+        Schema::create('other-laravel-package-tools_table', function (Blueprint $table) {
+            $table->bigIncrements('id');
+
+            $table->timestamps();
+        });
+    }
+}

tests/TestPackage/database/migrations/create_third_laravel_package_tools_table.php.stub

@@ -0,0 +1,17 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateLaravelPackageToolsTable extends Migration
+{
+    public function up()
+    {
+        Schema::create('third-laravel-package-tools_table', function (Blueprint $table) {
+            $table->bigIncrements('id');
+
+            $table->timestamps();
+        });
+    }
+}