Permalink
Commits on Mar 18, 2012
  1. updated VERSION for 2.0.12

    fabpot committed Mar 18, 2012
  2. update CONTRIBUTORS for 2.0.12

    fabpot committed Mar 18, 2012
  3. updated CHANGELOG for 2.0.12

    fabpot committed Mar 18, 2012
  4. updated vendors for 2.0.12

    fabpot committed Mar 18, 2012
Commits on Mar 17, 2012
  1. merged branch nodrew/2.0 (PR #3625)

    Commits
    -------
    
    8642473 Changed instances of \DateTimeZone::UTC to 'UTC' as the constant is not valid a produces this error when DateTimeZone is instantiated: DateTimeZone::__construct() [<a href='datetimezone.--construct'>datetimezone.--construct</a>]: Unknown or bad timezone (1024)
    
    Discussion
    ----------
    
    [Locale] DateTimeZone called incorrectly by default
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: no (there were two tests that were failing previously, that still fail)
    Fixes the following tickets: none
    Todo: none
    
    While running, a warning throws every single time when the code
    
    ```php
    new \DateTimeZone(\DateTimeZone::UTC);
    ```
    is encountered. It is normally caught as a thrown exception and then corrected here:
    
    ```php
    // src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php:442
            try {
                $this->dateTimeZone = new \DateTimeZone($timeZoneId);
            } catch (\Exception $e) {
                $this->dateTimeZone = new \DateTimeZone('UTC');
            }
    ```
    
    However in my particular infrastructure, for whatever reason in production only, it causes an error to appear on shutdown in the logs. As ultimately the constant can NEVER pass, it should not be attempted with the constant. Instead, the correct 'UTC' should be passed in (as done in the catch statement).
    fabpot committed Mar 17, 2012
  2. merged branch pulzarraider/webprofiler_serch_ipv6_fix (PR #3626)

    Commits
    -------
    
    54b2413 Webprofiler ipv6 search fix
    
    Discussion
    ----------
    
    [WebProfilerBundle] ipv6 search fix
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    fabpot committed Mar 17, 2012
Commits on Mar 16, 2012
  1. Webprofiler ipv6 search fix

    pulzarraider committed Mar 16, 2012
  2. Changed instances of \DateTimeZone::UTC to 'UTC' as the constant is n…

    …ot valid a produces this error when DateTimeZone is instantiated: DateTimeZone::__construct() [<a href='datetimezone.--construct'>datetimezone.--construct</a>]: Unknown or bad timezone (1024)
    Drew Butler committed Mar 16, 2012
Commits on Mar 15, 2012
  1. merged branch arnapou/2.0 (PR #3610)

    Commits
    -------
    
    fbed9ff Update src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
    
    Discussion
    ----------
    
    Branch 2.0 - Correct bad HttpCache behaviour when waiting for unlock.
    
    I read the class Symfony\Component\HttpKernel\HttpCache\HttpCache and I found something which looks like a bug lines 518-520 (in lock method) :
    $wait = 0;
    while (is_file($lock) && $wait < 5000000) {
    usleep($wait += 50000);
    }
    This code can wait at maximum 50000+100000+150000+.... 4950000 µs = more than 250 seconds !
    
    I corrected like that :
    $wait = 0;
    while (is_file($lock) && $wait < 5000000) {
    usleep(50000);
    $wait += 50000
    }
    
    This code will wait 5 sec maximum.
    
    This is more coherent if we read the following lines of this method.
    
    ---------------------------------------------------------------------------
    
    by arnapou at 2012-03-15T20:09:13Z
    
    Hope I succeded to do a correct PR.
    One hour of manipulation in Github for 2 lines of code let me a bitter taste on the tongue...
    I was closed to tell you "Do It Yourself" ... what a waste of time...
    This interface is not obvious, even if we had already worked on svn/git on *nix.
    fabpot committed Mar 15, 2012
  2. merged branch vicb/twig_cfg/2.0 (PR #3545)

    Commits
    -------
    
    eee5065 [TwigBundle] Workaround a flaw in the design of the configuration (normalization)
    
    Discussion
    ----------
    
    [TwigBundle] Workaround a flaw in the design of the configuration (norma...
    
    ...lization)
    
    see #2823
    
    @Seldaek please comment.
    
    ---------------------------------------------------------------------------
    
    by Seldaek at 2012-03-09T20:52:47Z
    
    It seems fine at first glance. I don't have time to look at it in detail right now sorry.
    fabpot committed Mar 15, 2012
  3. merged branch xavierbriand/pr-datetime-type (PR #3604)

    Commits
    -------
    
    1b395f5 Revert "Throw exception when "date_widget" option is not equal to "time_widget""
    
    Discussion
    ----------
    
    Reverts commit 3c2539 to remove exception when DateTypeType has differents date and time widgets
    
    see #1419
    fabpot committed Mar 15, 2012
  4. Revert "Throw exception when "date_widget" option is not equal to "ti…

    …me_widget""
    
    This reverts commit 3c2539f.
    
    Conflicts:
    
    	tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php
    xavierbriand committed Mar 15, 2012
  5. merged branch fixe/patch-3 (PR #3597)

    Commits
    -------
    
    ed218bb Fixed an "Array to string conversion" warning when using PHP 5.4. Also affects Symfony2 master.
    
    Discussion
    ----------
    
    [Config] Fixed an "Array to string conversion" warning when using PHP 5.4
    
    This also affects Symfony2 master
    fabpot committed Mar 15, 2012
Commits on Mar 14, 2012
  1. Fixed an "Array to string conversion" warning when using PHP 5.4. Als…

    …o affects Symfony2 master.
    fixe committed Mar 14, 2012
  2. merged branch alan0101c/datatransformer-tz-fix (PR #3589)

    Commits
    -------
    
    17c3482 fixed timezone bug in DateTimeToTimestampTransformer
    
    Discussion
    ----------
    
    [FIX]fixed timezone bug in DateTimeToTimestampTransformer
    
    After several trials, I found out that the original code
    
    ```php
    $dateTime = new \DateTime(sprintf("@%s %s", $value, $this->outputTimezone));
    ```
    would create a DateTime object with timezone being '0000', even though $this->outputTimezone is set to my local timezone.
    
    so I expanded the code a bit and it's working now.
    
    PHP Test code,
    
    ```PHP
    $d = new DateTime("@1234567890 Asia/Tokyo");
    echo date_format($d, 'Y/m/d H:i:s')."\n";
    echo $d->getTimezone()->getName()."\n";
    
    $d = new DateTime("now Asia/Hong_Kong");
    echo date_format($d, 'Y/m/d H:i:s')."\n";
    echo $d->getTimezone()->getName()."\n";
    ```
    
    The output is as followed:
    2009/02/13 23:31:30
    +00:00
    2012/03/13 03:35:55
    Asia/Hong_Kong
    
    This could be a bug of PHP,
    
    ---------------------------------------------------------------------------
    
    by stealth35 at 2012-03-13T15:54:31Z
    
    👍
    fabpot committed Mar 14, 2012
  3. merged branch Spea/2.0 (PR #3590)

    Commits
    -------
    
    50cb486 Fixed proxy generation in the DoctrineBundle when using Doctrine >= 2.2.0
    
    Discussion
    ----------
    
    [DoctrineBundle] Fixed proxy generation with Doctrine >= 2.2.0
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    
    The issue here was, that the name of the generated Proxy files have changed in Doctrine 2.2.0, thus the autoloader in the DoctrineBundle stoped working.
    
    This PR fixes this issue by applying different string manipulations to the given class name depending on the currently used Doctrine version.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-03-14T07:13:23Z
    
    Can you squash your commits before I merge? Thanks.
    
    ---------------------------------------------------------------------------
    
    by Spea at 2012-03-14T09:33:10Z
    
    Should I open a new PR when squashed the commits? Because I don't know what happens when I force the remote repository to push my squashed commits.
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2012-03-14T09:48:05Z
    
    First you should rebase (normally), then squash and push with `--force`, then GH will automaticaly update this PR (if you push into same branch on which bases this PR).
    
    ---------------------------------------------------------------------------
    
    by Spea at 2012-03-14T10:04:30Z
    
    Yeah I knew about the ```--force``` option. I just wasn't sure what happens when I do it. Thank you!
    
    ---------------------------------------------------------------------------
    
    by Spea at 2012-03-14T10:14:23Z
    
    Squashed commits.
    fabpot committed Mar 14, 2012
  4. Fixed proxy generation in the DoctrineBundle when using Doctrine >= 2…

    ….2.0
    Martin Parsiegla committed Mar 14, 2012
Commits on Mar 13, 2012
  1. merged branch vicb/validator/race_2.0 (PR #3587)

    Commits
    -------
    
    93cc9ef [Validator] Remove a race condition in the ClassMetaDataFactory (fix #3217)
    
    Discussion
    ----------
    
    [Validator] Remove a race condition (fix #3217)
    
    #3581 for 2.0
    fabpot committed Mar 13, 2012
  2. merged branch stof/doctrine_autoload (PR #3584)

    Commits
    -------
    
    878c239 Fixed autoloader leakage in tests
    
    Discussion
    ----------
    
    Doctrine autoload
    
    The autoloader for proxies is now unregistered on shutdown to avoid
    having several instances registered at the same time in tests.
    fabpot committed Mar 13, 2012
  3. Fixed autoloader leakage in tests

    The autoloader for proxies is now unregistered on shutdown to avoid
    having several instances registered at the same time in tests.
    stof committed Mar 13, 2012
Commits on Mar 12, 2012
  1. merged branch iambrosi/issue2653 (PR #3564)

    Commits
    -------
    
    aa53b88 Sets _format attribute only if it wasn't set previously by the user
    
    Discussion
    ----------
    
    Sets _format attribute only if it wasn't set previously by the user.
    
    Fixes #2653
    fabpot committed Mar 12, 2012
  2. merged branch meandmymonkey/xml-output-fix (PR #3569)

    Commits
    -------
    
    705e460 provided unmerged definition for correct help generation
    45bbb5b added getNativeDefinition() to allow specifying an alternate InputDefinition for help generation
    
    Discussion
    ----------
    
    [Console] Xml output fix
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #2667
    Todo: add specific test
    
    As per my comment [here](#2667 (comment)), added the ability to provide an InputDefinition that will not be changed by merging with the Application InputDefinition..
    fabpot committed Mar 12, 2012
  3. added getNativeDefinition() to allow specifying an alternate InputDef…

    …inition for help generation
    meandmymonkey committed Mar 12, 2012
Commits on Mar 11, 2012
  1. fixed CS

    fabpot committed Mar 11, 2012
  2. merged branch stof/composer_deps (PR #3553)

    Commits
    -------
    
    f26c1ce Fixed constraint requirements for Doctrine Common
    011791d [Form] Moved the Validator component to the suggest section
    
    Discussion
    ----------
    
    Composer deps
    
    There is no hard dependency to the Validator component in the Form, as said on Twitter when @harikt tried to use it. I kept the Locale component as a requirement as it is used by the LanguageTyep, CountryType and LocaleType which will be registered when using the CoreExtension.
    
    The constraints for Doctrine deps are fixed too: adding an upper bound everywhere as we don't know the future to guarantee the compatibility (and for instance, 2.0.9 and lower were not compatible with ORM 2.2 as we had to fix the bundle), and the bridge is compatible with Common 2.2 too, not only with 2.1.
    
    I found 2 other places where the dependencies should be discussed:
    
    - the Validator component marks a hard dependency to Doctrine Common for its annotation reader. There is a dependency only when using annotation so it should not be a hard requirement IMO but a suggestion. the issue is that the [ValidatorFactory](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Validator/ValidatorFactory.php) (not used by the framework itself) will add an annotation loader when relying on the default value of the arguments, which means that people that don't take care will need Common. Would it make sense to change the default so that Common is needed only when the user explicitly asks to use annotations ? Moving Common from require to suggest would make it easier for people using the Validator component standalone if they don't use annotations
    - the Security component suggests the Finder and ClassLoader components. But these ones are only used by the [dev script](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php) used to generate the SQL schema shipped in the component. Does it really make sense to list them as people cloning the component should probably never use this script (which alters the files in the component) ?
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-03-11T08:14:46Z
    
    +1 for removing Doctrine Common as a required dependency for the Validator component.
    
    +1 for removing ClassLoader and Finder from the Security suggestions.
    fabpot committed Mar 11, 2012
  3. [Form] Moved the Validator component to the suggest section

    There is no hard dependency to the Validator component.
    stof committed Mar 11, 2012
Commits on Mar 10, 2012
  1. merged branch stealth35/patch-18 (PR #3542)

    Commits
    -------
    
    7aad478 [Locale] Prevent empty bundle
    
    Discussion
    ----------
    
    [Locale] Prevent empty bundle
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/stealth35/symfony.png?branch=patch-18)](http://travis-ci.org/stealth35/symfony)
    Fixes the following tickets: #3486
    Todo: -
    fabpot committed Mar 10, 2012
  2. merged branch clemherreman/fix-browserkit_client-history (PR #3550)

    Commits
    -------
    
    ad07a95 [BrowserKit] Fixed Client->back/forward/reload() not keeping all request attributes
    
    Discussion
    ----------
    
    [BrowserKit] Client->back/forward/reload() is not keeping all request attributes
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: ![Travis CI icon](https://secure.travis-ci.org/clemherreman/symfony.png?branch=fix-browserkit_client-history)
    Fixes the following tickets: This one
    Todo: -
    
    <hr>
    
    Hello
    
    While using the BrowserKit component with Behat, I noticed that some request attributes, such as files or body, disappeared when using `Symfony\Component\BrowserKit\Client->back/forward/reload()`.
    
    The method used internally in these methods, Client->#requestFromRequest was badly passing the old request parameters to the new request. See the diff.
    fabpot committed Mar 10, 2012