Bugfix dotenv test in laravel.php (#4082)

aladei-dean-lucassen · web-flow · commit ac46152a5fe1 · 2025-06-25T10:52:58.000+02:00
* Bugfix dotenv test in laravel.php The test to check if .env file is present was not checking if the dotenv variable was set and always used the default. Added getter for dotenv variable. * change current_path to release_or_current_path in dotenv description Change instructions for set dotenv to use release_or_current_path variable. * change current_path to release_or_current_path in dotenv description Change instructions for set dotenv to use release_or_current_path variable. * Revert "Merge branch 'master' into patch-1" This reverts commit df230db, reversing changes made to 8a92805.
diff --git a/recipe/common.php b/recipe/common.php
@@ -81,7 +81,7 @@
  * Path to `.env` file which will be used as environment variables for each command per `run()`.
  *
  * ```php
- * set('dotenv', '{{current_path}}/.env');
+ * set('dotenv', '{{release_or_current_path}}/.env');
  * ```
  */
 set('dotenv', false);
diff --git a/recipe/laravel.php b/recipe/laravel.php
@@ -58,12 +58,15 @@ function artisan($command, $options = [])
             return;
         }
 
+        // Get the dotenv path or use default.
+        $dotenv = get('dotenv', '{{release_or_current_path}}/.env');
+
         // Ensure we warn or fail when a command relies on the ".env" file.
-        if (in_array('failIfNoEnv', $options) && !test('[ -s {{release_or_current_path}}/.env ]')) {
+        if (in_array('failIfNoEnv', $options) && !test("[ -s $dotenv ]")) {
             throw new \Exception('Your .env file is empty! Cannot proceed.');
         }
 
-        if (in_array('skipIfNoEnv', $options) && !test('[ -s {{release_or_current_path}}/.env ]')) {
+        if (in_array('skipIfNoEnv', $options) && !test("[ -s $dotenv ]")) {
             warning("Your .env file is empty! Skipping...</>");
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@`
`81`	`81`	* Path to `.env` file which will be used as environment variables for each command per `run()`.
`82`	`82`	`*`
`83`	`83`	* ```php
`84`		`- * set('dotenv', '{{current_path}}/.env');`
	`84`	`+ * set('dotenv', '{{release_or_current_path}}/.env');`
`85`	`85`	* ```
`86`	`86`	`*/`
`87`	`87`	`set('dotenv', false);`
Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,15 @@ function artisan($command, $options = [])`
`58`	`58`	`return;`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ // Get the dotenv path or use default.`
	`62`	`+ $dotenv = get('dotenv', '{{release_or_current_path}}/.env');`
	`63`	`+`
`61`	`64`	`// Ensure we warn or fail when a command relies on the ".env" file.`
`62`		`- if (in_array('failIfNoEnv', $options) && !test('[ -s {{release_or_current_path}}/.env ]')) {`
	`65`	`+ if (in_array('failIfNoEnv', $options) && !test("[ -s $dotenv ]")) {`
`63`	`66`	`throw new \Exception('Your .env file is empty! Cannot proceed.');`
`64`	`67`	`}`
`65`	`68`
`66`		`- if (in_array('skipIfNoEnv', $options) && !test('[ -s {{release_or_current_path}}/.env ]')) {`
	`69`	`+ if (in_array('skipIfNoEnv', $options) && !test("[ -s $dotenv ]")) {`
`67`	`70`	`warning("Your .env file is empty! Skipping...</>");`
`68`	`71`	`return;`
`69`	`72`	`}`