Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit 0f21c853e9da · 2017-01-03T14:51:21.000+01:00
* 2.8:
  [appveyor] Update phpunit-bridge cache-id
  handle empty lines inside unindented collection
diff --git a/phpunit b/phpunit
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/89cd0aab376105fb34e773e3dff641f68e3f9645
+// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/a9037a65be5eeeb41f5693c0b4371aff821399f4
 
 if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
     echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -452,7 +452,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
 
             $previousLineIndentation = $indent;
 
-            if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
+            if ($isItUnindentedCollection && !$this->isCurrentLineEmpty() && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
                 $this->moveToPreviousLine();
                 break;
             }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -189,6 +189,22 @@ public function getBlockChompingTests()
         );
         $tests['Literal block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
 
+        $yaml = <<<'EOF'
+foo:
+- bar: |
+    one
+
+    two
+EOF;
+        $expected = array(
+            'foo' => array(
+                array(
+                    'bar' => "one\n\ntwo",
+                ),
+            ),
+        );
+        $tests['Literal block chomping clip with embedded blank line inside unindented collection'] = array($expected, $yaml);
+
         $yaml = <<<'EOF'
 foo: |
     one

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)`
`452`	`452`
`453`	`453`	`$previousLineIndentation = $indent;`
`454`	`454`
`455`		`- if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {`
	`455`	`+ if ($isItUnindentedCollection && !$this->isCurrentLineEmpty() && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {`
`456`	`456`	`$this->moveToPreviousLine();`
`457`	`457`	`break;`
`458`	`458`	`}`