Merge branch '3.1' into 3.2

* 3.1:
  [appveyor] Update phpunit-bridge cache-id
  handle empty lines inside unindented collection

Author: nicolas-grekas

Parser.php

@@ -462,7 +462,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;
             }

Tests/ParserTest.php

@@ -210,6 +210,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