Merge branch '7.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Sep 1, 2023 · ca0c13e · ca0c13e
2 parents d1113bf + 7078100
commit ca0c13e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "composer/semver": "^3.0",
         "illuminate/database": "^10.17",
         "illuminate/support": "^10.17",
-        "orchestra/canvas-core": "^8.5",
+        "orchestra/canvas-core": "^8.6",
         "symfony/yaml": "^6.2"
     },
     "require-dev": {

diff --git a/src/Processors/GeneratesControllerCode.php b/src/Processors/GeneratesControllerCode.php
@@ -14,11 +14,11 @@
 class GeneratesControllerCode extends GeneratesCode
 {
     /**
-     * Replace the namespace for the given stub.
+     * Handle generating code.
      */
-    protected function replaceNamespace(string $stub, string $name): string
+    protected function generatingCode(string $stub, string $name): string
     {
-        $stub = parent::replaceNamespace($stub, $name);
+        $stub = parent::generatingCode($stub, $name);
 
         $controllerNamespace = $this->getNamespace($name);
 

diff --git a/src/Processors/GeneratesFactoryCode.php b/src/Processors/GeneratesFactoryCode.php
@@ -13,11 +13,11 @@
 class GeneratesFactoryCode extends GeneratesCode
 {
     /**
-     * Replace the namespace for the given stub.
+     * Handle generating code.
      */
-    protected function replaceNamespace(string $stub, string $name): string
+    protected function generatingCode(string $stub, string $name): string
     {
-        $stub = parent::replaceNamespace($stub, $name);
+        $stub = parent::generatingCode($stub, $name);
 
         $namespaceModel = ! empty($this->options['model'])
             ? $this->qualifyClass($this->options['model'])

diff --git a/src/Processors/GeneratesListenerCode.php b/src/Processors/GeneratesListenerCode.php
@@ -13,11 +13,11 @@
 class GeneratesListenerCode extends GeneratesCode
 {
     /**
-     * Replace the namespace for the given stub.
+     * Handle generating code.
      */
-    protected function replaceNamespace(string $stub, string $name): string
+    protected function generatingCode(string $stub, string $name): string
     {
-        $stub = parent::replaceNamespace($stub, $name);
+        $stub = parent::generatingCode($stub, $name);
 
         $event = $this->options['event'];
 

diff --git a/src/Processors/GeneratesPolicyCode.php b/src/Processors/GeneratesPolicyCode.php
@@ -13,12 +13,12 @@
 class GeneratesPolicyCode extends GeneratesCode
 {
     /**
-     * Replace the namespace for the given stub.
+     * Handle generating code.
      */
-    protected function replaceNamespace(string $stub, string $name): string
+    protected function generatingCode(string $stub, string $name): string
     {
         $stub = $this->replaceUserNamespace(
-            parent::replaceNamespace($stub, $name)
+            parent::generatingCode($stub, $name)
         );
 
         $model = $this->options['model'];

diff --git a/src/Processors/GeneratesRuleCode.php b/src/Processors/GeneratesRuleCode.php
@@ -12,11 +12,11 @@
 class GeneratesRuleCode extends GeneratesCode
 {
     /**
-     * Replace the namespace for the given stub.
+     * Handle generating code.
      */
-    protected function replaceNamespace(string $stub, string $name): string
+    protected function generatingCode(string $stub, string $name): string
     {
-        $stub = parent::replaceNamespace($stub, $name);
+        $stub = parent::generatingCode($stub, $name);
 
         return str_replace(
             '{{ ruleType }}', $this->options['implicit'] ? 'ImplicitRule' : 'Rule', $stub

diff --git a/src/Processors/GeneratesTestingCode.php b/src/Processors/GeneratesTestingCode.php
@@ -14,11 +14,11 @@
 class GeneratesTestingCode extends GeneratesCode
 {
     /**
-     * Replace the namespace for the given stub.
+     * Handle generating code.
      */
-    protected function replaceNamespace(string $stub, string $name): string
+    protected function generatingCode(string $stub, string $name): string
     {
-        $stub = parent::replaceNamespace($stub, $name);
+        $stub = parent::generatingCode($stub, $name);
 
         $testCase = $this->options['unit']
             ? $this->preset->config('testing.extends.unit', 'PHPUnit\Framework\TestCase')