Merge branch '3.1' into 3.2
* 3.1: [appveyor] Update phpunit-bridge cache-id handle empty lines inside unindented collection
This commit is contained in:
commit
cfd3262b81
2
phpunit
2
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";
|
||||
|
|
|
@ -462,7 +462,7 @@ class Parser
|
|||
|
||||
$previousLineIndentation = $indent;
|
||||
|
||||
if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
|
||||
if ($isItUnindentedCollection && !$this->isCurrentLineEmpty() && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
|
||||
$this->moveToPreviousLine();
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -210,6 +210,22 @@ EOF;
|
|||
);
|
||||
$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
|
||||
|
|
Reference in New Issue