Merge branch '1.x' into 7.x

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Aug 26, 2024 · 82247eb · 82247eb
2 parents 45a6e25 + dc40245
commit 82247eb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
@@ -2,6 +2,17 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/workbench`.
 
+## 1.9.0
+
+Released: 2024-08-26
+
+### Changes
+
+* Allows following methods on `Orchestra\Workbench\Workbench` to accept arrays:
+    - `laravelPath()`
+    - `packagePath()`
+    - `path()`
+
 ## 1.8.0
 
 Released: 2024-08-13

diff --git a/src/Workbench.php b/src/Workbench.php
@@ -4,10 +4,6 @@
 
 use Illuminate\Support\Arr;
 
-use function Orchestra\Testbench\join_paths;
-use function Orchestra\Testbench\package_path;
-use function Orchestra\Testbench\workbench_path;
-
 /**
  * @phpstan-import-type TWorkbenchConfig from \Orchestra\Testbench\Foundation\Config
  */
@@ -19,7 +15,7 @@ class Workbench
     public static function laravelPath(array|string $path = ''): string
     {
         return app()->basePath(
-            join_paths(...Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path))
+            \Orchestra\Testbench\join_paths(...Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path))
         );
     }
 
@@ -28,23 +24,19 @@ public static function laravelPath(array|string $path = ''): string
      */
     public static function packagePath(array|string $path = ''): string
     {
-        if (\func_num_args() > 1) {
-            return package_path(...\func_get_args());
-        }
-
-        return package_path($path);
+        return \Orchestra\Testbench\package_path(
+            ...Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path)
+        );
     }
 
     /**
      * Get the path to the workbench folder.
      */
     public static function path(array|string $path = ''): string
     {
-        if (\func_num_args() > 1) {
-            return workbench_path(...\func_get_args());
-        }
-
-        return workbench_path($path);
+        return \Orchestra\Testbench\workbench_path(
+            ...Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path)
+        );
     }
 
     /**

diff --git a/tests/WorkbenchTest.php b/tests/WorkbenchTest.php
@@ -41,11 +41,11 @@ public function it_can_resolve_package_path()
         );
 
         $this->assertSame(
-            realpath(__DIR__.'/../tests/WorkbenchTest.php'), Workbench::packagePath(['tests', 'WorkbenchTest.php'])
+            realpath(__FILE__), Workbench::packagePath('tests', 'WorkbenchTest.php')
         );
 
         $this->assertSame(
-            realpath(__DIR__.'/../tests/WorkbenchTest.php'), Workbench::packagePath('tests', 'WorkbenchTest.php')
+            realpath(__FILE__), Workbench::packagePath(['tests', 'WorkbenchTest.php'])
         );
     }
 
@@ -61,11 +61,11 @@ public function it_can_resolve_workbench_path()
         );
 
         $this->assertSame(
-            realpath(__DIR__.'/../workbench/dist/app.js'), Workbench::path(['dist', 'app.js'])
+            realpath(__DIR__.'/../workbench/dist/app.js'), Workbench::path('dist', 'app.js')
         );
 
         $this->assertSame(
-            realpath(__DIR__.'/../workbench/dist/app.js'), Workbench::path('dist', 'app.js')
+            realpath(__DIR__.'/../workbench/dist/app.js'), Workbench::path(['dist', 'app.js'])
         );
     }