Permalink
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 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
Commits on May 18, 2012
  1. fixed CS

    fabpot committed May 18, 2012
Commits on May 16, 2012
  1. fixed test

    fabpot committed May 16, 2012
Commits on May 15, 2012
  1. fixed phpdoc @param alignment

    fabpot committed May 15, 2012
Commits on May 12, 2012
Commits on May 11, 2012
Commits on May 10, 2012
  1. Fixed quoting issues with Yaml Inline Parser

    * Added test parse error in parseQuotedScalar
      * Expecting to throw tests, previously trimmed string
      * More details on issue: symfony/symfony#4021
    * Enforces single quote escaping when within string quotes
      * Shortens the scope of the validation match
      * Stricter matching rules
    * Ensures double quoted strings are not parsed incorrectly
    * Split quote matching into 2 types of quotes
      * Separates single and double quotes
      * Fixes intollerence for un escaped double quote
    paul-matthews committed Apr 20, 2012
Commits on May 8, 2012
  1. merged branch gajdaw/2_1_component_yaml_fix_4022 (PR #4126)

    Commits
    -------
    
    80a2a92 [2.1][Component][Yaml] fix 4022
    
    Discussion
    ----------
    
    [2.1][Component][Yaml] fix 4022
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/gajdaw/symfony.png?branch=2_1_component_yaml_fix_4022)](http://travis-ci.org/gajdaw/symfony)
    Fixes the following tickets: #4121, #4022, #4135
    Todo:
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-04-27T13:03:15Z
    
    Why is it marked as ``[2.2]`` if it is a bugfix ?
    
    @fabpot ping
    
    ---------------------------------------------------------------------------
    
    by gajdaw at 2012-04-27T14:42:21Z
    
    The title should be [2.1] - now it is correct.
    
    I marked it 2.0 and PR was for 2.0 originally.
    
    Fabien suggested that it should go to master branch: symfony/symfony#4121 (comment)
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-07T09:17:31Z
    
    That does not work when you have something after the unindented collection:
    
        collection:
            key:
            - a
            - b
            - c
        foo: bar
    
    ---------------------------------------------------------------------------
    
    by gajdaw at 2012-05-07T11:11:30Z
    
    @fabpot Last commit contains test with your yaml:
    
        collection:
            key:
            - a
            - b
            - c
        foo: bar
    
    Everything seems fine. Can you give me a hint: what do you mean, when you say "That does not work"?
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-07T12:36:19Z
    
    Sorry, the failing test is the following:
    
        test: Key/value after unindented collection
        brief: >
            Key/value after unindented collection
        yaml: |
            collection:
                key:
                - a
                - b
                - c
                foo: bar
        php: |
            array('collection' => array('key' => array('a', 'b', 'c'), 'foo' => 'bar'))
    
    ---------------------------------------------------------------------------
    
    by gajdaw at 2012-05-07T15:48:26Z
    
    @fabpot Last commit passed your test.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-07T17:28:21Z
    
    Can you squash your commits? Thanks.
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-08T05:32:58Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1273487) (merged 20891c58 into 919604ab).
    
    ---------------------------------------------------------------------------
    
    by gajdaw at 2012-05-08T05:36:51Z
    
    Done.
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-08T07:23:47Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1274162) (merged 80a2a92e into 898ff4e0).
    fabpot committed May 8, 2012
  2. [2.1][Component][Yaml] fix 4022

    gajdaw committed Apr 26, 2012
Commits on May 7, 2012
  1. updated minimum PHP version to 5.3.3

    5.3.3 has some interesting fixes and this is the version used by
    Redhat 6 and Debian 6
    fabpot committed May 7, 2012
Commits on May 1, 2012
  1. merged branch willdurand/fix-components (PR #4155)

    Commits
    -------
    
    c195957 [Components] Tests/Autoloading fixes
    
    Discussion
    ----------
    
    Fix components
    
    See #4141
    
    ----
    This PR:
    
    * configures each component to use composer to manage "dev" dependencies instead of env variables;
    * adds phpunit configuration file on Filesystem component;
    * fixes READMEs.
    
    It's mergeable without any problems, but I would recommend to wait a fix in Composer in order to use `self.version` in `require`/`require-dev` sections.
    
    Note: I kept `suggest` sections because it makes sense but this PR doesn't aim to provide useful explanations for each entry. It could be another PR, not that one.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-04-30T20:43:13Z
    
    @fabpot I reviewed each component, one by one. Now `phpunit` always works, even if tests are skipped. A simple `composer install --dev` allows to run the complete test suite. Each commit is well separated from the others. I guess, everything is ok now.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-30T20:47:00Z
    
    Please squash, as it makes no sense to have the same commit for each component.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-01T14:26:11Z
    
    Can you squash your commits before I merge? Thanks.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-05-01T14:29:38Z
    
    done
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-01T15:48:25Z
    
    It does not seem that the commits are squashed.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-05-01T15:54:08Z
    
    done
    fabpot committed May 1, 2012
  2. [Components] Tests/Autoloading fixes

    * Switched to Composer to manage "dev" dependencies
    * Fixed READMEs
    * Excluded vendor in phpunit.xml.dist files
    * Fixed message in bootstrap.php files
    * Added autoloader for the component itself
    willdurand committed Apr 27, 2012
Commits on Apr 27, 2012
  1. Revert "merged branch Seldaek/master (PR #4133)"

    This reverts commit 00e7a94a8c761a3e10c388e4d06cb3ce4cd04ad7, reversing
    changes made to a01dec00f4e8de357cce5fdf121ac98729f7f8ff.
    fabpot committed Apr 27, 2012
  2. Update branch aliases

    Seldaek committed Apr 27, 2012
Commits on Apr 26, 2012
  1. [Yaml] added CHANGELOG

    fabpot committed Apr 26, 2012
Commits on Apr 25, 2012
  1. merged 2.0

    fabpot committed Apr 25, 2012
Commits on Apr 20, 2012
  1. merged 2.0

    fabpot committed Apr 20, 2012
Commits on Apr 5, 2012
Commits on Mar 30, 2012
Commits on Mar 29, 2012
  1. moved component and bridge unit tests to the src/ directory

    This is the first step to make each Symfony Component and Bridge self-contained.
    fabpot committed Mar 28, 2012