Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ab08fd6

Browse filesBrowse files
Merge branch '2.8' into 3.2
* 2.8: [Yaml] CS
2 parents d7e74b9 + c80a0ae commit ab08fd6
Copy full SHA for ab08fd6

File tree

1 file changed

+3
-14
lines changed
Filter options

1 file changed

+3
-14
lines changed

‎src/Symfony/Component/Yaml/Parser.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Parser.php
+3-14Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -710,10 +710,7 @@ private function isNextLineIndented()
710710
return false;
711711
}
712712

713-
$ret = false;
714-
if ($this->getCurrentLineIndentation() > $currentIndentation) {
715-
$ret = true;
716-
}
713+
$ret = $this->getCurrentLineIndentation() > $currentIndentation;
717714

718715
$this->moveToPreviousLine();
719716

@@ -814,14 +811,7 @@ private function isNextLineUnIndentedCollection()
814811
return false;
815812
}
816813

817-
$ret = false;
818-
if (
819-
$this->getCurrentLineIndentation() == $currentIndentation
820-
&&
821-
$this->isStringUnIndentedCollectionItem()
822-
) {
823-
$ret = true;
824-
}
814+
$ret = $this->getCurrentLineIndentation() === $currentIndentation && $this->isStringUnIndentedCollectionItem();
825815

826816
$this->moveToPreviousLine();
827817

@@ -863,8 +853,7 @@ private function isBlockScalarHeader()
863853
*/
864854
public static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0)
865855
{
866-
$ret = preg_match($pattern, $subject, $matches, $flags, $offset);
867-
if ($ret === false) {
856+
if (false === $ret = preg_match($pattern, $subject, $matches, $flags, $offset)) {
868857
switch (preg_last_error()) {
869858
case PREG_INTERNAL_ERROR:
870859
$error = 'Internal PCRE error.';

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.