merged branch merk/patch-2 (PR #4561)

Commits
-------

4ac48d9 Added failing YAML inline string to tests

Discussion
----------

Added failing YAML inline string to tests

#4042 introduced a regression for yaml string parsing starting with a double colon (::). The below configuration syntax no longer works.

The addition to the tests generates a failure:

1) Symfony\Component\Yaml\Tests\InlineTest::testDump
Symfony\Component\Yaml\Exception\ParseException: Malformed inline YAML string ('::form_base.html.twig').

```yaml
# Twig Configuration
twig:
    debug:            %kernel.debug%
    strict_variables: %kernel.debug%
    form:
        resources:
            - '::form_theme.html.twig'
            - 'InfiniteFormBundle::form_theme.html.twig'
```

---------------------------------------------------------------------------

by merk at 2012-06-12T22:15:42Z

For those having this trouble, locking composer at a specific symfony commit is the best option until it is fixed:

```
        "symfony/symfony": "dev-master#3bb7dc0bfa87b2d4db8262be65b5f49cc6a17a9b",
```

---------------------------------------------------------------------------

by travisbot at 2012-06-13T00:44:45Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1605553) (merged 4ac48d9e into 37550d23).
This commit is contained in:
Fabien Potencier 2012-06-13 14:06:46 +02:00
commit c55ddb9276

View File

@ -115,6 +115,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase
"'foo#bar'" => 'foo#bar',
"'foo # bar'" => 'foo # bar',
"'#cfcfcf'" => '#cfcfcf',
'::form_base.html.twig' => '::form_base.html.twig',
'2007-10-30' => mktime(0, 0, 0, 10, 30, 2007),
'2007-10-30T02:59:43Z' => gmmktime(2, 59, 43, 10, 30, 2007),