Commit Graph

6327 Commits

Author SHA1 Message Date
ornicar
ee5b9cefda [SwiftmailerBundle] Allow non-file spools
Actually if I have the following configuration:

    swiftmailer:
        spool:
            type:   not_file
            path:   some_path

The DIC compiler will complain:

    'The service "swiftmailer.spool.file" has a dependency on
    a non-existent parameter "swiftmailer.spool.file.path"

Because the file spool service is declared no matter the spool type configured.
And it requires the file.path, which is not available.

This patch aims to load the file spooler only if required by the
configuration.
2011-07-29 16:25:23 -07:00
Fabien Potencier
c3ebdbf9cc prepared Symfony 2.0.0 release 2011-07-28 10:41:06 +02:00
Fabien Potencier
bcf5cebcff merged branch pborreli/last-day-typo (PR #1845)
Commits
-------

de5374e [Various] Typos

Discussion
----------

[Various] Typos
2011-07-28 10:39:55 +02:00
Pascal Borreli
de5374ebac [Various] Typos 2011-07-28 10:28:20 +02:00
Fabien Potencier
ddfb78ad72 merged branch hhamon/fix_commands_doc (PR #1844)
Commits
-------

f2e4d35 [Console] harmonized commands documentation by changing ./app/console to php app/console.
41fe826 [SwiftmailerBundle] harmonized commands documentation by changing ./app/console to php app/console.
08072e4 [FrameworkBundle] harmonized commands documentation by changing ./app/console to php app/console.
ec9c0aa [DoctrineBundle] harmonized commands documentation by changing ./app/console to php app/console.
1c082b8 [FrameworkBundle] added short description for the assets:install command.
e16ccaa [SecurityBundle] added short description and help for the init:acl command.
e90efdc [DoctrineBundle] removed extra point at the end of the commands' short descriptions.

Discussion
----------

Fix commands doc
2011-07-28 10:21:37 +02:00
Hugo Hamon
f2e4d35931 [Console] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:01:57 +02:00
Hugo Hamon
41fe82656b [SwiftmailerBundle] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:01:26 +02:00
Hugo Hamon
08072e4595 [FrameworkBundle] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:01:00 +02:00
Hugo Hamon
ec9c0aab64 [DoctrineBundle] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:00:47 +02:00
Hugo Hamon
1c082b8133 [FrameworkBundle] added short description for the assets:install command. 2011-07-28 09:52:34 +02:00
Hugo Hamon
e16ccaac71 [SecurityBundle] added short description and help for the init:acl command. 2011-07-28 09:49:02 +02:00
Hugo Hamon
e90efdc383 [DoctrineBundle] removed extra point at the end of the commands' short descriptions. 2011-07-28 09:48:27 +02:00
Fabien Potencier
3caa8953c5 merged branch cvaldemar/master (PR #1842)
Commits
-------

7d5785e Fixed message 8
8ef3647 Updated danish validator translation

Discussion
----------

Updated Danish translation of validator strings

Just an updated Danish translation as requested.

---------------------------------------------------------------------------

by yethee at 2011/07/27 23:25:11 -0700

@cvaldemar, can you fix message #8?
2011-07-28 08:56:38 +02:00
Fabien Potencier
e417a46af6 merged branch lsmith77/serializer_api_docblock (PR #1843)
Commits
-------

6773cd7 [Serializer] removed @api since its not yet part of the stable API

Discussion
----------

[Serializer] removed @api since its not yet part of the stable API

sorry .. only realized this while shaving this morning ..
2011-07-28 08:56:21 +02:00
Lukas Kahwe Smith
6773cd7e05 [Serializer] removed @api since its not yet part of the stable API 2011-07-28 08:32:22 +02:00
Casper Valdemar Poulsen
7d5785ea9d Fixed message 8 2011-07-28 08:27:31 +02:00
Casper Valdemar Poulsen
8ef3647df7 Updated danish validator translation 2011-07-28 08:12:00 +02:00
Fabien Potencier
950ab13417 merged branch schmittjoh/fixName (PR #1838)
Commits
-------

5b51220 fixed name

Discussion
----------

fixed name

---------------------------------------------------------------------------

by fabpot at 2011/07/27 22:07:46 -0700

Can you update your Github profile too?
2011-07-28 07:08:00 +02:00
Fabien Potencier
79c11c3351 merged branch irmantas/master (PR #1839)
Commits
-------

9ac711f Added lithuanian validators translation

Discussion
----------

Added translation

Added lithuanian validators translation
2011-07-28 07:06:55 +02:00
Fabien Potencier
dc4f7aa7b1 merged branch excelwebzone/hebrew_translations (PR #1840)
Commits
-------

2fca9b7  Some small hebrew fixes

Discussion
----------

Some small hebrew fixes
2011-07-28 07:06:45 +02:00
excelwebzone
2fca9b748b Some small hebrew fixes 2011-07-27 17:28:06 -07:00
Irmantas
9ac711f687 Added lithuanian validators translation 2011-07-28 00:15:36 +03:00
Johannes Schmitt
5b51220674 fixed name 2011-07-27 23:12:39 +02:00
Fabien Potencier
e8cc5d450f merged branch excelwebzone/hebrew_translations (PR #1834)
Commits
-------

8b77d4d  Hebrew translations updated

Discussion
----------

Hebrew translations updated
2011-07-27 16:39:33 +02:00
excelwebzone
8b77d4d24b Hebrew translations updated 2011-07-27 07:02:52 -07:00
Fabien Potencier
eed68cdb96 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.
2011-07-27 15:05:25 +02:00
umpirsky
56e92e940a Fixed Serbian translation. 2011-07-27 14:57:13 +02:00
Fabien Potencier
f18d71f139 merged branch danielcsgomes/master (PR #1832)
Commits
-------

336e4d4 some minor corrections to pt_PT translation

Discussion
----------

some minor corrections to pt_PT translation
2011-07-27 14:30:40 +02:00
Daniel Gomes
336e4d47e6 some minor corrections to pt_PT translation 2011-07-27 14:28:26 +02:00
Fabien Potencier
de04779eef merged branch doup/euskara_translations (PR #1831)
Commits
-------

363fed4 Euskara translations updated

Discussion
----------

Euskara translations updated
2011-07-27 14:21:05 +02:00
doup
363fed48ee Euskara translations updated 2011-07-27 14:15:55 +02:00
Fabien Potencier
824ee13990 merged branch yethee/ru_translation (PR #1830)
Commits
-------

e7c07c4 [FrameworkBundle] Updated the Russian translations.

Discussion
----------

[FrameworkBundle] Updated the Russian translations.
2011-07-27 14:10:57 +02:00
Fabien Potencier
d2aa4078fc merged branch danielcsgomes/master (PR #1829)
Commits
-------

00e10f9 updated pt_PT translation

Discussion
----------

updates pt_PT translation
2011-07-27 14:10:51 +02:00
Deni
e7c07c49a2 [FrameworkBundle] Updated the Russian translations. 2011-07-27 15:42:03 +04:00
Daniel Gomes
00e10f9a44 updated pt_PT translation 2011-07-27 12:59:56 +02:00
Fabien Potencier
4197740599 merged branch hason/czechvalidators (PR #1828)
Commits
-------

1d90b43 [FrameworkBundle] updated czech translation

Discussion
----------

[FrameworkBundle] updated czech translation
2011-07-27 12:43:26 +02:00
Martin Hason
1d90b43a4f [FrameworkBundle] updated czech translation 2011-07-27 12:35:15 +02:00
Fabien Potencier
5731516070 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 511a9a1fd7 and 3a5d508766.

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@6ff3f26881. 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@6ff3f26881 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@517f263cb0 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: sensio/SensioGeneratorBundle#60
2011-07-27 10:20:36 +02:00
lenar
07298ac699 Detect EOF when reading input stream
[Console] Change back to fgets() in DialogHelper
2011-07-27 10:47:43 +03:00
Fabien Potencier
8700cd6154 fixed CS 2011-07-27 08:27:46 +02:00
Fabien Potencier
422522bcf8 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.
2011-07-27 08:24:12 +02:00
Fabien Potencier
e45f265aba 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 : ae9f6a16ce/CONTRIBUTORS.md
2011-07-27 08:22:19 +02:00
Fabien Potencier
de9f8ab47e added a unit test for previous merge 2011-07-27 08:00:56 +02:00
Fabien Potencier
c248f8123d 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).
2011-07-27 07:59:53 +02:00
Fabien Potencier
c6308a5daf 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
2011-07-27 07:44:42 +02:00
Fabien Potencier
bddfb9f052 merged branch husinluck/master (PR #1822)
Commits
-------

0832f4d Updated Persian translation
2a4fca8 translated validators resources into Persian

Discussion
----------

Persian translation

Added Persian validator translations
2011-07-27 07:43:45 +02:00
Fabien Potencier
1c564f39ca 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.
2011-07-27 07:43:39 +02:00
Fabien Potencier
84875b5761 merged branch aboks/dutch_translations (PR #1821)
Commits
-------

9883c60 [FrameworkBundle] Updated Dutch validator translations

Discussion
----------

[FrameworkBundle] Updated Dutch validator translations
2011-07-27 07:43:28 +02:00
Hossein Bukhamsin
0832f4d92f Updated Persian translation 2011-07-27 09:31:14 +04:30
Hossein Bukhamsin
2a4fca8f8f translated validators resources into Persian 2011-07-27 09:18:19 +04:30