Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 22, 2012
  1. @willdurand
Commits on Aug 7, 2012
  1. @sun
Commits on Aug 5, 2012
  1. @sun

    Added Yaml\Dumper::setIndentation() method to allow a custom indentat…

    sun authored
    …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).
Commits on Jul 15, 2012
  1. @fabpot

    Revert "raised the minimum version of PHP to 5.3.4 (closes #3856)"

    fabpot authored
    This reverts commit 2dcc44897ef1ceec2721bbf616c4744131340657.
Commits on Jul 13, 2012
  1. @fabpot

    raised the minimum version of PHP to 5.3.4 (closes #3856)

    fabpot authored
    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
Commits on Jul 9, 2012
  1. @fabpot

    fixed CS

    fabpot authored
Commits on Jul 4, 2012
  1. @gajdaw

    [Finder] tests for Yaml class

    gajdaw authored
Commits on Jul 1, 2012
  1. @fabpot
Commits on Jun 13, 2012
  1. @fabpot
Commits on Jun 12, 2012
  1. @merk
Commits on Jun 9, 2012
  1. @fabpot

    merged branch paul-matthews/master (PR #4042)

    fabpot authored
    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 :+1:
Commits on May 18, 2012
  1. @fabpot

    fixed CS

    fabpot authored
Commits on May 16, 2012
  1. @fabpot

    fixed test

    fabpot authored
Commits on May 15, 2012
  1. @fabpot

    fixed phpdoc @param alignment

    fabpot authored
Commits on May 12, 2012
  1. @fabpot
Commits on May 11, 2012
  1. @fabpot
Commits on May 10, 2012
  1. @paul-matthews

    Fixed quoting issues with Yaml Inline Parser

    paul-matthews authored
    * 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
Commits on May 8, 2012
  1. @fabpot

    merged branch gajdaw/2_1_component_yaml_fix_4022 (PR #4126)

    fabpot authored
    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).
  2. @gajdaw

    [2.1][Component][Yaml] fix 4022

    gajdaw authored
Commits on May 7, 2012
  1. @fabpot

    updated minimum PHP version to 5.3.3

    fabpot authored
    5.3.3 has some interesting fixes and this is the version used by
    Redhat 6 and Debian 6
Commits on May 1, 2012
  1. @fabpot

    merged branch willdurand/fix-components (PR #4155)

    fabpot authored
    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
  2. @willdurand

    [Components] Tests/Autoloading fixes

    willdurand authored
    * 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
Commits on Apr 27, 2012
  1. @fabpot

    Revert "merged branch Seldaek/master (PR #4133)"

    fabpot authored
    This reverts commit 00e7a94a8c761a3e10c388e4d06cb3ce4cd04ad7, reversing
    changes made to a01dec00f4e8de357cce5fdf121ac98729f7f8ff.
  2. @Seldaek

    Update branch aliases

    Seldaek authored
Commits on Apr 26, 2012
  1. @fabpot

    [Yaml] added CHANGELOG

    fabpot authored
Commits on Apr 25, 2012
  1. @fabpot

    merged 2.0

    fabpot authored
Commits on Apr 20, 2012
  1. @fabpot

    merged 2.0

    fabpot authored
Commits on Apr 5, 2012
  1. @lanthaler @fabpot

    [Yaml] fixed phpdoc (closes symfony/Yaml#3)

    lanthaler authored fabpot committed
Commits on Mar 30, 2012
  1. @vicb
Commits on Mar 29, 2012
  1. @fabpot

    moved component and bridge unit tests to the src/ directory

    fabpot authored
    This is the first step to make each Symfony Component and Bridge self-contained.
Commits on Feb 27, 2012
  1. @Seldaek

    Removed version field

    Seldaek authored
Commits on Feb 25, 2012
  1. @Seldaek

    Add branch-alias for composer

    Seldaek authored
Commits on Feb 22, 2012
  1. @fabpot

    merged 2.0

    fabpot authored
  2. Updated LICENSE files copyright

    marc.weistroff authored
Commits on Jan 16, 2012
  1. @fabpot

    merged 2.0

    fabpot authored
Something went wrong with that request. Please try again.