Skip to content

Commit d0c5e68

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: [Process] Fix signaling/stopping logic on Windows [Yaml] minor CS cleaning [Console] do not encode backslashes in console default description
2 parents 4cfcd7a + 9b86f8b commit d0c5e68

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Parser.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
347347
if (null === $indentation) {
348348
$newIndent = $this->getCurrentLineIndentation();
349349

350-
$unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem($this->currentLine);
350+
$unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem();
351351

352352
if (!$this->isCurrentLineEmpty() && 0 === $newIndent && !$unindentedEmbedBlock) {
353353
throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
@@ -373,7 +373,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
373373
return;
374374
}
375375

376-
$isItUnindentedCollection = $this->isStringUnIndentedCollectionItem($this->currentLine);
376+
$isItUnindentedCollection = $this->isStringUnIndentedCollectionItem();
377377

378378
// Comments must not be removed inside a block scalar
379379
$removeCommentsPattern = '~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~';
@@ -386,7 +386,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
386386
$removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
387387
}
388388

389-
if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem($this->currentLine) && $newIndent === $indent) {
389+
if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
390390
$this->moveToPreviousLine();
391391
break;
392392
}
@@ -690,7 +690,7 @@ private function isNextLineUnIndentedCollection()
690690
if (
691691
$this->getCurrentLineIndentation() == $currentIndentation
692692
&&
693-
$this->isStringUnIndentedCollectionItem($this->currentLine)
693+
$this->isStringUnIndentedCollectionItem()
694694
) {
695695
$ret = true;
696696
}

0 commit comments

Comments
 (0)