Merge branch '7.x' into 8.x

orchestral · Sep 13, 2023 · a0aa408 · a0aa408
2 parents f146875 + 686f0bd
commit a0aa408
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,6 +1,21 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Method Orchestra\\\\Canvas\\\\Core\\\\Contracts\\\\GeneratesCodeListener\\:\\:codeAlreadyExists\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Contracts/GeneratesCodeListener.php
+
+		-
+			message: "#^Method Orchestra\\\\Canvas\\\\Core\\\\Contracts\\\\GeneratesCodeListener\\:\\:codeHasBeenGenerated\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Contracts/GeneratesCodeListener.php
+
 		-
 			message: "#^Call to an undefined method Illuminate\\\\Contracts\\\\Container\\\\Container\\:\\:basePath\\(\\)\\.$#"
 			count: 1
 			path: src/LaravelServiceProvider.php
+
+		-
+			message: "#^Method Orchestra\\\\Canvas\\\\Core\\\\Presets\\\\Preset\\:\\:config\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Presets/Preset.php
diff --git a/src/Presets/Preset.php b/src/Presets/Preset.php
@@ -33,7 +33,6 @@ public function is(string $name): bool
      * Get configuration.
      *
      * @param  mixed|null  $default
-     * @return mixed
      */
     public function config(?string $key = null, $default = null)
     {

diff --git a/tests/Unit/Presets/LaravelTest.php b/tests/Unit/Presets/LaravelTest.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Filesystem\Filesystem;
 use Mockery as m;
-use Orchestra\Canvas\Commands;
+use Orchestra\Canvas\Core\Commands\Generators;
 use Orchestra\Canvas\Core\Presets\Laravel;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -79,14 +79,14 @@ public function it_can_configure_provider_namespace()
     public function it_can_add_additional_commands()
     {
         Laravel::commands([
-            Commands\Code::class,
+            Generators\Code::class,
         ]);
 
         $app = m::mock(Application::class);
         $app->shouldReceive('add')
             ->once()
-            ->with(m::type(Commands\Code::class))
-            ->andReturnUsing(fn ($generator) => $this->assertInstanceOf(Commands\Code::class, $generator));
+            ->with(m::type(Generators\Code::class))
+            ->andReturnUsing(fn ($generator) => $this->assertInstanceOf(Generators\Code::class, $generator));
 
         $directory = __DIR__;
         $preset = new Laravel(['namespace' => 'App', 'provider' => ['namespace' => 'App']], $directory, new Filesystem());

diff --git a/tests/Unit/Presets/PackageTest.php b/tests/Unit/Presets/PackageTest.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Filesystem\Filesystem;
 use Mockery as m;
-use Orchestra\Canvas\Commands;
+use Orchestra\Canvas\Core\Commands\Generators;
 use Orchestra\Canvas\Core\Presets\Package;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -82,14 +82,14 @@ public function it_requires_root_namespace_to_be_configured()
     public function it_can_add_additional_commands()
     {
         Package::commands([
-            Commands\Code::class,
+            Generators\Code::class,
         ]);
 
         $app = m::mock(Application::class);
         $app->shouldReceive('add')
             ->once()
-            ->with(m::type(Commands\Code::class))
-            ->andReturnUsing(fn ($generator) => $this->assertInstanceOf(Commands\Code::class, $generator));
+            ->with(m::type(Generators\Code::class))
+            ->andReturnUsing(fn ($generator) => $this->assertInstanceOf(Generators\Code::class, $generator));
 
         $directory = __DIR__;
         $preset = new Package(['namespace' => 'App', 'provider' => ['namespace' => 'App']], $directory, new Filesystem());