Merge branch '3.6'

Author: GrahamCampbell

src/Loader/Lines.php

@@ -22,7 +22,7 @@ public static function process(array $lines)
         foreach ($lines as $line) {
             list($multiline, $line, $multilineBuffer) = self::multilineProcess($multiline, $line, $multilineBuffer);
 
-            if (!$multiline && !self::isComment($line) && self::isSetter($line)) {
+            if (!$multiline && !self::isCommentOrWhitespace($line)) {
                 $output[] = $line;
             }
         }
@@ -116,28 +116,20 @@ private static function getCharPairs($line)
     }
 
     /**
-     * Determine if the line in the file is a comment, e.g. begins with a #.
+     * Determine if the line in the file is a comment or whitespace.
      *
      * @param string $line
      *
      * @return bool
      */
-    private static function isComment($line)
+    private static function isCommentOrWhitespace($line)
     {
+        if (trim($line) === '') {
+            return true;
+        }
+
         $line = ltrim($line);
 
         return isset($line[0]) && $line[0] === '#';
     }
-
-    /**
-     * Determine if the given line looks like it's setting a variable.
-     *
-     * @param string $line
-     *
-     * @return bool
-     */
-    private static function isSetter($line)
-    {
-        return strpos($line, '=') !== false;
-    }
 }

tests/Dotenv/DotenvTest.php

@@ -272,6 +272,12 @@ public function testMutlilineLoading()
         $this->assertSame('https://vision.googleapis.com/v1/images:annotate?key=', getenv('TEST_EQS'));
     }
 
+    public function testEmptyLoading()
+    {
+        $dotenv = Dotenv::createImmutable($this->folder, 'empty.env');
+        $this->assertSame(['EMPTY_VAR' => null], $dotenv->load());
+    }
+
     public function testLegacyConstructor()
     {
         $loader = new Loader();

tests/fixtures/env/empty.env

@@ -0,0 +1 @@
+EMPTY_VAR