Merge branch '7.x' into 8.x

# Conflicts: # composer.json
orchestral · Sep 13, 2023 · a812ca2 · a812ca2
2 parents 4e7d2fd + 1b0dd37
commit a812ca2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
         "phpunit/phpunit": "^10.1"
     },
     "conflict": {
-        "orchestra/canvas": "<8.6.0",
+        "orchestra/canvas": "<8.8.0",
         "orchestra/testbench-core": "<8.2.0"
     },
     "config": {

diff --git a/src/Presets/Laravel.php b/src/Presets/Laravel.php
@@ -60,6 +60,14 @@ public function rootNamespace(): string
         return $this->config['namespace'] ?? 'App';
     }
 
+    /**
+     * Testing namespace.
+     */
+    public function testingNamespace(): string
+    {
+        return $this->config('testing.namespace', 'Tests');
+    }
+
     /**
      * Model namespace.
      */

diff --git a/src/Presets/Package.php b/src/Presets/Package.php
@@ -67,6 +67,14 @@ public function rootNamespace(): string
         return $namespace;
     }
 
+    /**
+     * Testing namespace.
+     */
+    public function testingNamespace(): string
+    {
+        return $this->config('testing.namespace', $this->rootNamespace().'\Tests');
+    }
+
     /**
      * Model namespace.
      */

diff --git a/src/Presets/Preset.php b/src/Presets/Preset.php
@@ -181,6 +181,11 @@ abstract public function sourcePath(): string;
      */
     abstract public function rootNamespace(): string;
 
+    /**
+     * Testing namespace.
+     */
+    abstract public function testingNamespace(): string;
+
     /**
      * Model namespace.
      */