Merge branch '3.6' into 4.2

Author: GrahamCampbell

src/Loader/Parser.php

@@ -114,15 +114,23 @@ private static function parseValue($value)
             return Value::blank();
         }
 
-        return array_reduce(str_split($value), function ($data, $char) use ($value) {
+        $result = array_reduce(str_split($value), function ($data, $char) use ($value) {
             return self::processChar($data[1], $char)->mapError(function ($err) use ($value) {
                 throw new InvalidFileException(
                     self::getErrorMessage($err, $value)
                 );
             })->mapSuccess(function ($val) use ($data) {
                 return [$data[0]->append($val[0], $val[1]), $val[2]];
             })->getSuccess();
-        }, [Value::blank(), self::INITIAL_STATE])[0];
+        }, [Value::blank(), self::INITIAL_STATE]);
+
+        if (in_array($result[1], [self::SINGLE_QUOTED_STATE, self::DOUBLE_QUOTED_STATE, self::ESCAPE_SEQUENCE_STATE], true)) {
+            throw new InvalidFileException(
+                self::getErrorMessage('a missing closing quote', $value)
+            );
+        }
+
+        return $result[0];
     }
 
     /**

tests/Dotenv/LinesTest.php

@@ -53,4 +53,17 @@ public function testProcessClosingSlash()
 
         self::assertSame($expected, $lines);
     }
+
+    public function testProcessBadQuotes()
+    {
+        $lines = [
+            "TEST=\"erert\nTEST='erert\n",
+        ];
+
+        $expected = [
+            "TEST=\"erert\nTEST='erert\n",
+        ];
+
+        self::assertSame($expected, $lines);
+    }
 }

tests/Dotenv/ParserTest.php

@@ -226,4 +226,40 @@ public function testParserEscapingSingle()
         self::assertSame('iiiiviiiixiiiiviiii\\a', $output[1]->getChars());
         self::assertSame([], $output[1]->getVars());
     }
+
+    /**
+     * @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="\\');
+    }
 }