Merge branch '6.x' into 7.x

orchestral · Apr 16, 2024 · 3bc4c27 · 3bc4c27
2 parents 878f0ca + 54af071
commit 3bc4c27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Foundation/Bootstrap/EnsuresDefaultConfiguration.php b/src/Foundation/Bootstrap/EnsuresDefaultConfiguration.php
@@ -33,7 +33,7 @@ public function bootstrap(Application $app): void
                 'DB_CONNECTION' => \defined('TESTBENCH_DUSK') ? ['database.default' => 'testing'] : null,
             ])->filter()
                 ->reject(static function ($config, $key) {
-                    return ! \is_null(Env::get($key));
+                    return Env::has($key);
                 })->values()
                 ->all(),
         ]);

diff --git a/src/Workbench/Workbench.php b/src/Workbench/Workbench.php
@@ -156,7 +156,7 @@ public static function configuration(): ConfigContract
 
             if (\defined('TESTBENCH_WORKING_PATH')) {
                 $workingPath = TESTBENCH_WORKING_PATH;
-            } elseif (! \is_null(Env::get('TESTBENCH_WORKING_PATH'))) {
+            } elseif (Env::has('TESTBENCH_WORKING_PATH')) {
                 $workingPath = Env::get('TESTBENCH_WORKING_PATH');
             }