deblan-mirror/magallanes
1
0
Fork 0
mirror of https://github.com/andres-montanez/Magallanes synced 2024-06-16 20:45:02 +02:00
Code Issues Projects Releases Wiki Activity

[FIX] Removed unnecessary argument from calling Parser::isStringUnIndentedCollectionItem() method

Browse source
This commit is contained in:
Vyacheslav Pavlov 2016-07-21 17:21:49 +03:00
parent 47e4d7c9a1
commit d4a6aa349b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage/Yaml/Parser.php
View file

@ -313,7 +313,7 @@ class Parser
if (null === $indentation) { if (null === $indentation) {
$newIndent = $this->getCurrentLineIndentation(); $newIndent = $this->getCurrentLineIndentation();
$unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem($this->currentLine); $unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem();
if (!$this->isCurrentLineEmpty() && 0 === $newIndent && !$unindentedEmbedBlock) { if (!$this->isCurrentLineEmpty() && 0 === $newIndent && !$unindentedEmbedBlock) {
throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine); throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
@ -324,7 +324,7 @@ class Parser
$data = array(substr($this->currentLine, $newIndent)); $data = array(substr($this->currentLine, $newIndent));
$isItUnindentedCollection = $this->isStringUnIndentedCollectionItem($this->currentLine); $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem();
// Comments must not be removed inside a string block (ie. after a line ending with "|") // Comments must not be removed inside a string block (ie. after a line ending with "|")
$removeCommentsPattern = '~' . self::FOLDED_SCALAR_PATTERN . '$~'; $removeCommentsPattern = '~' . self::FOLDED_SCALAR_PATTERN . '$~';
@ -337,7 +337,7 @@ class Parser
$removeComments = !preg_match($removeCommentsPattern, $this->currentLine); $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
} }
if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem($this->currentLine)) { if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem()) {
$this->moveToPreviousLine(); $this->moveToPreviousLine();
break; break;
} }
@ -636,7 +636,7 @@ class Parser
if ( if (
$this->getCurrentLineIndentation() == $currentIndentation $this->getCurrentLineIndentation() == $currentIndentation
&& &&
$this->isStringUnIndentedCollectionItem($this->currentLine) $this->isStringUnIndentedCollectionItem()
) { ) {
$ret = true; $ret = true;
} }