Merge branch '6.x'

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

composer.json

@@ -29,7 +29,7 @@
         "illuminate/filesystem": "^9.0"
     },
     "require-dev": {
-        "nunomaduro/larastan": "^0.7.12",
+        "nunomaduro/larastan": "^1.0.1",
         "orchestra/testbench": "^7.0"
     },
     "config": {

phpstan.neon.dist

@@ -7,7 +7,7 @@ parameters:
     - src
 
   # The level 8 is the highest level
-  level: 5
+  level: 7
 
   checkMissingIterableValueType: false
   noUnnecessaryCollectionCall: false

src/CodeGenerator.php

@@ -76,6 +76,7 @@ public function generatorOptions(): array
      */
     protected function resolveGeneratesCodeProcessor(): GeneratesCode
     {
+        /** @var \Orchestra\Canvas\Core\GeneratesCode $class */
         $class = property_exists($this, 'processor')
             ? $this->processor
             : GeneratesCode::class;

src/Commands/Command.php

@@ -7,6 +7,7 @@
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
 use Orchestra\Canvas\Core\Presets\Preset;
+use Symfony\Component\Console\Command\Command as SymfonyConsole;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -58,6 +59,10 @@ public function run(InputInterface $input, OutputInterface $output): int
      */
     protected function resolveCommand($command)
     {
-        return $this->getApplication()->find($command);
+        return $this->getApplication()->find(
+            $command instanceof SymfonyConsole
+                ? $command->getName()
+                : $command
+        );
     }
 }

src/Commands/Generator.php

@@ -117,6 +117,8 @@ public function getPublishedStubFileName(): ?string
      */
     public function generatorName(): string
     {
-        return trim($this->argument('name'));
+        return transform($this->argument('name'), function (string $name) {
+            return trim($name);
+        });
     }
 }

src/GeneratesCode.php

@@ -216,7 +216,9 @@ protected function replaceClass(string $stub, string $name): string
         );
 
         return str_replace(
-            ['DummyUser'], class_basename($this->userProviderModel()), $stub
+            ['DummyUser', '{{ userModel }}', '{{userModel}}'],
+            class_basename($this->userProviderModel()),
+            $stub
         );
     }
 

src/GeneratesCommandCode.php

@@ -2,6 +2,9 @@
 
 namespace Orchestra\Canvas\Core;
 
+/**
+ * @see https://github.com/laravel/framework/blob/8.x/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php
+ */
 class GeneratesCommandCode extends GeneratesCode
 {
     /**

src/Presets/Preset.php

@@ -133,6 +133,7 @@ public function seederPath(): string
     public function addAdditionalCommands(Application $app): void
     {
         foreach ($this->config('generators', []) as $generator) {
+            /** @var \Symfony\Component\Console\Command\Command $generator */
             $app->add(new $generator($this));
         }
     }

src/Testing/TestCase.php

@@ -9,7 +9,7 @@ class TestCase extends \Orchestra\Testbench\TestCase
     /**
      * Stubs files.
      *
-     * @var array<int, string>
+     * @var array<int, string>|null
      */
     protected $files = [];