Skip to content

[3.3] Fixed detection of closing multiline-quotes #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GrahamCampbell merged 1 commit into from
Jan 30, 2019
Merged

[3.3] Fixed detection of closing multiline-quotes #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/Lines.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ public static function process(array $lines)
private static function multilineProcess($multiline, $line, array $buffer)
{
// check if $line can be multiline variable
if (self::looksLikeMultilineStart($line)) {
if ($started = self::looksLikeMultilineStart($line)) {
$multiline = true;
}

if ($multiline) {
array_push($buffer, $line);

if (self::looksLikeMultilineStop($line)) {
if (self::looksLikeMultilineStop($line, $started)) {
$multiline = false;
$line = implode("\n", $buffer);
$buffer = [];
Expand All @@ -72,29 +72,32 @@ private static function looksLikeMultilineStart($line)
return false;
}

return self::looksLikeMultilineStop($line) === false;
return self::looksLikeMultilineStop($line, true) === false;
}

/**
* Determine if the given line can be the start of a multiline variable.
*
* @param string $line
* @param bool $started
*
* @return bool
*/
private static function looksLikeMultilineStop($line)
private static function looksLikeMultilineStop($line, $started)
{
if ($line === '"') {
return true;
}

$seen = $started ? 0 : 1;

foreach (self::getCharPairs(str_replace('\\\\', '', $line)) as $pair) {
if ($pair[0] !== '\\' && $pair[0] !== '=' && $pair[1] === '"') {
return true;
if ($pair[0] !== '\\' && $pair[1] === '"') {
$seen++;
}
}

return false;
return $seen > 1;
}

/**
Expand Down
2 changes: 2 additions & 0 deletions tests/Dotenv/DotenvTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ public function testMutlilineLoading()
$dotenv = Dotenv::create($this->fixturesFolder, 'multiline.env');
$dotenv->load();
$this->assertSame("test\n test\"test\"\n test", getenv('TEST'));
$this->assertSame('https://vision.googleapis.com/v1/images:annotate?key=', getenv('TEST_EQD'));
$this->assertSame('https://vision.googleapis.com/v1/images:annotate?key=', getenv('TEST_EQS'));
}

public function testDotenvAssertions()
Expand Down
2 changes: 2 additions & 0 deletions tests/Dotenv/LinesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public function testProcessQuotes()

$expected = [
"TEST=\"test\n test\\\"test\\\"\n test\"",
'TEST_EQD="https://vision.googleapis.com/v1/images:annotate?key="',
'TEST_EQS=\'https://vision.googleapis.com/v1/images:annotate?key=\'',
];

$this->assertSame($expected, Lines::process(preg_split("/(\r\n|\n|\r)/", $content)));
Expand Down
3 changes: 3 additions & 0 deletions tests/fixtures/env/multiline.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
TEST="test
test\"test\"
test"

TEST_EQD="https://vision.googleapis.com/v1/images:annotate?key="
TEST_EQS='https://vision.googleapis.com/v1/images:annotate?key='