Merge branch '2.6' into 3.6

vlucas · Jan 20, 2021 · 04e416a · 04e416a
2 parents e778c8b + 7417448
commit 04e416a
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 2 deletions.
diff --git a/src/Parser.php b/src/Parser.php
@@ -106,7 +106,7 @@ private static function parseValue($value)
             return $value;
         }
 
-        return array_reduce(str_split($value), function ($data, $char) use ($value) {
+        $result = array_reduce(str_split($value), function ($data, $char) use ($value) {
             switch ($data[1]) {
                 case self::INITIAL_STATE:
                     if ($char === '"' || $char === '\'') {
@@ -155,7 +155,15 @@ private static function parseValue($value)
                 case self::COMMENT_STATE:
                     return [$data[0], self::COMMENT_STATE];
             }
-        }, ['', self::INITIAL_STATE])[0];
+        }, ['', self::INITIAL_STATE]);
+
+        if ($result[1] === self::QUOTED_STATE || $result[1] === self::ESCAPE_STATE) {
+            throw new InvalidFileException(
+                self::getErrorMessage('a missing closing quote', $value)
+            );
+        }
+
+        return $result[0];
     }
 
     /**

diff --git a/tests/Dotenv/LinesTest.php b/tests/Dotenv/LinesTest.php
@@ -51,4 +51,17 @@ public function testProcessClosingSlash()
 
         $this->assertSame($expected, $lines);
     }
+
+    public function testProcessBadQuotes()
+    {
+        $lines = [
+            "TEST=\"erert\nTEST='erert\n",
+        ];
+
+        $expected = [
+            "TEST=\"erert\nTEST='erert\n",
+        ];
+
+        $this->assertSame($expected, $lines);
+    }
 }
diff --git a/tests/Dotenv/ParserTest.php b/tests/Dotenv/ParserTest.php
@@ -106,4 +106,40 @@ public function testParserEscapingSingle()
     {
         Parser::parse('FOO_BAD=\'iiiiviiiixiiiiviiii\\a\'');
     }
+
+    /**
+     * @expectedException \Dotenv\Exception\InvalidFileException
+     * @expectedExceptionMessage Failed to parse dotenv file due to a missing closing quote. Failed at ['erert].
+     */
+    public function testMissingClosingSingleQuote()
+    {
+        Parser::parse('TEST=\'erert');
+    }
+
+    /**
+     * @expectedException \Dotenv\Exception\InvalidFileException
+     * @expectedExceptionMessage Failed to parse dotenv file due to a missing closing quote. Failed at ["erert].
+     */
+    public function testMissingClosingDoubleQuote()
+    {
+        Parser::parse('TEST="erert');
+    }
+
+    /**
+     * @expectedException \Dotenv\Exception\InvalidFileException
+     * @expectedExceptionMessage Failed to parse dotenv file due to a missing closing quote. Failed at ["erert].
+     */
+    public function testMissingClosingQuotes()
+    {
+        Parser::parse("TEST=\"erert\nTEST='erert\n");
+    }
+
+    /**
+     * @expectedException \Dotenv\Exception\InvalidFileException
+     * @expectedExceptionMessage Failed to parse dotenv file due to a missing closing quote. Failed at ["\].
+     */
+    public function testMissingClosingQuoteWithEscape()
+    {
+        Parser::parse('TEST="\\');
+    }
 }