Permalink
Commits on Jul 27, 2011
  1. @fabpot

    merged branch excelwebzone/hebrew_translations (PR #1834)

    Commits
    -------
    
    8b77d4d  Hebrew translations updated
    
    Discussion
    ----------
    
    Hebrew translations updated
    fabpot committed Jul 27, 2011
  2. @excelwebzone
  3. @fabpot

    merged branch umpirsky/fix-serbian-translation (PR #1833)

    Commits
    -------
    
    56e92e9 Fixed Serbian translation.
    
    Discussion
    ----------
    
    Fixed Serbian translation.
    
    There was one new message untranslated, and one changed which required translation changes.
    fabpot committed Jul 27, 2011
  4. @umpirsky

    Fixed Serbian translation.

    umpirsky committed Jul 27, 2011
  5. @fabpot

    merged branch danielcsgomes/master (PR #1832)

    Commits
    -------
    
    336e4d4 some minor corrections to pt_PT translation
    
    Discussion
    ----------
    
    some minor corrections to pt_PT translation
    fabpot committed Jul 27, 2011
  6. @dcsg
  7. @fabpot

    merged branch doup/euskara_translations (PR #1831)

    Commits
    -------
    
    363fed4 Euskara translations updated
    
    Discussion
    ----------
    
    Euskara translations updated
    fabpot committed Jul 27, 2011
  8. @doup

    Euskara translations updated

    doup committed Jul 27, 2011
  9. @fabpot

    merged branch yethee/ru_translation (PR #1830)

    Commits
    -------
    
    e7c07c4 [FrameworkBundle] Updated the Russian translations.
    
    Discussion
    ----------
    
    [FrameworkBundle] Updated the Russian translations.
    fabpot committed Jul 27, 2011
  10. @fabpot

    merged branch danielcsgomes/master (PR #1829)

    Commits
    -------
    
    00e10f9 updated pt_PT translation
    
    Discussion
    ----------
    
    updates pt_PT translation
    fabpot committed Jul 27, 2011
  11. @yethee
  12. @dcsg

    updated pt_PT translation

    dcsg committed Jul 27, 2011
  13. @fabpot

    merged branch hason/czechvalidators (PR #1828)

    Commits
    -------
    
    1d90b43 [FrameworkBundle] updated czech translation
    
    Discussion
    ----------
    
    [FrameworkBundle] updated czech translation
    fabpot committed Jul 27, 2011
  14. @hason
  15. @fabpot

    merged branch lenar/dialoghelper-eof (PR #1704)

    Commits
    -------
    
    07298ac Detect EOF when reading input stream
    
    Discussion
    ----------
    
    [Console] Detect EOF when reading input stream
    
    This is related to commits 511a9a1 and 3a5d508.
    
    First of them introduced abort-on-EOF and the second regressed the functionality.
    Problem is stream_get_line() doesn't return false on EOF. So it needs call to feof() to
    detect the situation.
    
    Still, it's not ideal. With fgets() it worked fine, but with stream_get_line() one has to press
    CTRL+D twice to get out. I presume this could be bug in PHP itself.
    
    But better than nothing. Please consider.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/19 22:47:53 -0700
    
    I have used `stream_get_line` especially because it does not return `false` on eof. This is needed when you pass your own stream for unit tests.
    
    ---------------------------------------------------------------------------
    
    by lenar at 2011/07/25 06:05:59 -0700
    
    This is not the best solution I think. Tests should mimic and cope with real life not the other way around.
    Better solution would be to fix testcase. Like this: lenar/SensioGeneratorBundle@6ff3f26. Or maybe create a special "testing" stream wrapper that wraps php://memory and gives out just linefeeds after real data ends.
    
    And then change stream_get_line() back to fgets() if there is no other reason for this change.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/25 06:24:20 -0700
    
    When applying your patch to the generator bundle (and revert to use `fgets`), I get "RuntimeException: Aborted" exceptions.
    
    ---------------------------------------------------------------------------
    
    by lenar at 2011/07/25 06:35:08 -0700
    
    With d326f89 added + lenar/SensioGeneratorBundle@6ff3f26 I can successfully run every test in that file.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/26 23:31:36 -0700
    
    @lenar: not for me. I have many 'Aborted' exception on my Mac.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/26 23:41:18 -0700
    
    And I have the exact same errors on Linux:
    
        There were 7 errors:
    
        1) Sensio\Bundle\GeneratorBundle\Tests\Command\GenerateBundleCommandTest::testInteractiveCommand with data set #0 (array('/tmp'), 'Foo/BarBundle
        ', array('Foo\\BarBundle', 'FooBarBundle', '/tmp/', 'annotation', false))
        RuntimeException: Aborted
    
        .../Symfony/Component/Console/Helper/DialogHelper.php:40
        .../Symfony/Component/Console/Helper/DialogHelper.php:97
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Command/GenerateBundleCommand.php:165
        .../Symfony/Component/Console/Command/Command.php:205
        .../Symfony/Component/Console/Tester/CommandTester.php:66
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateBundleCommandTest.php:39
    
        2) Sensio\Bundle\GeneratorBundle\Tests\Command\GenerateBundleCommandTest::testInteractiveCommand with data set #1 (array('/tmp'), 'Foo/BarBundle
        BarBundle
        foo
        yml
        n', array('Foo\\BarBundle', 'BarBundle', 'foo/', 'yml', false))
        RuntimeException: Aborted
    
        .../Symfony/Component/Console/Helper/DialogHelper.php:40
        .../Symfony/Component/Console/Helper/DialogHelper.php:62
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Command/GenerateBundleCommand.php:83
        .../Symfony/Component/Console/Command/Command.php:214
        .../Symfony/Component/Console/Tester/CommandTester.php:66
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateBundleCommandTest.php:39
    
        3) Sensio\Bundle\GeneratorBundle\Tests\Command\GenerateBundleCommandTest::testInteractiveCommand with data set #2 (array('/tmp', 'yml', 'BarBundle', true), 'Foo/BarBundle
        ', array('Foo\\BarBundle', 'BarBundle', '/tmp/', 'yml', true))
        RuntimeException: Aborted
    
        .../Symfony/Component/Console/Helper/DialogHelper.php:40
        .../Symfony/Component/Console/Helper/DialogHelper.php:97
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Command/GenerateBundleCommand.php:165
        .../Symfony/Component/Console/Command/Command.php:205
        .../Symfony/Component/Console/Tester/CommandTester.php:66
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateBundleCommandTest.php:39
    
        4) Sensio\Bundle\GeneratorBundle\Tests\Command\GenerateDoctrineEntityCommandTest::testInteractiveCommand with data set #0 (array(), 'AcmeBlogBundle:Blog/Post
        ', array('Blog\\Post', 'annotation', array()))
        RuntimeException: Aborted
    
        .../Symfony/Component/Console/Helper/DialogHelper.php:40
        .../Symfony/Component/Console/Helper/DialogHelper.php:97
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineEntityCommand.php:145
        .../Symfony/Component/Console/Command/Command.php:205
        .../Symfony/Component/Console/Tester/CommandTester.php:66
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateDoctrineEntityCommandTest.php:39
    
        5) Sensio\Bundle\GeneratorBundle\Tests\Command\GenerateDoctrineEntityCommandTest::testInteractiveCommand with data set #1 (array('AcmeBlogBundle:Blog/Post'), '', array('Blog\\Post', 'annotation', array()))
        RuntimeException: Aborted
    
        .../Symfony/Component/Console/Helper/DialogHelper.php:40
        .../Symfony/Component/Console/Helper/DialogHelper.php:97
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineEntityCommand.php:121
        .../Symfony/Component/Console/Command/Command.php:205
        .../Symfony/Component/Console/Tester/CommandTester.php:66
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateDoctrineEntityCommandTest.php:39
    
        6) Sensio\Bundle\GeneratorBundle\Tests\Command\GenerateDoctrineEntityCommandTest::testInteractiveCommand with data set #2 (array(), 'AcmeBlogBundle:Blog/Post
        yml
    
        ', array('Blog\\Post', 'yml', array()))
        RuntimeException: Aborted
    
        .../Symfony/Component/Console/Helper/DialogHelper.php:40
        .../Symfony/Component/Console/Helper/DialogHelper.php:62
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineEntityCommand.php:153
        .../Symfony/Component/Console/Command/Command.php:205
        .../Symfony/Component/Console/Tester/CommandTester.php:66
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateDoctrineEntityCommandTest.php:39
    
        7) Sensio\Bundle\GeneratorBundle\Tests\Command\GenerateDoctrineEntityCommandTest::testInteractiveCommand with data set #3 (array(), 'AcmeBlogBundle:Blog/Post
        yml
        title
    
        255
        description
        text
    
        ', array('Blog\\Post', 'yml', array(array('title', 'string', 255), array('description', 'text'))))
        RuntimeException: Aborted
    
        .../Symfony/Component/Console/Helper/DialogHelper.php:40
        .../Symfony/Component/Console/Helper/DialogHelper.php:62
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Command/GenerateDoctrineEntityCommand.php:153
        .../Symfony/Component/Console/Command/Command.php:205
        .../Symfony/Component/Console/Tester/CommandTester.php:66
        .../symfony-standard/vendor/bundles/Sensio/Bundle/GeneratorBundle/Tests/Command/GenerateDoctrineEntityCommandTest.php:39
    
    ---------------------------------------------------------------------------
    
    by lenar at 2011/07/26 23:56:46 -0700
    
    @fabpot: and you modified all those tests? I only modified ```Tests/Command/GenerateDoctrineCrudCommandTest.php```
    and that doesn't fail as I see from your log. I just provided example, though I could add necessary changes for other tests too.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/27 00:09:32 -0700
    
    @lenar: ah, sorry about that. Then, can you provide a fix for all the other tests too? Thanks a lot.
    
    ---------------------------------------------------------------------------
    
    by lenar at 2011/07/27 00:22:54 -0700
    
    @fabpot: actually what do you think about this kind of fix instead for tests: lenar/SensioGeneratorBundle@517f263 instead my previous proposal (lenar/SensioGeneratorBundle@6ff3f26). Really simple, short and effective.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/27 00:37:51 -0700
    
    @lenar: looks good to me. Can you create a PR?
    
    ---------------------------------------------------------------------------
    
    by lenar at 2011/07/27 00:45:36 -0700
    
    @fabpot: sensiolabs/SensioGeneratorBundle#60
    fabpot committed Jul 27, 2011
  16. @lenar

    Detect EOF when reading input stream

    [Console] Change back to fgets() in DialogHelper
    lenar committed Jul 15, 2011
  17. @fabpot

    fixed CS

    fabpot committed Jul 27, 2011
  18. @fabpot

    merged branch aboks/mimetype_test (PR #1775)

    Commits
    -------
    
    1283c47 [HttpFoundation] Fixed incorrect test; MimeTypeGuesser should be (and is) able to detect a path that is not a file also without the 'fileinfo' extension
    
    Discussion
    ----------
    
    [HttpFoundation] Fixed incorrect test when 'fileinfo' extension is not enabled
    
    This test failed on my box with `fileinfo` disabled. The `FileNotFoundException` is thrown also when the `fileinfo`-extension is not enabled, so it should be expected.
    fabpot committed Jul 27, 2011
  19. @fabpot

    merged branch chtitux/patch-contrib-syntax (PR #1809)

    Commits
    -------
    
    ae9f6a1 Format CONTRIBUTORS.md with MarkDown syntax
    
    Discussion
    ----------
    
    Format CONTRIBUTORS.md with MarkDown syntax
    
    Just made a s/^/ - / for a "beautiful" list Markdown : https://github.com/chtitux/symfony/blob/ae9f6a16ce528efa7a9426536f9189feaed579db/CONTRIBUTORS.md
    fabpot committed Jul 27, 2011
  20. @fabpot
  21. @fabpot

    merged branch craue/patch-9 (PR #1787)

    Commits
    -------
    
    c558b78 avoid rendering the `ChoiceType` separator if all `choices` are `preferred_choices`
    
    Discussion
    ----------
    
    avoid rendering the `ChoiceType` separator if all `choices` are `preferred_choices`
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/24 00:51:21 -0700
    
    The same change should be made to the PHP template.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/25 00:31:39 -0700
    
    I forgot to ask you to add some unit tests too. Thanks.
    
    ---------------------------------------------------------------------------
    
    by craue at 2011/07/25 10:23:34 -0700
    
    Are you asking for PHPUnit tests? If so, unfortunately, I'm not able to add those because I haven't used PHPUnit yet. ;)
    
    ---------------------------------------------------------------------------
    
    by lenar at 2011/07/25 12:47:51 -0700
    
    I would prefer ```choises | length``` without spaces as everywhere else.
    
    ---------------------------------------------------------------------------
    
    by lenar at 2011/07/25 12:50:32 -0700
    
    @fabpot: Since <option disabled> is unclickable in browser (by HTML spec) this really doesn't change anything (something not there is as unclickable) except the the look when rendered. I have hard time to imagine what could become unit-testable here by this change.
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/07/25 13:03:47 -0700
    
    @lenar unit testing is not about what the browser could do. What should be unit-tested is that an example will only preferred choices does not output the separator, which is exactly what this PR is about
    
    ---------------------------------------------------------------------------
    
    by stof at 2011/07/25 13:04:03 -0700
    
    @lenar unit testing is not about what the browser could do. What should be unit-tested is that an example will only preferred choices does not output the separator, which is exactly what this PR is about
    
    ---------------------------------------------------------------------------
    
    by lenar at 2011/07/25 13:08:33 -0700
    
    @stof: ok, put this way you are definitely right.
    
    ---------------------------------------------------------------------------
    
    by craue at 2011/07/25 13:37:50 -0700
    
    @lenar: You're right about the spaces. I'm using them in my projects but will remove them here for the sake of consistency.
    
    ---------------------------------------------------------------------------
    
    by stloyd at 2011/07/25 13:40:40 -0700
    
    @craue I will write today/tomorrow test to cover your code and send you PR.
    
    ---------------------------------------------------------------------------
    
    by craue at 2011/07/25 14:00:26 -0700
    
    @stloyd: That would be nice. But I'm still not that familiar with Git(Hub). Is there anything I have to take care of?
    
    Also, I'd like to squash my three commits into one ... if this is possible for an open PR and if I find out how to do that easily. :D
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/26 00:18:22 -0700
    
    @craue: yes, you should squash your commits into one and use `--force` when you push (the PR will automatically be updated accordingly).
    fabpot committed Jul 27, 2011
  22. @fabpot

    merged branch stof/trans_locale (PR #1808)

    Commits
    -------
    
    85c0087 [TwigBridge] Made the locale configurable for the trans and transchoice tags
    3ea31a0 [TwigBridge] Made the locale configurable for the trans and transchoice filters
    
    Discussion
    ----------
    
    Trans locale
    
    This allows setting the locale when translating in a Twig template. This was already allowed in the Translator and in the PHP templates
    fabpot committed Jul 27, 2011
  23. @fabpot

    merged branch husinluck/master (PR #1822)

    Commits
    -------
    
    0832f4d Updated Persian translation
    2a4fca8 translated validators resources into Persian
    
    Discussion
    ----------
    
    Persian translation
    
    Added Persian validator translations
    fabpot committed Jul 27, 2011
  24. @fabpot

    merged branch dlsniper/patch-1 (PR #1820)

    Commits
    -------
    
    be4b77d Updated Romanian translation
    
    Discussion
    ----------
    
    Updated Romanian translation
    
    Updated Romanian translation for validation messages to match the latest messages.
    fabpot committed Jul 27, 2011
  25. @fabpot

    merged branch aboks/dutch_translations (PR #1821)

    Commits
    -------
    
    9883c60 [FrameworkBundle] Updated Dutch validator translations
    
    Discussion
    ----------
    
    [FrameworkBundle] Updated Dutch validator translations
    fabpot committed Jul 27, 2011
  26. @husinluck

    Updated Persian translation

    husinluck committed Jul 27, 2011
  27. @husinluck
Commits on Jul 26, 2011
  1. @aboks
  2. @dlsniper

    Updated Romanian translation

    dlsniper committed Jul 26, 2011
  3. @fabpot

    merged branch stloyd/patch-8 (PR #1819)

    Commits
    -------
    
    fe8e0ad [Validator] Sync polish translation
    
    Discussion
    ----------
    
    [Validator] Sync polish translation
    fabpot committed Jul 26, 2011
  4. @fabpot

    merged branch xmontana/patch-1 (PR #1818)

    Commits
    -------
    
    321dd45 Updated spanish and catalan translations
    
    Discussion
    ----------
    
    Updated spanish and catalan translations
    
    Added new translations based on the indonesian updated file.
    fabpot committed Jul 26, 2011
  5. @fabpot

    merged branch alifity/updated_indonesian (PR #1817)

    Commits
    -------
    
    a66a0ff updated missing validator translation #8
    
    Discussion
    ----------
    
    updated missing validator translation #8
    fabpot committed Jul 26, 2011
  6. @stloyd
  7. @xmontana
  8. @subosito