symfony
diff --git a/‎src/Symfony/Component/Yaml/Parser.php‎
Lines changed: 6 additions & 4 deletions b/‎src/Symfony/Component/Yaml/Parser.php‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Yaml/Tests/ParserTest.php‎
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Yaml/Tests/ParserTest.php‎
Lines changed: 2 additions & 2 deletions
@@ -61,7 +61,7 @@ public function __construct($offset = 0, $totalNumberOfLines = null, array $skip
      */
     public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
     {
-        if (!self::preg_match('//u', $value)) {
+        if (false === preg_match('//u', $value)) {
             throw new ParseException('The YAML value does not appear to be valid UTF-8.');
         }
         $this->currentLineNb = -1;
@@ -127,7 +127,6 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
             } elseif (self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+))?$#u', rtrim($this->currentLine), $values)
                 && (false === strpos($values['key'], ' #')
                     || in_array($values['key'][0], array('"', "'")))) {
-
                 if ($context && 'sequence' == $context) {
                     throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine);
                 }
@@ -269,7 +268,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                     return $value;
                 }
 
-                throw new ParseException("Unable to parse", $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                throw new ParseException('Unable to parse', $this->getRealCurrentLineNb() + 1, $this->currentLine);
             }
         }
 
@@ -794,9 +793,11 @@ private function isBlockScalarHeader()
      * in the YAML engine
      *
      * @throws ParseException on a PCRE internal error
+     *
      * @see preg_last_error()
+     * @internal
      */
-    static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0)
+    public static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0)
     {
         $ret = preg_match($pattern, $subject, $matches, $flags, $offset);
         if ($ret === false) {
@@ -822,6 +823,7 @@ static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $of
 
             throw new ParseException($error);
         }
+
         return $ret;
     }
 }
@@ -1147,8 +1147,8 @@ public function parserThrowsExceptionWithCorrectLineNumberProvider()
 
     public function testCanParseVeryLongValue()
     {
-        $longStringWithSpaces = str_repeat("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ", 20000);
-        $trickyVal = array("x" => $longStringWithSpaces);
+        $longStringWithSpaces = str_repeat('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ', 20000);
+        $trickyVal = array('x' => $longStringWithSpaces);
 
         $yamlString = Yaml::dump($trickyVal);
         $arrayFromYaml = $this->parser->parse($yamlString);
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function __construct($offset = 0, $totalNumberOfLines = null, array $skip`
`61`	`61`	`*/`
`62`	`62`	`public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)`
`63`	`63`	`{`
`64`		`- if (!self::preg_match('//u', $value)) {`
	`64`	`+ if (false === preg_match('//u', $value)) {`
`65`	`65`	`throw new ParseException('The YAML value does not appear to be valid UTF-8.');`
`66`	`66`	`}`
`67`	`67`	`$this->currentLineNb = -1;`
`@@ -127,7 +127,6 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =`
`127`	`127`	`} elseif (self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'\|[^ \'"\[\{].?) \:(\s+(?P<value>.+))?$#u', rtrim($this->currentLine), $values)`
`128`	`128`	`&& (false === strpos($values['key'], ' #')`
`129`	`129`	`\|\| in_array($values['key'][0], array('"', "'")))) {`
`130`		`-`
`131`	`130`	`if ($context && 'sequence' == $context) {`
`132`	`131`	`throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine);`
`133`	`132`	`}`
`@@ -269,7 +268,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =`
`269`	`268`	`return $value;`
`270`	`269`	`}`
`271`	`270`
`272`		`- throw new ParseException("Unable to parse", $this->getRealCurrentLineNb() + 1, $this->currentLine);`
	`271`	`+ throw new ParseException('Unable to parse', $this->getRealCurrentLineNb() + 1, $this->currentLine);`
`273`	`272`	`}`
`274`	`273`	`}`
`275`	`274`
`@@ -794,9 +793,11 @@ private function isBlockScalarHeader()`
`794`	`793`	`* in the YAML engine`
`795`	`794`	`*`
`796`	`795`	`* @throws ParseException on a PCRE internal error`
	`796`	`+ *`
`797`	`797`	`* @see preg_last_error()`
	`798`	`+ * @internal`
`798`	`799`	`*/`
`799`		`- static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0)`
	`800`	`+ public static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0)`
`800`	`801`	`{`
`801`	`802`	`$ret = preg_match($pattern, $subject, $matches, $flags, $offset);`
`802`	`803`	`if ($ret === false) {`
`@@ -822,6 +823,7 @@ static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $of`
`822`	`823`
`823`	`824`	`throw new ParseException($error);`
`824`	`825`	`}`
	`826`	`+`
`825`	`827`	`return $ret;`
`826`	`828`	`}`
`827`	`829`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1147,8 +1147,8 @@ public function parserThrowsExceptionWithCorrectLineNumberProvider()`
`1147`	`1147`
`1148`	`1148`	`public function testCanParseVeryLongValue()`
`1149`	`1149`	`{`
`1150`		`- $longStringWithSpaces = str_repeat("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ", 20000);`
`1151`		`- $trickyVal = array("x" => $longStringWithSpaces);`
	`1150`	`+ $longStringWithSpaces = str_repeat('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ', 20000);`
	`1151`	`+ $trickyVal = array('x' => $longStringWithSpaces);`
`1152`	`1152`
`1153`	`1153`	`$yamlString = Yaml::dump($trickyVal);`
`1154`	`1154`	`$arrayFromYaml = $this->parser->parse($yamlString);`