Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 16, 2011
  1. @fabpot

    updated VERSION for 2.0.6

    fabpot authored
Commits on Nov 15, 2011
  1. @fabpot

    merged branch tacker/2.0 (PR #2641)

    fabpot authored
    Commits
    -------
    
    8399574 Fixes a small php doc issue of Symfony\Component\Console\Command\Command::setDefinition()
    
    Discussion
    ----------
    
    Fixes a small php doc issue of Symfony\Component\Console\Command\Command::setDefinition()
    
    Have setDefinition() accept InputDefinition instead of Definition.
  2. @fabpot

    merged branch drak/doctrinebundles_tests (PR #2650)

    fabpot authored
    Commits
    -------
    
    f83ef1e [DoctrineBundle] Fix tests - incorrect class names (copy paste error most probably)
    
    Discussion
    ----------
    
    [DoctrineBundle] Fix tests - incorrect class names
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    
    Some classes are incorrectly named resulting in failed tests for DoctrineBundle, looks like a copy paste error.
  3. @fabpot

    merged branch jdreesen/trans-formatting-fix (PR #2648)

    fabpot authored
    Commits
    -------
    
    470f872 [FrameworkBundle] fixed formatting of farsi translation file
    
    Discussion
    ----------
    
    [FrameworkBundle] fixed formatting of farsi translation file
    
    It now matches the other languages translation files.
Commits on Nov 14, 2011
  1. @jdreesen
  2. @jdreesen
  3. @tacker
  4. @fabpot
  5. @fabpot

    [HttpFoundation] added an exception to MimeTypeGuesser::guess() when …

    fabpot authored
    …no guesser are available (closes #2636)
  6. @fabpot
  7. @fabpot
Commits on Nov 13, 2011
  1. @everzet
Commits on Nov 12, 2011
  1. [Transation] Fix grammar.

    Drak authored
    In English, zero is plural so need to use 'are' - "there are no apples".
    English's pluralisation rule is: nplurals=2; plural=n != 1;
  2. @fabpot

    merged branch dpb587/patch-trace (PR #2593)

    fabpot authored
    Commits
    -------
    
    4858fbe [TwigBundle] Fix trace to not show 'in at line' when file/line are empty.
    
    Discussion
    ----------
    
    [TwigBundle] Fix trace to not show 'in at line' when file/line are empty.
    
    Occasionally I saw call stacks where file/line are empty in the raw exception object, but the trace.html.twig file was still showing 'in at line' with empty values. I believe this fixes that.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/11/09 22:49:35 -0800
    
    The current code looks correct to me. Can you try with the latest version of Twig to be sure that you don't have this issue because of a bug in Twig that has been fixed since then?
    
    ---------------------------------------------------------------------------
    
    by dpb587 at 2011/11/10 07:20:34 -0800
    
    Thanks for the feedback. Should I change my patch to check that both are defined and non-empty, such as `trace.file is defined and trace.file and trace.line is defined and trace.line`?
    
    I think the issue is that I'm seeing the file and line keys are defined but empty. I created another branch with a pseudo-test case that shows a little more information. Using symfony-standard with symfony in deps as follows and symfony/twig removed from deps.lock.
    
        [symfony]
            git=git://github.com/dpb587/symfony.git
            version=origin/patch-trace-debug
    
    Then running the following:
    
        phpunit -c app/ vendor/symfony/tests/Symfony/Tests/Bundle/TwigBundle/Controller/ExceptionController.php
    
    The test (is backwards) and passes, dumping the following (this call happens right after a call_user_func):
    
        Array
        (
            [namespace] => Symfony\Bundle\FrameworkBundle\EventListener
            [short_class] => RouterListener
            [class] => Symfony\Bundle\FrameworkBundle\EventListener\RouterListener
            [type] => ->
            [function] => onKernelRequest
            [file] =>
            [line] =>
            [args] => Array
                (
                    [0] => Array
                        (
                            [0] => object
                            [1] => Symfony\Component\HttpKernel\Event\GetResponseEvent
                        )
    
                )
    
        )
    
    I saw the same results with two php versions:
    
        PHP 5.3.3-7+squeeze3 with Suhosin-Patch (cli) (built: Jun 28 2011 08:24:40)
        Copyright (c) 1997-2009 The PHP Group
        Zend Engine v2.3.0, Copyright (c) 1998-2010 Zend Technologies
            with Xdebug v2.1.1, Copyright (c) 2002-2011, by Derick Rethans
            with Suhosin v0.9.32.1, Copyright (c) 2007-2010, by SektionEins GmbH
    
        PHP 5.3.8 (cli) (built: Nov  4 2011 05:43:22)
        Copyright (c) 1997-2011 The PHP Group
        Zend Engine v2.3.0, Copyright (c) 1998-2011 Zend Technologies
            with the ionCube PHP Loader v4.0.10, Copyright (c) 2002-2011, by ionCube Ltd., and
            with Zend Guard Loader v3.3, Copyright (c) 1998-2010, by Zend Technologies
    
    Sorry if I'm simply missing something or doing something silly.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/11/11 13:12:21 -0800
    
    `trace.file is defined and trace.file and trace.line is defined and trace.line` looks good to me.
  3. @fabpot
  4. @dpb587
Commits on Nov 11, 2011
  1. @ManuelAC
  2. @ManuelAC

    [Form] Replace `an` with `is`

    ManuelAC authored
  3. @fabpot
  4. @fabpot
  5. @fabpot

    merged branch igorw/phpunit-ob-level (PR #2617)

    fabpot authored
    Commits
    -------
    
    29e12af [TwigBundle] Extract output buffer cleaning to method
    ed1a6c2 [TwigBundle] Do not clean output buffering below initial level
    
    Discussion
    ----------
    
    [TwigBundle] Do not clean output buffering below initial level
    
    This resulted in issues with PHPUnit 3.6, which will buffer all output and clean them in the end. Since
    we cleaned their buffer, the subsequent clean would raise a warning. This is documented in [issue 390](sebastianbergmann/phpunit#390) of
    the PHPUnit tracker.
    
    Closes #2531.
    
    This also affects FOSRestBundle's ExceptionController /cc @lsmith.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/11/11 07:33:24 -0800
    
    I have a similar fix locally but I have not merged it yet as it looks a bit dirty (but I've not a better idea yet). Anyway, your PR is better than mine as you've added some unit tests already.
  6. @fabpot

    merged branch jalliot/file_widget (PR #2608)

    fabpot authored
    Commits
    -------
    
    e83e00a Fixed rendering of FileType (value is not a valid attribute for input[type=file])
    
    Discussion
    ----------
    
    Fixed rendering of FileType
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    
    According to the W3C validator, `value` is not a valid attribute for `input[type=file]`.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/11/10 23:01:24 -0800
    
    Instead of creating yet another block, what about modifying the `field_widget` to not render the `value` attribute if the value is empty? Also, the PHP template must be fixed too.
    
    ---------------------------------------------------------------------------
    
    by jalliot at 2011/11/11 02:02:52 -0800
    
    @fabpot Changed ;)
  7. @fabpot

    [Form] fixed previous merge

    fabpot authored
  8. @fabpot
  9. @fabpot

    merged branch ondrowan/2.0 (PR #2614)

    fabpot authored
    Commits
    -------
    
    2582fcb Added tests for string fix in DateTimeToArrayTransformer (8351a11).
    8351a11 Added check for array fields to be integers in reverseTransform method. This prevents checkdate from getting strings as arguments and throwing incorrect ErrorException when submitting form with malformed (string) data in, for example, Date field. #2609
    
    Discussion
    ----------
    
    Fix for #2609
    
    Second take for fix for #2609, hope it's ok now. Tests are failing without my fix and passing with it.
  10. @schniper
  11. @igorw
  12. @igorw

    [TwigBundle] Do not clean output buffering below initial level

    igorw authored
    This resulted in issues with PHPUnit 3.6, which will buffer all output and clean them in the end. Since
    we cleaned their buffer, the subsequent clean would raise a warning. This is documented in issue 390 of
    the PHPUnit tracker.
    
    Closes #2531.
  13. @jalliot
  14. @ondrowan

    Added check for array fields to be integers in reverseTransform metho…

    ondrowan authored
    …d. This prevents checkdate from getting strings as arguments and throwing incorrect ErrorException when submitting form with malformed (string) data in, for example, Date field. #2609
  15. @fabpot
  16. @fabpot
Commits on Nov 10, 2011
  1. @stealth35
  2. @fabpot

    merged branch snc/issue-1798 (PR #2528)

    fabpot authored
    Commits
    -------
    
    f9befb6 Remove only the security token instead of the session cookie.
    348bccb Clear session cookie if user was deleted, is disabled or locked to prevent infinite redirect loops to the login path (fixes #1798).
    
    Discussion
    ----------
    
    Fix for issue 1798
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    
    Clear session cookie if user was deleted, is disabled or locked to prevent infinite redirect loops to the login path (fixes #1798).
    
    ---------------------------------------------------------------------------
    
    by snc at 2011/11/01 04:01:49 -0700
    
    @stof I have changed the code so that it only removes the token... do we still need any hook support?
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/11/01 04:07:17 -0700
    
    well, the hook is for your own use case but it would be for 2.1 only anyway, not for 2.0
    
    ---------------------------------------------------------------------------
    
    by snc at 2011/11/07 15:11:52 -0800
    
    Now that #2414 is merged to 2.1, this could be simplified for the master branch...
Something went wrong with that request. Please try again.