Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit c80a0ae90fb3 · 2017-03-20T10:41:44.000+01:00
* 2.7:
  [Yaml] CS
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -253,7 +253,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);
             }
         }
 
@@ -652,10 +652,7 @@ private function isNextLineIndented()
             return false;
         }
 
-        $ret = false;
-        if ($this->getCurrentLineIndentation() > $currentIndentation) {
-            $ret = true;
-        }
+        $ret = $this->getCurrentLineIndentation() > $currentIndentation;
 
         $this->moveToPreviousLine();
 
@@ -756,14 +753,7 @@ private function isNextLineUnIndentedCollection()
             return false;
         }
 
-        $ret = false;
-        if (
-            $this->getCurrentLineIndentation() == $currentIndentation
-            &&
-            $this->isStringUnIndentedCollectionItem()
-        ) {
-            $ret = true;
-        }
+        $ret = $this->getCurrentLineIndentation() === $currentIndentation && $this->isStringUnIndentedCollectionItem();
 
         $this->moveToPreviousLine();
 
@@ -805,8 +795,7 @@ private function isBlockScalarHeader()
      */
     public static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0)
     {
-        $ret = preg_match($pattern, $subject, $matches, $flags, $offset);
-        if ($ret === false) {
+        if (false === $ret = preg_match($pattern, $subject, $matches, $flags, $offset)) {
             switch (preg_last_error()) {
                 case PREG_INTERNAL_ERROR:
                     $error = 'Internal PCRE error.';
