Permalink
Commits on Jan 6, 2012
  1. updated VERSION for 2.0.9

    fabpot committed Jan 6, 2012
  2. update CONTRIBUTORS for 2.0.9

    fabpot committed Jan 6, 2012
  3. updated CHANGELOG for 2.0.9

    fabpot committed Jan 6, 2012
  4. merged branch Tobion/patch-4 (PR #3042)

    Commits
    -------
    
    daee68a fixed typos and unified PHPDoc in the Response class
    
    Discussion
    ----------
    
    fix typos in Response
    fabpot committed Jan 6, 2012
Commits on Jan 5, 2012
  1. merged branch justinrainbow/2_0_framework_bundle_fix (PR #3039)

    Commits
    -------
    
    7c8bd3d [FrameworkBundle] Invalid composer ref fix
    
    Discussion
    ----------
    
    [FrameworkBundle] Invalid composer ref fix
    
    Changes the `composer.json` reference in the FrameworkBundle to use the `symfony/translation` package rather than the current `symfony/translator` (which doesn't exist).
    fabpot committed Jan 5, 2012
  2. [FrameworkBundle] Invalid composer ref fix

    The composer.json was referencing a "symfony/translator" package
    which does not exist.  This has been updated to use the
    "symfony/translation" package.
    justinrainbow committed Jan 5, 2012
  3. merged branch tystr/sanitize_queries_fix (PR #3032)

    Commits
    -------
    
    261325d Cast $query['params'] to array to ensure it is a valid argument for the foreach.
    
    Discussion
    ----------
    
    [DoctrineBridge] Account for $query['params'] being null in DoctrineDataCollector's sanitizeQueries method
    
    I was getting this error because inside the sanitizeQueries method of DoctrineDataCollector, there's no handling for $query['params'] being null.
    
    ErrorException: Warning: Invalid argument supplied for foreach() in .../vendor/symfony/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php line 91
    fabpot committed Jan 5, 2012
  4. merged branch franmomu/2.0 (PR #3038)

    Commits
    -------
    
    d0c54e1 [FrameworkBundle][translations] Updated Catalan translation
    
    Discussion
    ----------
    
    [FrameworkBundle][translations] Updated Catalan translation
    
    Updated Catalan translation
    fabpot committed Jan 5, 2012
Commits on Jan 4, 2012
  1. Cast $query['params'] to array to ensure it is a valid argument for t…

    …he foreach.
    
    This prevents errors if $query['params'] is null
    tystr committed Jan 4, 2012
  2. updated vendors

    fabpot committed Jan 4, 2012
Commits on Jan 2, 2012
  1. merged branch maastermedia/patch-1 (PR #3010)

    Commits
    -------
    
    fae7157 slovenian validators translations correction
    
    Discussion
    ----------
    
    slovenian validators translations correction
    fabpot committed Jan 2, 2012
Commits on Jan 1, 2012
  1. slovenian validators translations correction

    Peter Kokot committed Jan 1, 2012
Commits on Dec 30, 2011
  1. merged branch stloyd/skip_test (PR #3004)

    Commits
    -------
    
    4c44023 [Tests] Skip segfaulting form test
    
    Discussion
    ----------
    
    [Tests] Skip segfaulting form test when using PHP <= 5.3.2
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #2958
    
    http://travis-ci.org/#!/stloyd/symfony/jobs/461563
    fabpot committed Dec 30, 2011
  2. merged branch lsmith77/travis_test_5_3_2 (PR #2958)

    Commits
    -------
    
    dfbed9f also test PHP 5.3.2, since this is the official lowest supported PHP version
    
    Discussion
    ----------
    
    [WIP] test with PHP 5.3.2 on travis
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: ![Build Status](https://secure.travis-ci.org/lsmith77/symfony.png?branch=travis_test_5_3_2)
    Fixes the following tickets: -
    
    ---------------------------------------------------------------------------
    
    by lsmith77 at 2011/12/25 16:29:20 -0800
    
    Enable testing against PHP 5.3.2, not sure why its segfaulting PHPUnit. Will check with @loicfrering whats going on there.
    
    ---------------------------------------------------------------------------
    
    by lsmith77 at 2011/12/25 17:31:04 -0800
    
    the issue may be inside the ClassLoader .. so we might need to increase the minimal version. but this needs to be confirmed independently.
    fabpot committed Dec 30, 2011
  3. merged branch hhamon/browser_kit_phpdoc (PR #2991)

    Commits
    -------
    
    885fa02 [BrowserKit] added missing @return PHPDoc for the Client::submit() method.
    
    Discussion
    ----------
    
    [BrowserKit] added missing @return PHPDoc for the Client::submit() method
    fabpot committed Dec 30, 2011
  4. merged branch odolbeau/2.0 (PR #2993)

    Commits
    -------
    
    0d3e709 Rename test file
    
    Discussion
    ----------
    
    Just rename MessageCatalogTest in MessageCatalogueTest
    
    This time, in the correct branch...
    
    (see: #2987)
    fabpot committed Dec 30, 2011
Commits on Dec 29, 2011
  1. Rename test file

    Olivier Dolbeau committed Dec 29, 2011
  2. [BrowserKit] added missing @return PHPDoc for the Client::submit() me…

    …thod.
    Hugo Hamon committed Dec 29, 2011
  3. merged branch Burgov/reverse_transform_test_fix_2_0 (PR #2984)

    Commits
    -------
    
    ced57d8 reverse transform doesn't take a second argument
    
    Discussion
    ----------
    
    reverse transform doesn't take a second argument
    
    as requested in #2980
    
    when cherry-picking the earlier commit I found out that some assertSame calls had been changed into assertNull in 2.1, but not in 2.0. This will probably result in some merge problems later. Let me know if and how I should update my commit if this is the case
    fabpot committed Dec 29, 2011
Commits on Dec 28, 2011
  1. merged branch ericclemmons/2884-parameterbag-with-spaces (PR #2976)

    Commits
    -------
    
    85ca8e3 ParameterBag no longer resolves parameters that have spaces.
    99011ca Added tests for ParameterBag parameters with spaces
    
    Discussion
    ----------
    
    [DependencyInjection] Parameters with spaces are not resolved
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no (not likely, according to convention)
    Symfony2 tests pass: yes
    Fixes the following tickets: #2884
    
    `ParameterBag` currently resolves anything between two `%` signs, which creates issues for any parameters in the DIC that are legitimate text.  This PR enforces the [documented parameter convention](http://symfony.com/doc/2.0/book/service_container.html#service-parameters) so that only `%parameters.with.no_spaces%` are resolved.
    
    I was considering using instead `^%([^\w\._-]+)%$`, but felt that was too constricting & could easily introduce issues with existing applications.
    fabpot committed Dec 28, 2011
  2. merged branch havvg/patch-1 (PR #2957)

    Commits
    -------
    
    41950a6 [WebProfilerBundle] add margin-bottom to caption
    
    Discussion
    ----------
    
    [WebProfilerBundle] add margin-bottom to caption
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/12/26 13:15:57 -0800
    
    What does it fix?
    
    ---------------------------------------------------------------------------
    
    by havvg at 2011/12/27 02:46:16 -0800
    
    Just a minor design issue with table captions.
    
    Without: http://dl.dropbox.com/u/548684/PR2957/without-margin.png
    With: http://dl.dropbox.com/u/548684/PR2957/with-margin.png
    
    I currently hold it in a custom css, but thought it is generic enough to be put into the bundle.
    
    ---------------------------------------------------------------------------
    
    by henrikbjorn at 2011/12/27 04:03:53 -0800
    
    @havvg What custom bundle is that ? and what does it show? look interesting
    
    ---------------------------------------------------------------------------
    
    by havvg at 2011/12/27 04:40:18 -0800
    
    @henrikbjorn It's a bundle (not published yet, https://github.com/havvg/HavvgCloudcontrolBundle) adding features to fully utilize applications on http://cloudcontrol.com PaaS.
    fabpot committed Dec 28, 2011
  3. merged branch aerialls/check_cs_fix (PR #2975)

    Commits
    -------
    
    0797564 [Check CS] don't replace 'else if' on twig files (closes #2961)
    
    Discussion
    ----------
    
    [Check CS] don't replace 'else if' on twig files (closes #2961)
    fabpot committed Dec 28, 2011
  4. merged branch javiereguiluz/phpdoc-console-component (PR #2978)

    Commits
    -------
    
    3f2e1b0 [Console] Updated tests to reflect the change from `program` to `application`
    2b64944 [Console][Output] Fixed some minor typos and grammatical errors
    96997f1 [Console][Input] Added missing PHPDoc and fixed some minor typos and grammatical errors
    855b8af [Console][Helper] Added missing PHPDoc and fixed some minor typos and grammatical errors
    3ad02bd [Console][Formatter] Added missing PHPDoc @throws and fixed some minor typos and grammatical errors
    33e3f11 [Console] Added a missing PHPDoc and replaced `program` by `application`
    
    Discussion
    ----------
    
    [Console] Fixed and completed PHPDoc
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    
    Fixes the following tickets: -
    
    * Fixed minor typos and grammatical errors
    * Added missing PHPDoc for some methods
    * Added missing @throws
    fabpot committed Dec 28, 2011
  5. [Console][Formatter] Added missing PHPDoc @throws and fixed some mino…

    …r typos and grammatical errors
    javiereguiluz committed Dec 28, 2011