wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Nov 9, 2024 · 240927f · 240927f
1 parent b2db92f
commit 240927f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/src/Bootstrap/LoadEnvironmentVariables.php b/src/Bootstrap/LoadEnvironmentVariables.php
@@ -16,7 +16,7 @@ final class LoadEnvironmentVariables extends \Illuminate\Foundation\Bootstrap\Lo
     protected function createDotenv($app)
     {
         /** @phpstan-ignore method.notFound, method.notFound */
-        if (! file_exists(implode(DIRECTORY_SEPARATOR, [$app->environmentPath(), $app->environmentFile()]))) {
+        if (! file_exists(join_paths($app->environmentPath(), $app->environmentFile()))) {
             return Dotenv::create(
                 Env::getRepository(), (string) realpath(join_paths(__DIR__, 'stubs')), '.env.testbench'
             );

diff --git a/src/Foundation/Config.php b/src/Foundation/Config.php
@@ -8,6 +8,7 @@
 use Orchestra\Testbench\Contracts\Config as ConfigContract;
 use Symfony\Component\Yaml\Yaml;
 
+use function Orchestra\Testbench\join_paths;
 use function Orchestra\Testbench\parse_environment_variables;
 use function Orchestra\Testbench\transform_relative_path;
 
@@ -199,7 +200,7 @@ public static function loadFromYaml(string $workingPath, ?string $filename = 'te
             yield "{$filename}.example";
             yield "{$filename}.dist";
         })->filter(static function ($file) use ($workingPath) {
-            return file_exists($workingPath.DIRECTORY_SEPARATOR.$file);
+            return file_exists(join_paths($workingPath, $file));
         })->first();
 
         if (! \is_null($filename)) {
@@ -208,11 +209,11 @@ public static function loadFromYaml(string $workingPath, ?string $filename = 'te
              *
              * @phpstan-var TOptionalConfig $config
              */
-            $config = Yaml::parseFile($workingPath.DIRECTORY_SEPARATOR.$filename);
+            $config = Yaml::parseFile(join_paths($workingPath, $filename));
 
-            $config['laravel'] = transform(Arr::get($config, 'laravel'), static function ($path) use ($workingPath) {
-                return transform_relative_path($path, $workingPath);
-            });
+            $config['laravel'] = transform(
+                Arr::get($config, 'laravel'), static fn ($path) => transform_relative_path($path, $workingPath)
+            );
 
             if (isset($config['env']) && \is_array($config['env']) && Arr::isAssoc($config['env'])) {
                 $config['env'] = parse_environment_variables($config['env']);

diff --git a/src/Foundation/Console/Signals.php b/src/Foundation/Console/Signals.php
@@ -11,7 +11,6 @@ class Signals extends \Illuminate\Console\Signals
      * @param  callable|null  $default
      * @return void
      */
-    #[\Override]
     public static function whenAvailable($callback, $default = null)
     {
         if (\is_null($resolver = static::$availabilityResolver)) {

diff --git a/src/Foundation/Console/TestCommand.php b/src/Foundation/Console/TestCommand.php
@@ -76,9 +76,8 @@ protected function phpunitArguments($options)
         $file = $this->phpUnitConfigurationFile();
 
         return Collection::make(parent::phpunitArguments($options))
-            ->reject(static function ($option) {
-                return str_starts_with($option, '--configuration=');
-            })->merge(["--configuration={$file}"])
+            ->reject(static fn ($option) => str_starts_with($option, '--configuration='))
+            ->merge(["--configuration={$file}"])
             ->all();
     }
 

diff --git a/src/Workbench/Workbench.php b/src/Workbench/Workbench.php
@@ -52,9 +52,7 @@ class Workbench
      */
     public static function start(ApplicationContract $app, ConfigContract $config): void
     {
-        $app->singleton(ConfigContract::class, static function () use ($config) {
-            return $config;
-        });
+        $app->singleton(ConfigContract::class, static fn () => $config);
     }
 
     /**
@@ -106,9 +104,8 @@ public static function discoverRoutes(ApplicationContract $app, ConfigContract $
             $path = Collection::make([
                 workbench_path('lang'),
                 workbench_path('resources', 'lang'),
-            ])->filter(static function ($path) {
-                return is_dir($path);
-            })->first();
+            ])->filter(static fn ($path) => is_dir($path))
+                ->first();
 
             if (\is_null($path)) {
                 return;

diff --git a/src/functions.php b/src/functions.php
@@ -69,9 +69,7 @@ function remote(array|string $command, array|string $env = []): Process
 {
     $phpBinary = transform(
         \defined('PHP_BINARY') ? PHP_BINARY : (new PhpExecutableFinder)->find(),
-        static function ($phpBinary) {
-            return ProcessUtils::escapeArgument((string) $phpBinary);
-        }
+        static fn ($phpBinary) => ProcessUtils::escapeArgument((string) $phpBinary)
     );
 
     $binary = \defined('TESTBENCH_DUSK') ? 'testbench-dusk' : 'testbench';
@@ -177,9 +175,8 @@ function defined_environment_variables(): array
 {
     return Collection::make(array_merge($_SERVER, $_ENV))
         ->keys()
-        ->mapWithKeys(static function (string $key) {
-            return [$key => Env::forward($key)];
-        })->unless(
+        ->mapWithKeys(static fn (string $key) => [$key => Env::forward($key)])
+        ->unless(
             Env::has('TESTBENCH_WORKING_PATH'), static fn ($env) => $env->put('TESTBENCH_WORKING_PATH', package_path())
         )->all();
 }