Skip to content

Commit 42657a9

Browse files
committed
🐛 Fix bug if .env file has blank lines
1 parent 9eb4427 commit 42657a9

File tree

2 files changed

+52
-7
lines changed

2 files changed

+52
-7
lines changed

example/.env

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,46 @@
1-
APP_ENV=local
2-
APP_NAME=test
3-
APP_URL=http://127.0.0.1:8000
1+
APP_KEY=base64:r3+xqqP4xWdHA12rkvvQ9DU0Yelu3IJ3J0FunukCor0=
2+
APP_DEBUG=true
3+
APP_URL=http://localhost
4+
LOG_CHANNEL=stack
5+
LOG_LEVEL=debug
6+
7+
DB_CONNECTION=mysql
8+
DB_HOST=127.0.0.1
9+
DB_PORT=3306
10+
DB_DATABASE=laravel
11+
DB_USERNAME=root
12+
DB_PASSWORD=
13+
14+
BROADCAST_DRIVER=log
15+
CACHE_DRIVER=file
16+
QUEUE_CONNECTION=sync
17+
SESSION_DRIVER=file
18+
SESSION_LIFETIME=120
19+
20+
MEMCACHED_HOST=127.0.0.1
21+
22+
REDIS_HOST=127.0.0.1
23+
REDIS_PASSWORD=null
24+
REDIS_PORT=6379
25+
26+
MAIL_MAILER=smtp
27+
MAIL_HOST=mailhog
28+
MAIL_PORT=1025
29+
MAIL_USERNAME=null
30+
MAIL_PASSWORD=null
31+
MAIL_ENCRYPTION=null
32+
MAIL_FROM_ADDRESS=null
33+
MAIL_FROM_NAME="${APP_NAME}"
34+
35+
AWS_ACCESS_KEY_ID=
36+
AWS_SECRET_ACCESS_KEY=
37+
AWS_DEFAULT_REGION=us-east-1
38+
AWS_BUCKET=
39+
40+
PUSHER_APP_ID=
41+
PUSHER_APP_KEY=
42+
PUSHER_APP_SECRET=
43+
PUSHER_APP_CLUSTER=mt1
44+
45+
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
46+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

src/HerokuDotenv.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function pull()
8989
unset($dotenvVars[0]); // Remove first line
9090

9191
foreach ($dotenvVars as $dotenvVarsKey => $dotenvVar) {
92-
$vars = explode(': ', $dotenvVar);
92+
$vars = explode(': ', $dotenvVar, 2);
9393
foreach ($vars as $key => $var) {
9494
if (empty($var)) {
9595
unset($dotenvVars[$dotenvVarsKey]); // Remove last line
@@ -113,10 +113,12 @@ public function checkDotenvVariables(): bool
113113
$dotenvVars = explode("\n", $this->dotenvFileContents);
114114

115115
foreach ($dotenvVars as $dotenvVar) {
116-
$dotenvValues = explode('=', $dotenvVar);
116+
if (!empty($dotenvVar)) {
117+
$dotenvValues = explode('=', $dotenvVar, 2);
117118

118-
if (!isset($dotenvValues[1])) {
119-
return false;
119+
if (!isset($dotenvValues[1])) {
120+
return false;
121+
}
120122
}
121123
}
122124

0 commit comments

Comments
 (0)