From 32707fdc4e1d0948e91e796687d0055309b77358 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Mon, 26 Aug 2024 10:50:05 +0800 Subject: [PATCH] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- src/Workbench.php | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 8252ba7..ccdda9f 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "laravel/framework": "^9.52.9 || ^10.48.2", "laravel/tinker": "^2.8.2", "orchestra/canvas": "^7.11.1 || ^8.11.9", - "orchestra/testbench-core": "^7.44 || ^8.25", + "orchestra/testbench-core": "^7.46 || ^8.27", "spatie/laravel-ray": "^1.32.4", "symfony/polyfill-php83": "^1.28", "symfony/yaml": "^6.0.9" diff --git a/src/Workbench.php b/src/Workbench.php index 7ac9a29..9ee226e 100644 --- a/src/Workbench.php +++ b/src/Workbench.php @@ -2,6 +2,8 @@ namespace Orchestra\Workbench; +use Illuminate\Support\Arr; + /** * @phpstan-import-type TWorkbenchConfig from \Orchestra\Testbench\Foundation\Config */ @@ -10,25 +12,31 @@ class Workbench /** * Get the path to the laravel folder. */ - public static function laravelPath(string $path = ''): string + public static function laravelPath(array|string $path = ''): string { - return app()->basePath($path); + return app()->basePath( + \Orchestra\Testbench\join_paths(...Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path)) + ); } /** * Get the path to the package folder. */ - public static function packagePath(string $path = ''): string + public static function packagePath(array|string $path = ''): string { - return \Orchestra\Testbench\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(string $path = ''): string + public static function path(array|string $path = ''): string { - return \Orchestra\Testbench\workbench_path($path); + return \Orchestra\Testbench\workbench_path( + ...Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path) + ); } /**