Permalink
Commits on Apr 11, 2012
  1. merged branch aubx/croatian_validator_translation_update (PR #3887)

    Commits
    -------
    
    771ab45 Updated croatian validator translation and deleted validator xliff file
    
    Discussion
    ----------
    
    [FrameworkBundle][translations]Updated croatian validator translation and deleted validator xliff file
    
    Updated croatian validator messages.
    
    Also, "validators.hr.xliff" file was in translations folder so I deleted it (how did it get there? It should be in the 2.0 branch only).
    fabpot committed Apr 11, 2012
  2. merged branch willdurand/fix-form-type-doc (PR #3880)

    Commits
    -------
    
    6f56dfc [Form] Fixed DateType default options
    779d3bb [Form] Fixed documentation, and the DateType (default options)
    
    Discussion
    ----------
    
    [Form] Fixed documentation, and the DateType (default options)
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-04-11T16:48:04Z
    
    That breaks the tests.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-04-11T16:50:35Z
    
    I got an error with the Form test suite before to write this patch..
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-04-11T16:53:30Z
    
    Nevermind, I can see broken tests.. I'm on, sorry
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-04-11T16:57:52Z
    
    @fabpot fixed.
    
    ```
    OK, but incomplete or skipped tests!
    Tests: 945, Assertions: 1439, Incomplete: 11.
    ```
    fabpot committed Apr 11, 2012
  3. merged branch richardmiller/fixing_typos_in_changelog (PR #3885)

    Commits
    -------
    
    3686799 A few changes from proofreading CHANGELOG-2.1md
    
    Discussion
    ----------
    
    A few changes from proofreading CHANGELOG-2.1md
    fabpot committed Apr 11, 2012
  4. merged branch richardmiller/bc_break_changes_in_upgrade (PR #3883)

    Commits
    -------
    
    7276a04 Added some more bc breaks to UPGRADE-2.1.md from the changelog
    
    Discussion
    ----------
    
    Added some more bc breaks to UPGRADE-2.1.md from the changelog
    fabpot committed Apr 11, 2012
  5. merged branch Tobion/named-variables (PR #3884)

    Commits
    -------
    
    f666836 [Routing] simplified regex with named variables
    
    Discussion
    ----------
    
    [Routing] simplified regex with named variables
    
    Test pass: yes
    BC break: no
    
    Since PHP 5.2.2 subpatterns in regex can be simplified from `?P<name>` to `?<name>` (see http://www.php.net/manual/en/regexp.reference.subpatterns.php).
    This enhances readability.
    fabpot committed Apr 11, 2012
  6. merged branch bschussek/issue3354 (PR #3789)

    Commits
    -------
    
    8329087 [Form] Moved calculation of ChoiceType options to closures
    5adec19 [Form] Fixed typos
    cb87ccb [Form] Failing test for empty_data option BC break
    b733045 [Form] Fixed option support in Form component
    
    Discussion
    ----------
    
    [Form] Fixed option support in Form component
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: yes
    Symfony2 tests pass: yes
    Fixes the following tickets: #3354, #3512, #3685, #3694
    Todo: -
    
    ![Travis Build Status](https://secure.travis-ci.org/bschussek/symfony.png?branch=issue3354)
    
    This PR also introduces a new helper `DefaultOptions` for solving option graphs. It accepts default options to be defined on various layers of your class hierarchy. These options can then be merged with the options passed by the user. This is called *resolving*.
    
    The important feature of this utility is that it lets you define *lazy options*. Lazy options are specified using closures that are evaluated when resolving and thus have access to the resolved values of other (potentially lazy) options. The class detects cyclic option dependencies and fails with an exception in this case.
    
    For more information, check the inline documentation of the `DefaultOptions` class and the UPGRADE file.
    
    @fabpot: Might this be worth a separate component? (in total the utility consists of five classes with two associated tests)
    
    ---------------------------------------------------------------------------
    
    by beberlei at 2012-04-05T08:54:10Z
    
    "The important feature of this utility is that it lets you define lazy options. Lazy options are specified using closures"
    
    What about options that are closures? are those differentiated?
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-05T08:57:35Z
    
    @beberlei Yes. Closures for lazy options receive a Symfony\Component\Form\Options instance as first argument. All other closures are interpreted as normal values.
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-04-05T11:09:49Z
    
    I'm wondering if these classes should go in the Config component. My issue with it is that it would add a required dependency to the Config component and that the Config component mixes many different things in it already (the loader part, the resource part, the definition part...)
    
    ---------------------------------------------------------------------------
    
    by sstok at 2012-04-06T13:36:36Z
    
    Sharing the Options class would be great, and its more then one class so why not give it its own Component folder?
    Filesystem is just one class, and that has its own folder.
    
    Great job on the class bschussek 👏
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-10T12:32:34Z
    
    @fabpot Any input?
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-04-10T13:54:13Z
    
    @fabpot Apart from the decision about the final location of DefaultOptions et al., could you merge this soon? This would make my work a bit easier since this one is a blocker.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-04-10T18:08:18Z
    
    @bschussek: Can you rebase on master? I will merge afterwards. Thanks.
    fabpot committed Apr 11, 2012
  7. [Form] Fixed typos

    webmozart committed Apr 5, 2012
  8. [Form] Failing test for empty_data option BC break

    This demonstrates the issue described in symfony/symfony#3354. FieldType no longer has access to the child type's data_class option, which makes it unable to create the default closure for empty_data.
    jmikola committed with webmozart Mar 23, 2012
  9. merged branch richardmiller/bc_break_changes_in_upgrade (PR #3877)

    Commits
    -------
    
    f23b4fa Added some bc breaks from the changelog into UPGRADE-2.1.md
    
    Discussion
    ----------
    
    Added some bc breaks from the changelog into UPGRADE-2.1.md
    fabpot committed Apr 11, 2012
  10. merged branch hason/validator (PR #552)

    Commits
    -------
    
    f9a486e [Validator] Added support for pluralization of the SizeLengthValidator
    c0715f1 [FrameworkBundle], [TwigBundle] added support for form error message pluralization
    7a6376e [Form] added support for error message pluralization
    345981f [Validator] added support for plural messages
    
    Discussion
    ----------
    
    [Validator] Added support for plural error messages
    
    Bug fix: no
    Feature addition: yes
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Todo: create translations for en and update others (FrameworkBundle)
    
    [![Build Status](https://secure.travis-ci.org/hason/symfony.png?branch=validator)](http://travis-ci.org/hason/symfony)
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011-05-14T20:41:01Z
    
    @bschussek: What's your opinion?
    
    ---------------------------------------------------------------------------
    
    by stof at 2011-09-04T13:14:29Z
    
    @hason could you rebase your branch on top of master and update the PR ?
    
    You also need to change the messages in the constraint that uses the pluralization to a pluralized format.
    
    ---------------------------------------------------------------------------
    
    by stof at 2011-10-16T18:06:22Z
    
    @hason ping
    
    ---------------------------------------------------------------------------
    
    by stof at 2011-11-11T14:58:19Z
    
    @hason ping again
    
    ---------------------------------------------------------------------------
    
    by stof at 2011-12-12T20:39:10Z
    
    @hason ping again. Can you update your PR ?
    
    ---------------------------------------------------------------------------
    
    by hason at 2011-12-12T21:29:14Z
    
    @stof I hope that I will update PR this week.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-01-15T19:07:32Z
    
    Looks good to me.
    
    ---------------------------------------------------------------------------
    
    by canni at 2012-02-02T17:28:54Z
    
    @hason can you update this PR and squash commits, it conflicts with current master
    
    ---------------------------------------------------------------------------
    
    by hason at 2012-02-09T07:21:41Z
    
    @stof, @canni Rebased.
    
    What is the best solution for the translation of messages?
    
    1. Change messages in the classes and all xliff files?
    2. Keep messages in the classes and change all xliff files?
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-02-09T08:19:41Z
    
    The constraints contain the en message so you will need to modify them to update the message
    
    ---------------------------------------------------------------------------
    
    by hason at 2012-02-09T08:55:55Z
    
    I prefer second option. The Validator component should be decoupled from the Translation component. The constraints contain the en message which is also the key for Translation component. We should create validators.en.xlf in the FrameworkBundle for en message. I think that this is better solution. What do you think?
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-04-04T02:22:02Z
    
    @hason Please rebase your branch. It conflicts with master because of the move of the tests
    
    @fabpot ping
    fabpot committed Apr 11, 2012
  11. merged branch jakzal/FilesystemMirrorCleanup (PR #3844)

    Commits
    -------
    
    efad5d5 [Filesystem] Prevented infiite loop on windows while calling mirror on symlink. Added test for mirroring symlinks.
    
    Discussion
    ----------
    
    [Filesystem] Prevented infinite loop on windows while mirrorring symlinks
    
    First check for filetype in *mirror()* method is:
    
        if (is_link($file)) {
            $this->symlink($file, $target);
    
    later we see:
    
        } elseif (is_file($file) || ($copyOnWindows && is_link($file))) {
            $this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
    
    The later check for links on windows (*$copyOnWindows && is_link($file)*) won't ever get called. Calling *symlink()* in *mirror()* on windows would lead to calling *mirror()* again.
    
    Note that I didn't actually try running it on windows platform. I added a test for mirroring symlinks (non-windows test). I think it'd be good if someone added some windows specific tests to this class.
    
    I also modified the target path:
    
        $target = $targetDir.'/'.str_replace($originDir.DIRECTORY_SEPARATOR, '', $file->getPathname());
    
    It didn't use DIRECTORY_SEPARATOR and is equivalent to:
    
        $target = str_replace($originDir, $targetDir, $file->getPathname());
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: ~
    Todo: ~
    fabpot committed Apr 11, 2012
  12. merged branch vicb/routing_improvements (PR #3876)

    Commits
    -------
    
    9307f5b [Routing] Implement bug fixes and enhancements
    
    Discussion
    ----------
    
    [Routing] Implement bug fixes and enhancements (from @Tobion)
    
    This is mainly #3754 with some minor formatting changes.
    
    Original PR message from @Tobion:
    
    Here a list of what is fixed. Tests pass.
    
    1. The `RouteCollection` states
    
        > it overrides existing routes with the same name defined in the instance or its children and parents.
    
        But this is not true for `->addCollection()` but only for `->add()`. addCollection does not remove routes with the same name in its parents (only in its children). I don't think this is on purpose.
        So I fixed it by making sure there can only be one route per name in all connected collections. This way we can also simplify `->get()` and `->remove()` and improve performance since we can stop iterating recursively when we found the first and only route with a given name.
        See `testUniqueRouteWithGivenName` that fails in the old code but works now.
    
    2. There was an bug with `$collection->addPrefix('0');` that didn't apply the starting slash. Fixed and test case added.
    
    3. There is an issue with `->get()` that I also think is not intended. Currently it allows to access a sub-RouteCollection by specifing $name as array integer index. But according to the PHPdoc you should only be allowed to receive a Route instance and not a RouteCollection.
        See `testGet` that has a failing test case. I fixed this behavior.
    
    4. Then I recognized that `->addCollection` depended on the order of applying them. So
    
            $collection1->addCollection($collection2, '/b');
            $collection2->addCollection($collection3, '/c');
            $rootCollection->addCollection($collection1, '/a');
    
        had a different pattern result from
    
            $collection2->addCollection($collection3, '/c');
            $collection1->addCollection($collection2, '/b');
            $rootCollection->addCollection($collection1, '/a');
    
        Fixed and test case added. See `testPatternDoesNotChangeWhenDefinitionOrderChanges`.
    
    5. PHP could have ended in an infinite loop when one tried to add an existing RouteCollection to the tree. Fixed by throwing an exception when this situation is detected. See tests `testCannotSelfJoinCollection` and `testCannotAddExistingCollectionToTree`.
    
    6. I made `setParent()` private because its not useful outside the class itself. And `remove()` also removes the route from its parents. Added public `getRoot()` method.
    
    7. The `Route` class throwed a PHP warning when trying to set an empty requirement.
    
    8. Fixed issue #3777. See discussion there for more info. I fixed it by removing the over-optimization that was introduced in 91f4097 but didn't work properly. One cannot reorder the route definitions, as is was done, because then the wrong route might me matched before the correct one. If one really wanted to do that, it would require to calculate the intersection of two regular expressions to determine if they can be grouped together (a tool that would also be useful to check whether a route is unreachable, see discussion in #3678) We can only safely optimize routes with a static prefix within a RouteCollection, not across multiple RouteCollections with different parents.  This is especially true when using variables and regular expressions requirements.
    I could however apply an optimization that was missing yet: Collections with a single route were missing the static prefix optimization with `0 === strpos()`.
    
    9. Fixed an issue where the `PhpMatcherDumper` would not apply the optimization if the root collection to be dumped has a prefix itself. For this I had to rewrite `compileRoutes`. It is also much easier to understand now. Addionally I added many comments and PHPdoc because complex recursive methods like this are still hard to grasp.
    I added a test case for this (`url_matcher3.php`).
    
    10. Fix that `Route::compile` needs to recompile a route once it is modified. Otherwise we have a wrong result. Test case added.
    fabpot committed Apr 11, 2012
  13. merged branch kmohrf/ticket_2827_validator_mail_A_RR_DNS_hostcheck (PR

    …#3799)
    
    Commits
    -------
    
    f617e02 [Validator] added less-strict email host verification
    
    Discussion
    ----------
    
    [Validator] added less-strict email host verification
    
    uhhhhh, my first pull request :>. uhm... tell me if i did something wrong :)
    
    #### Request info
    Bug fix: no
    Feature addition: yes
    Backwards compatibility break: no
    Symfony2 tests pass: yes... well,not really (i guess master branch is not passing - at least i didnt broke the email test)
    Fixes the following tickets: #2827
    
    #### Description
    New checkHost attribute in email constraint will make the validator check for only one of MX, A or AAAA DNS resource records to verify it as a valid email address.
    fabpot committed Apr 11, 2012
  14. merged branch richardmiller/validation_path_upgrade (PR #3874)

    Commits
    -------
    
    6433ca0 Removed duplicated content
    60d9aff Added info on changes to setting validation subpath to UPGRADE-2.1.md
    
    Discussion
    ----------
    
    Added info on changes to setting validation subpath to UPGRADE-2.1.md
    
    As per GH-3424
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-04-11T11:05:00Z
    
    you duplicated it
    
    ---------------------------------------------------------------------------
    
    by richardmiller at 2012-04-11T11:07:17Z
    
    I've closed the other one - there was a mess with the commits and an unnecessary merge.
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-04-11T11:30:00Z
    
    @richardmiller I'm talking about the content
    
    ---------------------------------------------------------------------------
    
    by richardmiller at 2012-04-11T11:35:40Z
    
    @stof, ah sorry misunderstood, one of those days it seems :)
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-04-11T11:42:21Z
    
    I should have commented inline to make it more clear
    fabpot committed Apr 11, 2012
  15. Removed duplicated content

    richardmiller committed Apr 11, 2012
  16. merged branch tvlooy/GetSetMethodNormalizer (PR #3582)

    Commits
    -------
    
    039ff6f allow more control on GetSetMethodNormalizer by using callback functions and an ignoreAttributes list
    
    Discussion
    ----------
    
    allow more control on GetSetMethodNormalizer
    
    Here is an other attempt. You would use this as follows:
    
        $serializer = new \Symfony\Component\Serializer\Serializer(
            array(new \Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer()),
            array('json' => new \Symfony\Component\Serializer\Encoder\JsonEncoder())
        );
    
        $callbacks = array('books' => function ($books) { return NULL; });
    
        return new Response(
            $serializer->serialize($paginator->getRows(), 'json', $callbacks),
            200,
            array('Content-Type' => 'application/json')
        );
    
    Besides of returning NULL, you could also do things like:
    
        $callbacks = array(
            'books' => function ($books) {
                $ids = array();
                foreach ($books as $book) {
                    $ids[] = $book->getId();
                }
                return $ids;
            },
            'author' => function ($author) {
                return $author->getId();
            },
            'creationDate' => function ($creationDate) {
                return $creationDate->format('d/m/Y');
            },
        );
    
    The commit is not complete yet. But at this point I am interested in your opinions.
    
    ---------------------------------------------------------------------------
    
    by lsmith77 at 2012-03-12T22:53:18Z
    
    in general i agree that using a callback is a good solution to provide more power without complicating the API or implementation in this case.
    
    please add a test case, this should also help illustrate how this can be used in practice.
    
    ---------------------------------------------------------------------------
    
    by schmittjoh at 2012-03-13T04:54:33Z
    
    Note that your change breaks the API defined by the interface, i.e. someone using this method needs to type-hint the serializer implementation, not the interface.
    
    It also adds a parameter to the public API of the serializer which will only work with one specific normalizer. What if another normalizer needs additional information, should another parameter be added to the serialize method? What about deserialization?
    
    Bottom line is, the serializer component was simply not designed for this kind of thing. I've tried to make it more flexible before creating the bundle, but some things simply cannot be fixed in a sane way.
    
    ---------------------------------------------------------------------------
    
    by tvlooy at 2012-03-13T06:07:45Z
    
    Would just adding a setCallbacks() to the GetSetMethodNormalizer be a better solution? That doesn't touch the API. I will try to write some tests this evening.
    
    ---------------------------------------------------------------------------
    
    by schmittjoh at 2012-03-13T16:22:50Z
    
    That would definitely be better.
    
    You would then need to retrieve the normalizer instance before calling ``serialize`` on the serializer which also leaves a stale taste, but I have no other solution for now.
    
    ---------------------------------------------------------------------------
    
    by tvlooy at 2012-03-13T21:32:26Z
    
    So, this should be it then. Yet an other usage example:
    
        $normalizer = new \Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer();
        $normalizer->setCallbacks(
            array(
                'books' => function ($books) {
                    $ids = array();
                    foreach ($books as $book) {
                        $ids[] = $book->getId();
                    }
                    return $ids;
                },
            )
        );
        $serializer = new \Symfony\Component\Serializer\Serializer(
            array($normalizer),
            array('json' => new \Symfony\Component\Serializer\Encoder\JsonEncoder())
        );
    
        return new Response(
            $serializer->serialize($paginator->getRows(), 'json'),
            200,
            array('Content-Type' => 'application/json')
        );
    
    ---------------------------------------------------------------------------
    
    by tvlooy at 2012-03-18T21:16:48Z
    
    Anything else needed for this to get pulled in?
    
    ---------------------------------------------------------------------------
    
    by tvlooy at 2012-03-19T18:33:58Z
    
    Hm, I like to keep it that way because I like the fact that not passing a callable will result in a warning instead of silently skipping it. You don't get that behaviour by treating it as null.
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-03-19T23:15:37Z
    
    I was unclear: the code should throw an exception when an element is not callable, this is why `null` will not be supported any more (it is not a callback as the `setCallbacks` indicate).
    
    They are several way to support the former behavior:
    
    * the cb can return a defined interface,
    * the cb can throw a defines exc,
    * by adding a `setIgnoredAttributes` method
    
    Please also squash your commits.
    
    ---------------------------------------------------------------------------
    
    by tvlooy at 2012-03-20T21:02:06Z
    
    Yes, I like the setIgnoredAttributes solution. I changed it and squashed the commits.
    
    ---------------------------------------------------------------------------
    
    by tvlooy at 2012-03-26T20:07:36Z
    
    some improvements and squashed the commits
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-04-03T22:36:15Z
    
    @tvlooy Please rebase your branch. It conflicts with master because of the move of tests.
    
    ---------------------------------------------------------------------------
    
    by tvlooy at 2012-04-04T07:43:47Z
    
    @stof I will do it on saturday, if that is ok with you.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-04-10T18:29:30Z
    
    Is it mergeable now? ping @Seldaek, @schmittjoh.
    
    ---------------------------------------------------------------------------
    
    by tvlooy at 2012-04-10T18:55:04Z
    
    yes, it should be
    fabpot committed Apr 11, 2012
  17. updated CHANGELOG

    fabpot committed Apr 11, 2012
  18. merged branch kimhemsoe/xcache_classloader (PR #3809)

    Commits
    -------
    
    c36651b Fixed spelling error
    f123684 Removed leftover from c/p
    b74a5d4 Updated to new cache loader pattern.
    7e66908 Added XCache class loader
    
    Discussion
    ----------
    
    [ClassLoader] Added XCache class loader
    
    Bug fix: no
    Feature addition: yes
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    
    There is no tests, as it seems there is no way to use xcache storage functions from CLI.
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-04-06T20:12:09Z
    
    Please implement a XcacheClassLoader following the same pattern than the new ApcClassLoader instead
    
    ---------------------------------------------------------------------------
    
    by cordoval at 2012-04-07T14:20:47Z
    
    - should include tests
    - should include documentation (will you also update the component documentation for this new class?)
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-04-07T14:25:00Z
    
    @cordoval the PR explains why there is no tests: xcache canot be used in the CLI.
    
    ---------------------------------------------------------------------------
    
    by cordoval at 2012-04-07T14:26:43Z
    
    ok @stof sorry it said it seemed not to be possible, i thought it was possible but I am wrong.
    
    ---------------------------------------------------------------------------
    
    by kimhemsoe at 2012-04-07T15:01:24Z
    
    @cordoval My english is really horrible. I would not mind if someone else could do that task for me. We also need to add doc for the new ApcClassLoader.
    
    ---------------------------------------------------------------------------
    
    by cordoval at 2012-04-07T15:03:57Z
    
    I wish you can explain me more then about this class and how to use it in code so then I can write easily the documentation :D deal?
    
    ---------------------------------------------------------------------------
    
    by kimhemsoe at 2012-04-07T15:21:25Z
    
    Deal :P
    
    The XcacheClassLoader and ApcClassLoader replaces the old ApcUniversalClassLoader.
    They giving us support for using another loader then UniversalClassLoader, without duplicating the cache layer.
    Aslong it have a public function findFile($class) method.
    
     $loader = new ClassLoader();
    
    // register classes with namespaces
    $loader->add('Symfony\Component', __DIR__.'/component');
    $loader->add('Symfony', __DIR__.'/framework');
    
    $cachedLoader = new XcacheClassLoader('my_prefix', $loader);
    
    // activate the cached autoloader
    $cachedLoader->register();
    
    Think that is more or less the essence of this.
    
    ---------------------------------------------------------------------------
    
    by cordoval at 2012-04-09T08:28:53Z
    
    it is not add but registerNamespace right?
    
    so the main idea is to get rid of the restriction to use Apc with Universal loader
    
    what is the comparative advantage between APC and Xcache?
    
    ---------------------------------------------------------------------------
    
    by kimhemsoe at 2012-04-09T08:55:23Z
    
    Yes if the $loader (class finder) were to be a instance UniversalClassLoader.
    
    Yes the main idea is to be able to reuse the cache layer with any class loader there obey to the one restriction.
    
    Difference between apc and xcache and why to use what is coming down to taste and your setup. We use xcache as APC have some issues in fastcgi setups. when we upgrade to php54 at somepoint we get to chance to move to php-fpm wich solves these issues. Short story: Slightly out of scope for any documentation in here :-P
    fabpot committed Apr 11, 2012
  19. merged branch bschussek/issue3635 (PR #3820)

    Commits
    -------
    
    65aa387 [Form] Fixed index generation in EntityChoiceList if ID is not an integer
    
    Discussion
    ----------
    
    [Form] Fixed index generation in EntityChoiceList if ID is not an integer
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #3635
    Todo: -
    
    ![Travis Build Status](https://secure.travis-ci.org/bschussek/symfony.png?branch=issue3635)
    fabpot committed Apr 11, 2012
  20. merged branch Tobion/patch-1 (PR #3870)

    Commits
    -------
    
    810b2e1 fix formatting of changelog-2.1.md
    
    Discussion
    ----------
    
    fix formatting of changelog-2.1.md
    
    Fix indention for correct display. Also a few language fixes.
    fabpot committed Apr 11, 2012
  21. merged branch hhamon/command_description_fixes (PR #3871)

    Commits
    -------
    
    b4f0a04 [TwigBundle] fixed twig:lint command description.
    809933f [FrameworkBundle] fixed translation:update command description.
    
    Discussion
    ----------
    
    Command description fixes
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    fabpot committed Apr 11, 2012
  22. merged 2.0

    fabpot committed Apr 11, 2012
  23. [Console] fixed typo

    fabpot committed Apr 11, 2012