Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jul 28, 2011
  1. Fixed message 8

    authored
  2. Fabien Potencier

    merged branch schmittjoh/fixName (PR #1838)

    fabpot authored
    Commits
    -------
    
    5b51220 fixed name
    
    Discussion
    ----------
    
    fixed name
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/27 22:07:46 -0700
    
    Can you update your Github profile too?
  3. Fabien Potencier

    merged branch irmantas/master (PR #1839)

    fabpot authored
    Commits
    -------
    
    9ac711f Added lithuanian validators translation
    
    Discussion
    ----------
    
    Added translation
    
    Added lithuanian validators translation
  4. Fabien Potencier

    merged branch excelwebzone/hebrew_translations (PR #1840)

    fabpot authored
    Commits
    -------
    
    2fca9b7  Some small hebrew fixes
    
    Discussion
    ----------
    
    Some small hebrew fixes
  5. Michael H. Arieli

    Some small hebrew fixes

    excelwebzone authored
Commits on Jul 27, 2011
  1. Irmantas Šiupšinskas
  2. Johannes

    fixed name

    schmittjoh authored
  3. Fabien Potencier

    merged branch excelwebzone/hebrew_translations (PR #1834)

    fabpot authored
    Commits
    -------
    
    8b77d4d  Hebrew translations updated
    
    Discussion
    ----------
    
    Hebrew translations updated
  4. Michael H. Arieli
  5. Fabien Potencier

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

    fabpot authored
    Commits
    -------
    
    56e92e9 Fixed Serbian translation.
    
    Discussion
    ----------
    
    Fixed Serbian translation.
    
    There was one new message untranslated, and one changed which required translation changes.
  6. Saša Stamenković

    Fixed Serbian translation.

    umpirsky authored
  7. Fabien Potencier

    merged branch danielcsgomes/master (PR #1832)

    fabpot authored
    Commits
    -------
    
    336e4d4 some minor corrections to pt_PT translation
    
    Discussion
    ----------
    
    some minor corrections to pt_PT translation
  8. Daniel Gomes
  9. Fabien Potencier

    merged branch doup/euskara_translations (PR #1831)

    fabpot authored
    Commits
    -------
    
    363fed4 Euskara translations updated
    
    Discussion
    ----------
    
    Euskara translations updated
  10. Asier Illarramendi

    Euskara translations updated

    doup authored
  11. Fabien Potencier

    merged branch yethee/ru_translation (PR #1830)

    fabpot authored
    Commits
    -------
    
    e7c07c4 [FrameworkBundle] Updated the Russian translations.
    
    Discussion
    ----------
    
    [FrameworkBundle] Updated the Russian translations.
  12. Fabien Potencier

    merged branch danielcsgomes/master (PR #1829)

    fabpot authored
    Commits
    -------
    
    00e10f9 updated pt_PT translation
    
    Discussion
    ----------
    
    updates pt_PT translation
  13. Deni
  14. Daniel Gomes

    updated pt_PT translation

    dcsg authored
  15. Fabien Potencier

    merged branch hason/czechvalidators (PR #1828)

    fabpot authored
    Commits
    -------
    
    1d90b43 [FrameworkBundle] updated czech translation
    
    Discussion
    ----------
    
    [FrameworkBundle] updated czech translation
  16. Martin Hasoň
  17. Fabien Potencier

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

    fabpot authored
    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
  18. Lenar Lõhmus

    Detect EOF when reading input stream

    lenar authored
    [Console] Change back to fgets() in DialogHelper
  19. Fabien Potencier

    fixed CS

    fabpot authored
  20. Fabien Potencier

    merged branch aboks/mimetype_test (PR #1775)

    fabpot authored
    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.
  21. Fabien Potencier

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

    fabpot authored
    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
  22. Fabien Potencier
  23. Fabien Potencier

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

    fabpot authored
    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).
  24. Fabien Potencier

    merged branch stof/trans_locale (PR #1808)

    fabpot authored
    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
  25. Fabien Potencier

    merged branch husinluck/master (PR #1822)

    fabpot authored
    Commits
    -------
    
    0832f4d Updated Persian translation
    2a4fca8 translated validators resources into Persian
    
    Discussion
    ----------
    
    Persian translation
    
    Added Persian validator translations
  26. Fabien Potencier

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

    fabpot authored
    Commits
    -------
    
    be4b77d Updated Romanian translation
    
    Discussion
    ----------
    
    Updated Romanian translation
    
    Updated Romanian translation for validation messages to match the latest messages.
  27. Fabien Potencier

    merged branch aboks/dutch_translations (PR #1821)

    fabpot authored
    Commits
    -------
    
    9883c60 [FrameworkBundle] Updated Dutch validator translations
    
    Discussion
    ----------
    
    [FrameworkBundle] Updated Dutch validator translations
  28. Hossein Bukhamsin

    Updated Persian translation

    husinluck authored
  29. Hossein Bukhamsin
Something went wrong with that request. Please try again.