Merge branch '6.x' into 7.x

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

src/Commands/Component.php

@@ -5,7 +5,7 @@
 use Illuminate\Console\Concerns\CreatesMatchingTest;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
-use Orchestra\Canvas\Processors\GeneratesCodeWithComponent;
+use Orchestra\Canvas\Core\GeneratesCodeWithComponent;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 

src/Commands/Database/Eloquent.php

@@ -5,7 +5,6 @@
 use Illuminate\Console\Concerns\CreatesMatchingTest;
 use Illuminate\Support\Str;
 use Orchestra\Canvas\Commands\Generator;
-use Orchestra\Canvas\Processors\GeneratesEloquentCode;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -24,13 +23,6 @@ class Eloquent extends Generator
      */
     protected string $type = 'Model';
 
-    /**
-     * Generator processor.
-     *
-     * @var class-string<\Orchestra\Canvas\Core\GeneratesCode>
-     */
-    protected string $processor = GeneratesEloquentCode::class;
-
     /**
      * Run after code successfully generated.
      */

src/Commands/Database/Observer.php

@@ -3,7 +3,7 @@
 namespace Orchestra\Canvas\Commands\Database;
 
 use Orchestra\Canvas\Commands\Generator;
-use Orchestra\Canvas\Processors\GeneratesObserverCode;
+use Orchestra\Canvas\Core\GeneratesCodeWithEloquent;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -25,7 +25,7 @@ class Observer extends Generator
      *
      * @var class-string<\Orchestra\Canvas\Core\GeneratesCode>
      */
-    protected string $processor = GeneratesObserverCode::class;
+    protected string $processor = GeneratesCodeWithEloquent::class;
 
     /**
      * Get the stub file name for the generator.

src/Commands/Mail.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Console\Concerns\CreatesMatchingTest;
 use Illuminate\Support\Str;
-use Orchestra\Canvas\Processors\GeneratesCodeWithMarkdown;
+use Orchestra\Canvas\Core\GeneratesCodeWithMarkdown;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 

src/Commands/Notification.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Console\Concerns\CreatesMatchingTest;
 use Illuminate\Support\Str;
-use Orchestra\Canvas\Processors\GeneratesCodeWithMarkdown;
+use Orchestra\Canvas\Core\GeneratesCodeWithMarkdown;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 

src/Processors/GeneratesControllerCode.php

@@ -14,12 +14,12 @@
 class GeneratesControllerCode extends GeneratesCode
 {
     /**
-     * Build the class with the given name.
-     *
-     * Remove the base controller import if we are already in base namespace.
+     * Replace the namespace for the given stub.
      */
-    protected function buildClass(string $name): string
+    protected function replaceNamespace(string $stub, string $name): string
     {
+        $stub = parent::replaceNamespace($stub, $name);
+
         $controllerNamespace = $this->getNamespace($name);
 
         $rootNamespace = $this->rootNamespace();
@@ -34,13 +34,14 @@ protected function buildClass(string $name): string
             $replace = $this->buildModelReplacements($replace);
         }
 
+        // Remove the base controller import if we are already in base namespace.
         $replace = array_merge($replace, [
             "use {$controllerNamespace}\Controller;\n" => '',
             "use {$rootNamespace}\Http\Controllers\Controller;" => "use {$rootNamespace}Http\Controllers\Controller;",
         ]);
 
         return str_replace(
-            array_keys($replace), array_values($replace), parent::buildClass($name)
+            array_keys($replace), array_values($replace), $stub
         );
     }
 

src/Processors/GeneratesFactoryCode.php

@@ -13,10 +13,12 @@
 class GeneratesFactoryCode extends GeneratesCode
 {
     /**
-     * Build the class with the given name.
+     * Replace the namespace for the given stub.
      */
-    protected function buildClass(string $name): string
+    protected function replaceNamespace(string $stub, string $name): string
     {
+        $stub = parent::replaceNamespace($stub, $name);
+
         $namespaceModel = ! empty($this->options['model'])
             ? $this->qualifyClass($this->options['model'])
             : trim($this->rootNamespace(), '\\').'\\Model';
@@ -44,7 +46,7 @@ protected function buildClass(string $name): string
         ];
 
         return str_replace(
-            array_keys($replace), array_values($replace), parent::buildClass($name)
+            array_keys($replace), array_values($replace), $stub
         );
     }
 

src/Processors/GeneratesListenerCode.php

@@ -13,10 +13,12 @@
 class GeneratesListenerCode extends GeneratesCode
 {
     /**
-     * Build the class with the given name.
+     * Replace the namespace for the given stub.
      */
-    protected function buildClass(string $name): string
+    protected function replaceNamespace(string $stub, string $name): string
     {
+        $stub = parent::replaceNamespace($stub, $name);
+
         $event = $this->options['event'];
 
         if (\is_null($event) || ! Str::startsWith($event, [
@@ -30,7 +32,7 @@ protected function buildClass(string $name): string
         $stub = str_replace(
             ['DummyEvent', '{{ event }}', '{{event}}'],
             class_basename($event),
-            parent::buildClass($name)
+            $stub
         );
 
         return str_replace(

src/Processors/GeneratesPolicyCode.php

@@ -13,12 +13,12 @@
 class GeneratesPolicyCode extends GeneratesCode
 {
     /**
-     * Build the class with the given name.
+     * Replace the namespace for the given stub.
      */
-    protected function buildClass(string $name): string
+    protected function replaceNamespace(string $stub, string $name): string
     {
         $stub = $this->replaceUserNamespace(
-            parent::buildClass($name)
+            parent::replaceNamespace($stub, $name)
         );
 
         $model = $this->options['model'];

src/Processors/GeneratesRuleCode.php

@@ -12,14 +12,14 @@
 class GeneratesRuleCode extends GeneratesCode
 {
     /**
-     * Build the class with the given name.
+     * Replace the namespace for the given stub.
      */
-    protected function buildClass(string $name): string
+    protected function replaceNamespace(string $stub, string $name): string
     {
+        $stub = parent::replaceNamespace($stub, $name);
+
         return str_replace(
-            '{{ ruleType }}',
-            $this->options['implicit'] ? 'ImplicitRule' : 'Rule',
-            parent::buildClass($name)
+            '{{ ruleType }}', $this->options['implicit'] ? 'ImplicitRule' : 'Rule', $stub
         );
     }
 }

src/Processors/GeneratesTestingCode.php

@@ -14,18 +14,20 @@
 class GeneratesTestingCode extends GeneratesCode
 {
     /**
-     * Build the class with the given name.
+     * Replace the namespace for the given stub.
      */
-    protected function buildClass(string $name): string
+    protected function replaceNamespace(string $stub, string $name): string
     {
+        $stub = parent::replaceNamespace($stub, $name);
+
         $testCase = $this->options['unit']
             ? $this->preset->config('testing.extends.unit', 'PHPUnit\Framework\TestCase')
             : $this->preset->config(
                 'testing.extends.feature',
                 $this->preset instanceof Laravel ? 'Tests\TestCase' : 'Orchestra\Testbench\TestCase'
             );
 
-        return $this->replaceTestCase(parent::buildClass($name), $testCase);
+        return $this->replaceTestCase($stub, $testCase);
     }
 
     /**