Merge branch '2.8' into 3.2

nicolas-grekas · nicolas-grekas · commit ab08fd69b4d8 · 2017-03-20T10:45:15.000+01:00
* 2.8:
  [Yaml] CS
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -710,10 +710,7 @@ private function isNextLineIndented()
             return false;
         }
 
-        $ret = false;
-        if ($this->getCurrentLineIndentation() > $currentIndentation) {
-            $ret = true;
-        }
+        $ret = $this->getCurrentLineIndentation() > $currentIndentation;
 
         $this->moveToPreviousLine();
 
@@ -814,14 +811,7 @@ private function isNextLineUnIndentedCollection()
             return false;
         }
 
-        $ret = false;
-        if (
-            $this->getCurrentLineIndentation() == $currentIndentation
-            &&
-            $this->isStringUnIndentedCollectionItem()
-        ) {
-            $ret = true;
-        }
+        $ret = $this->getCurrentLineIndentation() === $currentIndentation && $this->isStringUnIndentedCollectionItem();
 
         $this->moveToPreviousLine();
 
@@ -863,8 +853,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.';
