bug #25217 [Dotenv] Changed preg_match flags from null to 0 (deekthesqueak)

nicolas-grekas · nicolas-grekas · commit 8c5eeada3172 · 2017-11-30T09:30:54.000+01:00
This PR was merged into the 3.3 branch. Discussion ---------- [Dotenv] Changed preg_match flags from null to 0 | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | I came across this bug while using HHVM in PHP7 mode. The flag should be changed to match type in function signature and bring it in line with other uses of [preg_match](https://secure.php.net/manual/en/function.preg-match.php) (https://github.com/symfony/dotenv/blob/3.3/Dotenv.php#L149) Applicable to 3.3, 3.4, 4.0 Commits ------- b0d297b [Dotenv] Changed preg_match flags from null to 0
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -173,7 +173,7 @@ private function lexVarname()
 
     private function lexValue()
     {
-        if (preg_match('/[ \t]*+(?:#.*)?$/Am', $this->data, $matches, null, $this->cursor)) {
+        if (preg_match('/[ \t]*+(?:#.*)?$/Am', $this->data, $matches, 0, $this->cursor)) {
             $this->moveCursor($matches[0]);
             $this->skipEmptyLines();
 
@@ -295,7 +295,7 @@ private function lexNestedExpression()
 
     private function skipEmptyLines()
     {
-        if (preg_match('/(?:\s*+(?:#[^\n]*+)?+)++/A', $this->data, $match, null, $this->cursor)) {
+        if (preg_match('/(?:\s*+(?:#[^\n]*+)?+)++/A', $this->data, $match, 0, $this->cursor)) {
             $this->moveCursor($match[0]);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ private function lexVarname()`
`173`	`173`
`174`	`174`	`private function lexValue()`
`175`	`175`	`{`
`176`		`- if (preg_match('/[ \t]+(?:#.)?$/Am', $this->data, $matches, null, $this->cursor)) {`
	`176`	`+ if (preg_match('/[ \t]+(?:#.)?$/Am', $this->data, $matches, 0, $this->cursor)) {`
`177`	`177`	`$this->moveCursor($matches[0]);`
`178`	`178`	`$this->skipEmptyLines();`
`179`	`179`
`@@ -295,7 +295,7 @@ private function lexNestedExpression()`
`295`	`295`
`296`	`296`	`private function skipEmptyLines()`
`297`	`297`	`{`
`298`		`- if (preg_match('/(?:\s+(?:#[^\n]+)?+)++/A', $this->data, $match, null, $this->cursor)) {`
	`298`	`+ if (preg_match('/(?:\s+(?:#[^\n]+)?+)++/A', $this->data, $match, 0, $this->cursor)) {`
`299`	`299`	`$this->moveCursor($match[0]);`
`300`	`300`	`}`
`301`	`301`	`}`