Permalink
Commits on Jan 27, 2013
Commits on Jan 22, 2013
  1. Merge branch '2.0' into 2.1

    * 2.0:
      [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
      [Security] PHPDoc in SecurityEvents
      [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
      [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
      [Yaml] fixed #6773
      [Yaml] fixed #6770
      bumped Symfony version to 2.0.23-DEV
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Yaml/Inline.php
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
    fabpot committed Jan 22, 2013
Commits on Jan 18, 2013
  1. merged branch ezzatron/yaml-negative-integers (PR #6784)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    fea20b7 [Yaml] fixed #6770
    
    Discussion
    ----------
    
    [Yaml] fixed parsing of negative integers (2.0 branch)
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #6770
    | License       | MIT
    | Doc PR        | n/a
    
    Note that an unrelated test fixture for large integers had to be changed to work on systems with 64-bit integer support because of the change from `assertEquals()` to `assertSame()`. Please see the diff for clarification.
    fabpot committed Jan 18, 2013
Commits on Jan 17, 2013
  1. [Yaml] fixed #6773

    ezzatron committed Jan 17, 2013
  2. [Yaml] fixed #6770

    ezzatron committed Jan 17, 2013
  3. Merge branch '2.0' into 2.1

    * 2.0:
      [Yaml] fixed unneeded BC break
      [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
      [Yaml] fixed typo
      updated VERSION for 2.0.22
      update CONTRIBUTORS for 2.0.22
      updated CHANGELOG for 2.0.22
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Jan 17, 2013
  4. [Yaml] fixed unneeded BC break

    fabpot committed Jan 17, 2013
  5. [Yaml] fixed typo

    fabpot committed Jan 17, 2013
  6. Merge branch '2.0' into 2.1

    * 2.0:
      [Yaml] fixed default value
      Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
      added a way to enable/disable object support when parsing/dumping
      added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
      [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
    
    Conflicts:
    	src/Symfony/Component/Yaml/Dumper.php
    	src/Symfony/Component/Yaml/Parser.php
    	src/Symfony/Component/Yaml/Tests/DumperTest.php
    	src/Symfony/Component/Yaml/Tests/ParserTest.php
    	src/Symfony/Component/Yaml/Yaml.php
    fabpot committed Jan 17, 2013
  7. [Yaml] fixed default value

    fabpot committed Jan 17, 2013
  8. Added Yaml\Dumper::setIndentation() method to allow a custom indentat…

    …ion level of nested nodes.
    
    YAML does not specify an absolute indentation level, but a consistent indentation of nested nodes only: http://www.yaml.org/spec/1.2/spec.html#space/indentation/
    
    Projects that are generally using 2 spaces for indentation should be able to retain consistency with their coding standards by supplying a custom value for the new $indent parameter added to Yaml::dump(), or the new Dumper::setIndentation() method.
    
    The new parameter is a backwards-compatible API addition and defaults to the previous default of 4 (which was changed from 2 via PR #2242 only recently).
    
    Conflicts:
    	src/Symfony/Component/Yaml/Dumper.php
    	src/Symfony/Component/Yaml/Yaml.php
    sun committed with fabpot Aug 4, 2012
  9. added a way to enable/disable object support when parsing/dumping

    By default, object support is disabled, and instead of throwing an
    exception when an object is handled, null is returned.
    
    If you do need object support, enable it via:
    
        Yaml::dump($data, false, true);
    
    If you want an exception to be thrown in case an invalid type is handled
    (a PHP resource or a PHP object), pass true as the second argument:
    
        Yaml::dump($data, true, true);
    
    The same can be done when parsing:
    
        Yaml::parse($data, 2, false, true);
    fabpot committed Jan 17, 2013
  10. added a way to enable/disable PHP support when parsing a YAML input v…

    …ia Yaml::parse()
    
    PHP support when parsing a file has been disabled by default.
    If you do need PHP support when parsing a YAML file, enable it via:
    
        Yaml::setPhpParsing(true);
    
    As of Symfony 2.1, PHP support is disabled by default, and support will
    be removed in Symfony 2.3.
    fabpot committed Jan 17, 2013
Commits on Jan 9, 2013
Commits on Jan 4, 2013
  1. Merge branch '2.0' into 2.1

    * 2.0:
      updated license year
      Update src/Symfony/Component/HttpFoundation/Response.php
      [Console] fixed unitialized properties (closes #5935)
      [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.
      bumped Symfony version to 2.0.21-DEV
      updated VERSION for 2.0.21
      updated CHANGELOG for 2.0.21
    
    Conflicts:
    	src/Symfony/Bundle/SwiftmailerBundle/LICENSE
    	src/Symfony/Component/Filesystem/LICENSE
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Jan 4, 2013
  2. updated license year

    fabpot committed Jan 4, 2013
Commits on Dec 6, 2012
Commits on Nov 8, 2012
  1. Fix export-ignore on Windows

    gajdaw committed Nov 8, 2012
Commits on Oct 29, 2012
  1. merged branch jakzal/yamlDoubleQuotesDumperFix (PR #4320)

    Commits
    -------
    
    b631073 [Yaml] Fixed double quotes escaping in Dumper.
    
    Discussion
    ----------
    
    [Yaml] Fixed double quotes escaping in Dumper
    
    Issue #4308 is caused by Dumper::escapeWithDoubleQuotes() which uses [str_replace()](http://php.net/str_replace).
    
    From the php docs:
    
    > Because str_replace() replaces left to right, it might replace a previously inserted value when doing multiple replacements.
    
    We should be very careful in deciding about the order of elements in $escapees array. I'd really appreciate if someone reviewed my fix. Tests say I didn't break anything but I'm not sure what percentage of Yaml specification is covered by tests.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: not that I know
    Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/jakzal/symfony.png?branch=yamlDoubleQuotesDumperFix)](http://travis-ci.org/jakzal/symfony)
    Fixes the following tickets: #4308
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-18T08:53:51Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1364279) (merged 5192722c into a04acc89).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-18T23:19:49Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1371539) (merged ecaa1aab into fc3c609b).
    
    ---------------------------------------------------------------------------
    
    by dinamic at 2012-05-19T07:35:21Z
    
    Something is really wrong with this method. You can see clearly that multiple characters would fail proper escaping.
    
    Here's an example:
    ```
    $value = '\\\\"some value\n \"some quoted string\" and \'some single quotes one\'"';
    var_dump(Escaper::escapeWithDoubleQuotes($value));
    string(72) ""\\\"some value\n \\some quoted string\\ and 'some single quotes one'\"""
    ```
    
    To begin with the backslash - in the initial value you have 2 (escaped ones), that after escaping should result in 4, not in 1 (escaped). I guess this behavior has to be verified with the importer, but imho it does not seem right.
    
    Does anyone know why this escaping wasn't done using a regular expression in first place?
    
    ---------------------------------------------------------------------------
    
    by clemens-tolboom at 2012-05-19T10:18:58Z
    
    Searching for https://duckduckgo.com/?q=what+is+\xc2\x85 the table on http://stackoverflow.com/questions/6609895/efficiently-replace-bad-characters is interesting enough to decide we need way more documentation on this file.
    
    \xc2\x85 seems to be triple dot (ellipses)
    \xe2\x80\xa9 seems to be paragraph separator see http://drupal.org/node/914360#comment-3468550
    
    Conflicts:
    	src/Symfony/Component/Yaml/Escaper.php
    fabpot committed Jun 9, 2012
Commits on Oct 20, 2012
  1. Nsdocblocks

    Drak committed with fabpot Oct 19, 2012
Commits on Oct 4, 2012
Commits on Aug 22, 2012
Commits on Aug 7, 2012
Commits on Aug 5, 2012
  1. Added Yaml\Dumper::setIndentation() method to allow a custom indentat…

    …ion level of nested nodes.
    
    YAML does not specify an absolute indentation level, but a consistent indentation of nested nodes only: http://www.yaml.org/spec/1.2/spec.html#space/indentation/
    
    Projects that are generally using 2 spaces for indentation should be able to retain consistency with their coding standards by supplying a custom value for the new $indent parameter added to Yaml::dump(), or the new Dumper::setIndentation() method.
    
    The new parameter is a backwards-compatible API addition and defaults to the previous default of 4 (which was changed from 2 via PR #2242 only recently).
    sun committed Aug 4, 2012
Commits on Jul 15, 2012
  1. Revert "raised the minimum version of PHP to 5.3.4 (closes #3856)"

    This reverts commit 2dcc44897ef1ceec2721bbf616c4744131340657.
    fabpot committed Jul 15, 2012
Commits on Jul 13, 2012
  1. raised the minimum version of PHP to 5.3.4 (closes #3856)

    We've raised the minimum version of PHP because of a PHP
    bug before 5.3.4:
    
    https://bugs.php.net/bug.php?id=52083
    https://bugs.php.net/bug.php?id=50027
    fabpot committed Jul 13, 2012
Commits on Jul 9, 2012
  1. fixed CS

    fabpot committed Jul 9, 2012
Commits on Jul 4, 2012
  1. [Finder] tests for Yaml class

    gajdaw committed Jul 4, 2012
Commits on Jul 1, 2012
  1. [Yaml] fixed parsing when a mapping is mixed within a sequence and vi…

    …ce-versa (closes #4634)
    fabpot committed Jul 1, 2012
Commits on Jun 13, 2012
Commits on Jun 12, 2012
Commits on Jun 9, 2012
  1. merged branch jakzal/yamlDoubleQuotesDumperFix (PR #4320)

    Commits
    -------
    
    b631073 [Yaml] Fixed double quotes escaping in Dumper.
    
    Discussion
    ----------
    
    [Yaml] Fixed double quotes escaping in Dumper
    
    Issue #4308 is caused by Dumper::escapeWithDoubleQuotes() which uses [str_replace()](http://php.net/str_replace).
    
    From the php docs:
    
    > Because str_replace() replaces left to right, it might replace a previously inserted value when doing multiple replacements.
    
    We should be very careful in deciding about the order of elements in $escapees array. I'd really appreciate if someone reviewed my fix. Tests say I didn't break anything but I'm not sure what percentage of Yaml specification is covered by tests.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: not that I know
    Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/jakzal/symfony.png?branch=yamlDoubleQuotesDumperFix)](http://travis-ci.org/jakzal/symfony)
    Fixes the following tickets: #4308
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-18T08:53:51Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1364279) (merged 5192722c into a04acc89).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-18T23:19:49Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1371539) (merged ecaa1aab into fc3c609b).
    
    ---------------------------------------------------------------------------
    
    by dinamic at 2012-05-19T07:35:21Z
    
    Something is really wrong with this method. You can see clearly that multiple characters would fail proper escaping.
    
    Here's an example:
    ```
    $value = '\\\\"some value\n \"some quoted string\" and \'some single quotes one\'"';
    var_dump(Escaper::escapeWithDoubleQuotes($value));
    string(72) ""\\\"some value\n \\some quoted string\\ and 'some single quotes one'\"""
    ```
    
    To begin with the backslash - in the initial value you have 2 (escaped ones), that after escaping should result in 4, not in 1 (escaped). I guess this behavior has to be verified with the importer, but imho it does not seem right.
    
    Does anyone know why this escaping wasn't done using a regular expression in first place?
    
    ---------------------------------------------------------------------------
    
    by clemens-tolboom at 2012-05-19T10:18:58Z
    
    Searching for https://duckduckgo.com/?q=what+is+\xc2\x85 the table on http://stackoverflow.com/questions/6609895/efficiently-replace-bad-characters is interesting enough to decide we need way more documentation on this file.
    
    \xc2\x85 seems to be triple dot (ellipses)
    \xe2\x80\xa9 seems to be paragraph separator see http://drupal.org/node/914360#comment-3468550
    fabpot committed Jun 9, 2012
  2. merged branch paul-matthews/master (PR #4042)

    Commits
    -------
    
    478227d Fixed quoting issues with Yaml Inline Parser
    
    Discussion
    ----------
    
    [Yaml] fix parsing quotes problem
    
    Added some basic checking for quotes on their own within strings. Used single quote ' followed by "," and ":" to denote the end of the current string to test.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #4021
    Todo: N/A
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-07T09:22:56Z
    
    After doing the requested changes, can you squash your commits? Thanks.
    
    ---------------------------------------------------------------------------
    
    by paul-matthews at 2012-05-09T13:29:45Z
    
    Resolved and squashed
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-09T13:30:30Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1285048) (merged 5ce6d4e1 into 6c714095).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-09T13:31:06Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1285057) (merged 3592fcec into e54f4e46).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-09T13:33:40Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1285094) (merged e209f786 into e54f4e46).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-09T13:37:42Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1285153) (merged 0967b513 into e54f4e46).
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-09T14:00:29Z
    
    It looks like that another commit is in your PR that should not be there.
    
    ---------------------------------------------------------------------------
    
    by paul-matthews at 2012-05-09T15:52:35Z
    
    Right-o will remove
    
    ---------------------------------------------------------------------------
    
    by paul-matthews at 2012-05-09T15:54:15Z
    
    resolved
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-09T15:57:15Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1286339) (merged fc276209 into e66a0bb3).
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-10T05:20:18Z
    
    Apparently, some tests do not pass anymore after the patch. Can you have a look at them? Thanks.
    
    ---------------------------------------------------------------------------
    
    by paul-matthews at 2012-05-10T11:20:45Z
    
    Sure - looking into it.
    
    ---------------------------------------------------------------------------
    
    by paul-matthews at 2012-05-10T17:55:53Z
    
    I believe that's fixed.
    
    The entire suite works locally now.
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-10T17:55:54Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1297641) (merged 884c02ed into fae4523f).
    
    ---------------------------------------------------------------------------
    
    by paul-matthews at 2012-05-10T17:57:03Z
    
    Unsure why travis fails.
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-10T18:00:28Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1297650) (merged 478227d9 into fae4523f).
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-06-09T13:24:52Z
    
    @fabpot 👍
    fabpot committed Jun 9, 2012