Commit Graph

2747 Commits

Author SHA1 Message Date
Fabien Potencier
18b1a66c2a partially reverted previous commit 2011-07-26 09:22:13 +02:00
Fabien Potencier
91a41020a8 merged branch sasezaki/BrowserKit_useragent (PR #1789)
Commits
-------

266e60e Don't tell a lie to every WebServers

Discussion
----------

Please don't tell a lie to every WebServers

Fake Useragent name should be only in test case .
2011-07-26 09:21:10 +02:00
Fabien Potencier
195a66fd9d merged branch stloyd/patch-6 (PR #1800)
Commits
-------

03bd20f FrameworkExtension - Remove unused variable

Discussion
----------

FrameworkExtension - Remove unused variable
2011-07-26 09:19:24 +02:00
Fabien Potencier
72201a2485 merged branch 1ed/hungarian-validator-messages (PR #1803)
Commits
-------

987eb54 [FrameworkBundle] updated hungarian validator messages

Discussion
----------

[FrameworkBundle] updated hungarian validator messages
2011-07-26 09:06:25 +02:00
Fabien Potencier
04ac1fdba2 [Routing] changed UrlGeneratorInterface::generate() signature to allow passing objects instead of arrays 2011-07-26 08:00:41 +02:00
Gábor Egyed
987eb54199 [FrameworkBundle] updated hungarian validator messages 2011-07-26 00:55:17 +02:00
Joseph Bielawski
03bd20fafc FrameworkExtension - Remove unused variable 2011-07-25 05:33:12 -07:00
sasezaki
266e60e7a2 Don't tell a lie to every WebServers 2011-07-24 14:01:26 +09:00
Fabien Potencier
169f1b57f1 [FrameworkBundle] added a note about why we cannot include Controller in the compiled classes 2011-07-23 16:40:25 +02:00
Marcel Beerta
77802efe4e fixes #1779 2011-07-23 07:02:50 -07:00
Arnout Boks
9d8e6f677e [FrameworkBundle] Changed TraceableEventDispatcher to log calls to event listeners _before_ actually calling them 2011-07-23 10:49:25 +02:00
Fabien Potencier
20a704431e [SecurityBundle] fixed typo in tests 2011-07-22 14:50:38 +02:00
Fabien Potencier
aab0bf7e2c merged branch schmittjoh/httpUtilFixes (PR #1739)
Commits
-------

eae6a77 fixed wrong case
d0a175b fixes #1659
f300ede fixes several bugs
a4f05ac added some tests

Discussion
----------

Http util fixes

Fixes several bugs in the http utils.

Please don't add anymore features without sufficient tests. Especially for the Security\Http namespace, regressions are very likely otherwise.

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

by fabpot at 2011/07/19 22:37:26 -0700

Tests do not pass for me:

    There were 2 errors:

    1) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testLoginLogoutProcedure with data set #0 ('en')
    InvalidArgumentException: The current node list is empty.

    .../src/Symfony/Component/DomCrawler/Crawler.php:604
    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:16

    2) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testLoginLogoutProcedure with data set #1 ('de')
    InvalidArgumentException: The current node list is empty.

    .../src/Symfony/Component/DomCrawler/Crawler.php:604
    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:16

    --

    There were 4 failures:

    1) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testAccessRestrictedResource with data set #0 ('en')
    Failed asserting that two strings are equal.
    --- Expected
    +++ Actual
    @@ @@
    -http://localhost/en/login
    +http://localhost/login

    .../src/Symfony/Bundle/Securitybundle/Tests/Functional/WebTestCase.php:22
    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:38

    2) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testAccessRestrictedResource with data set #1 ('de')
    Failed asserting that two strings are equal.
    --- Expected
    +++ Actual
    @@ @@
    -http://localhost/de/login
    +http://localhost/login

    .../src/Symfony/Bundle/Securitybundle/Tests/Functional/WebTestCase.php:22
    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:38

    3) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testAccessRestrictedResourceWithForward with data set #0 ('en')
    HTTP/1.0 302 Found
    Cache-Control:  no-cache
    Content-Length: 299
    Content-Type:   text/html; charset=UTF-8
    Date:           Wed, 20 Jul 2011 05:36:27 GMT
    Location:       http://localhost/login
    Set-Cookie: PHPSESSID=11c9c6a7e7620e13bddef223a5ba46d9; path=/; domain=

    <html>
        <head>
            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
            <meta http-equiv="refresh" content="1;url=http://localhost/login" />
        </head>
        <body>
            Redirecting to <a href="http://localhost/login">http://localhost/login</a>.
        </body>
    </html>
    Failed asserting that <integer:0> matches expected <integer:1>.

    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:50

    4) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testAccessRestrictedResourceWithForward with data set #1 ('de')
    HTTP/1.0 302 Found
    Cache-Control:  no-cache
    Content-Length: 299
    Content-Type:   text/html; charset=UTF-8
    Date:           Wed, 20 Jul 2011 05:36:28 GMT
    Location:       http://localhost/login
    Set-Cookie: PHPSESSID=2bbe63786a088471ade3717917f4ba4f; path=/; domain=

    <html>
        <head>
            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
            <meta http-equiv="refresh" content="1;url=http://localhost/login" />
        </head>
        <body>
            Redirecting to <a href="http://localhost/login">http://localhost/login</a>.
        </body>
    </html>
    Failed asserting that <integer:0> matches expected <integer:1>.

    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:50

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

by schmittjoh at 2011/07/19 23:47:29 -0700

I fixed a wrong case, but I couldn't reproduce the other errors (tested on Ubuntu).

My guess is that the temporary directory on your machine couldn't be deleted for some reason, and the test runs with the configuration of some of the previous tests.

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

by fabpot at 2011/07/20 00:28:41 -0700

That does not make any difference for me. For instance, in `LocalizedRoutesAsPathTest::testLoginLogoutProcedure()`, the first request to `'/'.$locale.'/login'` returns the following Response:

    <html>
        <head>
            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
            <meta http-equiv="refresh" content="1;url=http://localhost/login" />
        </head>
        <body>
            Redirecting to <a href="http://localhost/login">http://localhost/login</a>.
        </body>
    </html>

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

by schmittjoh at 2011/07/20 00:31:34 -0700

That's weird, did you make sure that the temporary directory does not exist?

``rm -Rf /tmp/StandardFormLogin/``

On Wed, Jul 20, 2011 at 9:28 AM, fabpot <
reply@reply.github.com>wrote:

> That does not make any difference for me. For instance, in
> `LocalizedRoutesAsPathTest::testLoginLogoutProcedure()`, the first request
> to `'/'.$locale.'/login'` returns the following Response:
>
>    <html>
>        <head>
>            <meta http-equiv="Content-Type" content="text/html;
> charset=utf-8" />
>            <meta http-equiv="refresh" content="1;url=
> http://localhost/login" />
>        </head>
>        <body>
>            Redirecting to <a href="http://localhost/login">
> http://localhost/login</a>.
>        </body>
>    </html>
>
> --
> Reply to this email directly or view it on GitHub:
> https://github.com/symfony/symfony/pull/1739#issuecomment-1613504
>

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

by fabpot at 2011/07/20 00:33:40 -0700

Yes, I've just checked and the directory does not exist.

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

by schmittjoh at 2011/07/20 00:39:55 -0700

Sorry, I can't reproduce it on Ubuntu and unless someone wants to sponsor me a Mac, there is not much I can do.
2011-07-22 14:45:54 +02:00
Fabien Potencier
5d9bd6da4f [TwigBundle] fixed XSS in the exception template 2011-07-22 13:42:59 +02:00
Fabien Potencier
9bf6216a85 added missing ' escaping 2011-07-22 13:37:23 +02:00
marc.weistroff
2b4cc9bd06 [Form] Changed collection prototype rendering.
Based on PR 1500. It is now rendered inside an attribute of collection
tag.
2011-07-22 11:01:55 +02:00
Fabien Potencier
e776d5dbce [FrameworkBundle] tweaked compiled class cache 2011-07-21 22:32:50 +02:00
Fabien Potencier
cede13e8cc [FrameworkBundle] moved the SessionListener to the session.xml configuration file 2011-07-21 22:32:21 +02:00
Fabien Potencier
ccda267c36 [FrameworkBundle] fixed wrong order in classes to compile 2011-07-21 21:44:10 +02:00
Fabien Potencier
b06a5dfcf3 merged branch andreia/master (PR #1760)
Commits
-------

350f207 Update the CSRF message

Discussion
----------

Update the CSRF message

Update the CSRF message
2011-07-21 20:57:10 +02:00
Fabien Potencier
3749ad43f4 moved the Exception listener from FrameworkBundle to TwigBundle as it relies on Twig being enabled
This commit also fixes exception pages when Twig is not enabled as a templating engine.
Instead of just displaying the raw Twig template as before, we now fallback to the default
exception handler introduced some time ago.
2011-07-21 19:24:04 +02:00
Andreia Bohner
350f2076ba Update the CSRF message 2011-07-21 12:47:42 -03:00
Andreia Bohner
cb37572b58 Update the Brazilian Portuguese validator translations and fix typo 2011-07-20 21:58:46 -03:00
Andreia Bohner
e0e4778fe6 Revert "Update the Brazilian Portuguese validator translations and fix typo"
This reverts commit 63f0707df6.
2011-07-20 21:00:45 -03:00
Andreia Bohner
63f0707df6 Update the Brazilian Portuguese validator translations and fix typo 2011-07-20 20:51:35 -03:00
Martin Schuhfuss
79e4ed661b simplified assignment 2011-07-20 17:29:23 +02:00
Martin Schuhfuss
04302ffe98 simplified ternary-operator 2011-07-20 17:27:36 +02:00
Martin Schuhfuss
3a285c1548 fixed handling of null-values in attribute- and query-arrays
when esi is enabled and internal uris are generated for esi-tags, an
attribute-array consisting entirely of null-values isn't handled correctly.

The reason is that php's `http_build_query()`-method outputs an empty string
for such arrays:

    http_build_query(array('foo' => '')) == 'foo='
    http_build_query(array('foo' => null)) == ''

In the latter case, the generation of an URI in `HttpKernel::generateInternalUri()`
generates an URI that could not be matched by the corresponding route (ex.
`_internal/Controller/.html` opposed to `_internal/Controller/none.html` which
should be expected).

This commit adds a possible solution as well as a simple test for this issue.
2011-07-20 17:03:20 +02:00
Johannes Schmitt
eae6a773c6 fixed wrong case 2011-07-20 08:43:26 +02:00
Johannes Schmitt
d0a175b6cd fixes #1659 2011-07-19 20:51:30 +02:00
Fabien Potencier
d3a69e3531 [DoctrineBundle] renamed RegistryInterface::getEntityManagerForObject() to getEntityManagerForClass() 2011-07-19 19:24:57 +02:00
Johannes Schmitt
f300edebe4 fixes several bugs 2011-07-19 16:21:58 +02:00
Johannes Schmitt
a4f05ac7ab added some tests 2011-07-19 14:50:39 +02:00
Fabien Potencier
dafa4d28d6 [FrameworkBundle] made another small optimization for functional tests 2011-07-19 13:11:12 +02:00
Fabien Potencier
1454d61ad5 [FrameworkBundle] made a huge speed optimization for functional tests 2011-07-19 12:51:57 +02:00
Fabien Potencier
d2e9f14597 merged branch schmittjoh/routerFix (PR #1720)
Commits
-------

9bcce9f fix tests
fc4787a fix non-extensible router

Discussion
----------

Router fix

Right now, the router is hard to overwrite (you need always a compiler pass). This commit fixes this.

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

by fabpot at 2011/07/18 01:15:36 -0700

Why do you need a complier pass to override the router?

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

by schmittjoh at 2011/07/18 01:47:47 -0700

How would you suggest to overwrite it?

Basically, I want to do something like this:

```yml
services:
    router:
         parent: router.default
         class: MyClass
         calls:
             - [moreDeps, []]
```

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

by Seldaek at 2011/07/18 05:07:19 -0700

Then maybe we should somehow support redefining services with the same name while keeping the old one as parent, otherwise we need this foo.default for every service out there?

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

by fabpot at 2011/07/18 06:30:34 -0700

as @Seldeak said, why do that for the router and not all services?

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

by schmittjoh at 2011/07/18 06:38:39 -0700

I have designed the SecurityBundle this way where extension is encouraged.

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

by schmittjoh at 2011/07/18 11:15:57 -0700

I should add that this is mainly a problem for services where you still want to use the semantic configuration that is provided by the bundle. For services which are not configured by the extension, this is not so much of an issue.

Anyway, if you don't want to merge it, just close the PR. I have no problem with using a compiler pass.

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

by fabpot at 2011/07/18 11:55:11 -0700

We already have such a case with translator and translator.real. I will review the existing services to see where it makes sense to implement the same strategy.

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

by Seldaek at 2011/07/18 12:20:55 -0700

I guess you'd do it anyway, but we should pick a winner between .real and .default

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

by lsmith77 at 2011/07/18 12:26:52 -0700

I would prefer ".default" as ".real" always confused me.
2011-07-19 12:06:28 +02:00
Fabien Potencier
b4b8f35da2 renamed translator.real to translator.default 2011-07-19 12:05:51 +02:00
Fabien Potencier
3e2ba60738 merged branch geoffreytran/assetic-debug-performance (PR #1728)
Commits
-------

8e169e4 Improved performance when assetic's use_controller is enabled

Discussion
----------

Improved performance when assetic's use_controller is enabled

When assetic's use_controller is enabled, assetic has to loop through all the templates and create TemplateReferences through the assetic FileResource. This in turn causes a lot of calls to getLogicalName() leading to 5x the calls to the TemplateReference's get() (16k in my case). By accessing the protected field directly compared to using get() we achieve better performance during development (33% in my case).

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

by beberlei at 2011/07/18 11:22:43 -0700

+1 - assetic is a huge performance drain for my app in dev mode aswell.
2011-07-18 20:57:08 +02:00
Fabien Potencier
c3a060e368 updated all core extensions to use the new shortcut method 2011-07-18 17:46:00 +02:00
Fabien Potencier
e2eb601ebd [FrameworkBundle] fixed absolute paths to the cache directory after running cache:clear (closes #1725) 2011-07-18 17:38:41 +02:00
Fabien Potencier
3104a8ab22 oops 2011-07-18 16:14:13 +02:00
Fabien Potencier
8fc9547da5 [FrameworkBundle] fixed session support in functional tests when using several clients in the same process 2011-07-18 16:13:26 +02:00
Fabien Potencier
f9229fe6d8 [Doctrine] added XML support for previous merge 2011-07-18 14:42:48 +02:00
Fabien Potencier
ab94d125b8 merged branch noelg/fix-doctrineconfiguration-dql (PR #1719)
Commits
-------

872d308 [DoctrineBundle] Allowed to configure dql functions without using the multiple entity mangers syntax

Discussion
----------

[DoctrineBundle] Allowed to configure dql functions using the single EM syntax

[DoctrineBundle] Allowed to configure dql functions without using the multiple entity managers syntax
2011-07-18 14:37:42 +02:00
Johannes Schmitt
9bcce9fcdb fix tests 2011-07-18 10:10:04 +02:00
Johannes Schmitt
fc4787ac90 fix non-extensible router 2011-07-18 10:06:01 +02:00
Noel GUILBERT
872d308e9c [DoctrineBundle] Allowed to configure dql functions without using the multiple entity mangers syntax 2011-07-18 19:51:38 +12:00
excelwebzone
0d39cbb2d3 Fixed grammar 2011-07-17 09:35:52 -07:00
excelwebzone
254ce24a11 Translated missed row 2011-07-17 09:27:04 -07:00
Fabien Potencier
ebaf290d0a merged branch doup/euskara_translations (PR #1714)
Commits
-------

39e476f Basque translations added.
6f650f8 Basque file added

Discussion
----------

Euskara translations

Basque (euskara) translations added.
2011-07-17 07:49:14 +02:00
doup
39e476f921 Basque translations added. 2011-07-16 23:02:24 +02:00
Fabien Potencier
c7b18887f8 merged branch xmontana/patch-1 (PR #1710)
Commits
-------

b64c15a Updated spanish translation

Discussion
----------

Updated spanish translation
2011-07-16 18:22:45 +02:00
xmontana
b64c15a17a Updated spanish translation 2011-07-16 00:59:04 -07:00
Geoffrey Tran
8e169e4457 Improved performance when assetic's use_controller is enabled
When assetic's use_controller is enabled, assetic has to loop through all the templates and create TemplateReferences through the assetic FileResource. This in turn causes a lot of calls to getLogicalName() leading to 5x the calls to the TemplateReference's get() (16k in my case). By accessing the protected field directly compared to using get() we achieve better performance during development (33% in my case).
2011-07-15 20:52:23 -05:00
Costin Bereveanu
5395c6c675 Few RO translation tweaks 2011-07-15 02:46:38 -07:00
Johannes Schmitt
af6d4e4c8e changed test 2011-07-15 10:29:16 +02:00
Johannes Schmitt
6d1eb48a9b fixes a bug during session initialization in test environment 2011-07-15 10:23:38 +02:00
doup
6f650f8e8d Basque file added 2011-07-15 02:16:30 +02:00
Fabien Potencier
6a264979d1 merged branch erheme318/mongolian_translation (PR #1695)
Commits
-------

3e092b5 Updated the Mongolian validator translations

Discussion
----------

Updated the Mongolian validator translations
2011-07-14 18:33:39 +02:00
Fabien Potencier
0dd44898ce merged branch erheme318/master (PR #1694)
Commits
-------

e09bc30 Added the Mongolian validator translations

Discussion
----------

Added the Mongolian validator translations
2011-07-14 18:29:20 +02:00
erheme318
3e092b5bfc Updated the Mongolian validator translations 2011-07-14 14:55:06 +07:00
Fabien Potencier
12b1875b88 merged branch schmittjoh/testSessionListenerFix (PR #1691)
Commits
-------

e94eb0b fixes a bug in the test session listener

Discussion
----------

fixes a bug in the test session listener
2011-07-14 08:16:53 +02:00
erheme318
e09bc3015d Added the Mongolian validator translations 2011-07-14 09:14:38 +07:00
Johannes Schmitt
e94eb0b7e0 fixes a bug in the test session listener 2011-07-14 00:54:12 +02:00
Fabien Potencier
093c0c7163 merged branch hason/czech_translation (PR #1682)
Commits
-------

6f859a4 [FrameworkBundle] Updated the Czech validator translations

Discussion
----------

[FrameworkBundle] Updated the Czech validator translations
2011-07-13 18:20:39 +02:00
Martin Hason
6f859a4e04 [FrameworkBundle] Updated the Czech validator translations 2011-07-13 18:16:11 +02:00
xmontana
ba7ec9b98b Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ca.xliff via GitHub 2011-07-13 09:14:00 -07:00
Fabien Potencier
f0a75e8358 merged branch aboks/dutch_translations (PR #1679)
Commits
-------

61de80d [FrameworkBundle] Updated the Dutch validator translations for the changes in 95f7eedd63

Discussion
----------

[FrameworkBundle] Updated the Dutch validator translations

[FrameworkBundle] Updated the Dutch validator translations for the changes in 95f7eedd63
2011-07-13 16:42:29 +02:00
Arnout Boks
61de80d414 [FrameworkBundle] Updated the Dutch validator translations for the changes in 95f7eedd63 2011-07-13 16:36:57 +02:00
Christian Raue
7992ce6796 fixed German validator translation again (see #1676) 2011-07-13 06:59:52 -07:00
Christian Raue
374c53ab47 fixed German validator translation 2011-07-13 06:02:09 -07:00
Fabien Potencier
c881379fe7 merged branch marcw/doctrine-bridge-security (PR #1672)
Commits
-------

66c698a Updated update.md
b33e1ba [SecurityBundle] Reported namespace change of EntityUserProvider
26e96c4 [DoctrineBridge] Changed namespace of EntityUserProvider[B
1633cb3 [Security] Moved EntityUserProvider to Doctrine Bridge

Discussion
----------

[2.1] Moved EntityUserProvider class from Security Component to Doctrine Bridge

I guess that this should better be placed in the Doctrine Bridge.

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

by henrikbjorn at 2011/07/13 00:00:39 -0700

Missing entry in UPDATE.md

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

by schmittjoh at 2011/07/13 00:34:10 -0700

What is our distribution strategy for these bridges?

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

by stof at 2011/07/13 00:53:29 -0700

@schmittjoh Each bridge (Doctrine, Twig, Monolog) is available as a separate repo just like the components.

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

by schmittjoh at 2011/07/13 00:57:41 -0700

I've just checked, but we don't seem to have PEAR packages for these.

If we make this change, then it should still be easy to install the component because there is no benefit of moving this class there. The bridges are mainly useful for extracting code from bundles.

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

by stof at 2011/07/13 01:02:42 -0700

@fabpot any plan to add the bridges on the PEAR channel ?

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

by fabpot at 2011/07/13 02:27:05 -0700

@stof: Bridges will be added with the RC5 release.
2011-07-13 11:28:02 +02:00
Fabien Potencier
68c07775ad [FrameworkBundle] fixed translation loading process when a file does not respect the expected pattern (avoid loading foo.fr.xliff~ for instance) 2011-07-13 09:23:43 +02:00
marc.weistroff
b33e1bae29 [SecurityBundle] Reported namespace change of EntityUserProvider 2011-07-13 08:46:21 +02:00
Fabien Potencier
451c737b97 merged branch jdreesen/validator-trans-update (PR #1670)
Commits
-------

eb77683 [FrameworkBundle] Updated German validator translation

Discussion
----------

[FrameworkBundle] Updated German validator translation
2011-07-13 07:39:15 +02:00
jdreesen
eb776835fc [FrameworkBundle] Updated German validator translation 2011-07-13 01:36:38 +02:00
Benjamin Eberlei
25ab8596da [DoctrineBundle] Add warning about inheritance not supported in entity generation 2011-07-12 23:35:07 +02:00
Joseph Bielawski
719034ff41 [Validator] Sync & fix polish translation 2011-07-12 12:06:54 -07:00
Fabien Potencier
053d2ec179 merged branch yethee/update_translations (PR #1661)
Commits
-------

ad2b224 [FrameworkBundle] Updated Russian translations.
95f7eed [FrameworkBundle] Fixed messages of the Choice constraint in all translations.

Discussion
----------

[FrameworkBundle] Fixes for all translations

Fixed the source messages of the choice contstraint for all translations, and re-sort messages.

And also updated Russian translations, added translations for all constraints.
2011-07-12 20:51:34 +02:00
Fabien Potencier
3825a842d7 [DoctrineBundle] fixed unit tests for previous merge 2011-07-12 20:16:16 +02:00
Deni
ad2b224637 [FrameworkBundle] Updated Russian translations. 2011-07-12 22:10:41 +04:00
Fabien Potencier
362aa330b0 merged branch geoffreytran/master (PR #1655)
Commits
-------

91cfb24 Made namespace for Doctrine cache unique to each environment

Discussion
----------

Made the cache namespace for the Doctrine cache extension unique to each environment

The current cache namespace for the Doctrine adapters is unique on an entity manager and the kernel root directory; however, it causes problems as settings for entity managers can differ between environments, so the addition of the environment into the namespace would address the issue.

        $namespace = 'sf2orm_'.$entityManager['name'].'_'.md5($container->getParameter('kernel.root_dir'));

Solves issues with the cache not being valid for the DBAL ACL provider using D2 as the cache and switching environments.

        An exception has been thrown during the rendering of a template ("Warning: Illegal offset type in isset or  empty in ../vendor/symfony/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php line 404")
2011-07-12 20:08:56 +02:00
Fabien Potencier
121a407f05 merged branch stloyd/patch-2 (PR #1656)
Commits
-------

31317cc [Validator] Sync polish translation

Discussion
----------

[Validator] Sync polish translation
2011-07-12 20:06:30 +02:00
Fabien Potencier
582dda5c85 merged branch vicb/fmwk/ide (PR #1657)
Commits
-------

df34e0e [FrameworkBundle] Fix for setting a custom file link format (fixes #1652)

Discussion
----------

[FrameworkBundle] Fix for setting a custom file link format (fixes #1652)

[FrameworkBundle] Fix for setting a custom file link format (fixes #1652)
2011-07-12 20:06:08 +02:00
Fabien Potencier
5cb165c259 merged branch aboks/dutch_translations (PR #1658)
Commits
-------

2227e41 Fixed incorrect indentation
85b6985 [FrameworkBundle] Sync'ed Dutch validator translations

Discussion
----------

[FrameworkBundle] Sync'ed Dutch validator translations
2011-07-12 20:05:34 +02:00
Fabien Potencier
07ddff5862 merged branch jdreesen/validator-trans-update (PR #1654)
Commits
-------

6d87e67 [FrameworkBundle] Updated German validator translation

Discussion
----------

[FrameworkBundle] Updated German validator translation
2011-07-12 20:04:55 +02:00
Deni
95f7eedd63 [FrameworkBundle] Fixed messages of the Choice constraint in all translations. 2011-07-12 21:54:08 +04:00
Arnout Boks
2227e41b7e Fixed incorrect indentation 2011-07-12 19:24:25 +02:00
Arnout Boks
85b6985eb0 [FrameworkBundle] Sync'ed Dutch validator translations 2011-07-12 19:08:04 +02:00
Victor Berchet
df34e0eb29 [FrameworkBundle] Fix for setting a custom file link format (fixes #1652) 2011-07-12 19:01:49 +02:00
Joseph Bielawski
31317ccf61 [Validator] Sync polish translation 2011-07-12 09:57:21 -07:00
jdreesen
6d87e6715d [FrameworkBundle] Updated German validator translation 2011-07-12 18:51:04 +02:00
Geoffrey Tran
91cfb24e40 Made namespace for Doctrine cache unique to each environment
Solves issues with the cache not being valid for the DBAL ACL provider using D2 as the cache and switching environments.

An exception has been thrown during the rendering of a template ("Warning: Illegal offset type in isset or empty in ../vendor/symfony/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php line 404")
2011-07-12 11:50:37 -05:00
marc.weistroff
dc14f68171 Added fr translation. 2011-07-12 18:08:54 +02:00
Emil Einarsson
b96e0d3fea Updated some awkward swedish validator message translations. 2011-07-12 07:17:31 -07:00
yktd26
b2ce732bf9 added chinese translations for validator messages 2011-07-12 15:13:38 +02:00
Tobias Sjösten
4764cfb8d6 [FrameworkBundle] Added Swedish translation 2011-07-11 23:51:58 +02:00
Fabien Potencier
9a6aafa83f added missing required classes on form label 2011-07-11 18:37:09 +02:00
jdreesen
f0765618de [FrameworkBundle] Synced German validator translation 2011-07-11 12:41:21 +02:00
Arnout Boks
bf7ca509a2 [FrameworkBundle] Synced Dutch validator translation 2011-07-11 12:06:18 +02:00
Fabien Potencier
8a653f2335 merged branch stloyd/patch-1 (PR #1629)
Commits
-------

e54ad66 [Validator] Polish translation sync.

Discussion
----------

[Validator] Polish translation sync.
2011-07-11 11:57:54 +02:00
Fabien Potencier
6a7359389d removed usage of \Exception as PHPUnit won't allow to catch them anymore in the next major version 2011-07-11 11:54:00 +02:00
Joseph Bielawski
e54ad66e7d [Validator] Polish translation sync. 2011-07-11 02:48:27 -07:00
Fabien Potencier
41210b07c7 [FrameworkBundle] fixed form PHP templates for previous merge 2011-07-11 11:38:46 +02:00
Fabien Potencier
c188ca85b9 merged branch vicb/form/translate (PR #1627)
Commits
-------

24e0d71 [FrameworkBundle] Fix a translatable string from the Form default validator
30d348d [Form] Make the default invalid message translatable

Discussion
----------

[Form] Translation

The first commit adds the ability to customize the default message when the form is invalid:

  * Make it an option in the form builder,
  * Allow placeholders in the message,
  * The default value `This value is not valid` exists in the translation files.

The second commit updates a source string in the XLIFF files to make it translatable. All translations should be updated accordingly. The source string is from the [default validator](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Form/Extension/Core/Validator/DefaultValidator.php#L27).

This PR should fix The issue #997.

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

by fabpot at 2011/07/11 01:53:05 -0700

The first commit is not about making the message translatable, but to make it customizable (as the message is used for very different purposes depending on the Type).

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

by fabpot at 2011/07/11 01:55:11 -0700

The "This value is not valid" string should be added to the translation files too.

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

by vicb at 2011/07/11 02:02:51 -0700

@fabpot it was not translatable as the name was hardcoded in the message (instead of using a placeholder). So yes it becomes translatable now (and "customize"able as explained in the PR message).

I have also removed the form name from the default message as I don't think it brings any added value.

`This value is not valid` already exists in the translation files (see id=24).
2011-07-11 11:25:45 +02:00
DerStoffel
377ef7974f Error Message id 1 & 2 changed in "true" & "false", since direct german translation (wahr, falsch) are properly missleading. Corrected typos. 2011-07-11 01:18:45 -07:00
Victor Berchet
24e0d71d92 [FrameworkBundle] Fix a translatable string from the Form default validator 2011-07-11 08:41:58 +02:00
Fabien Potencier
9301ad00fd merged branch tero/master (PR #1624)
Commits
-------

0149ba9 Added finnish translation for validator messages

Discussion
----------

Created finnish translation file for validator messages
2011-07-10 21:55:14 +02:00
Fabien Potencier
ff92ba79f0 merged branch davideborsatto/translation-it (PR #1623)
Commits
-------

f359e3d Updated italian translations

Discussion
----------

Updated and corrected italian translations

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

by davideborsatto at 2011/07/10 12:41:29 -0700

Previously they were not translated that good, plus there were a few typos here and there.
2011-07-10 21:53:42 +02:00
Tero Alén
0149ba99d6 Added finnish translation for validator messages 2011-07-10 22:44:49 +03:00
Davide Borsatto
f359e3db18 Updated italian translations 2011-07-10 12:37:17 -07:00
Guilherme Blanco
89c8962574 Fixed minor portuguese brazilian messages. File is pretty much up to date, just small glitches. 2011-07-10 12:19:10 -07:00
Fabien Potencier
1a5b14d49d merged branch xmontana/master (PR #1618)
Commits
-------

b8b8869 updated translation to catalan

Discussion
----------

Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ca.xliff
2011-07-10 19:53:41 +02:00
Fabien Potencier
99f5eac71a merged branch wtfzdotnet/patch-2 (PR #1619)
Commits
-------

0be00c1 Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nl.xliff via GitHub

Discussion
----------

Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validato

Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nl.xliff via GitHub
2011-07-10 19:53:25 +02:00
Fabien Potencier
f88a7a78b0 merged branch 77web/add_ja_translation_11_july (PR #1620)
Commits
-------

d53f312 changed "should" to "must" in message 6 and 7. also moved message 32 as replacement of message 5, according to note by yethee
e151c80 updated japanese translations

Discussion
----------

updated japanese translations

Please update japanese translations.
I  picked up some messages from the latest sources of validation classes on your master branch, because translations for many other languages seems not to contain messages for recent validator classes, such as Image,Ip,Locale,Language.
Thanks in advance!

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

by yethee at 2011/07/10 09:23:01 -0700

> "One or more..." is on message#33 in my commit, should I locate #33 just after #5?

Not necessarily, the order of messages is not important, AFAIK.
2011-07-10 19:53:09 +02:00
77web
d53f312e2b changed "should" to "must" in message 6 and 7. also moved message 32 as replacement of message 5, according to note by yethee 2011-07-11 00:50:09 +09:00
Michael Roterman
0be00c13dd Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nl.xliff via GitHub 2011-07-10 08:24:56 -07:00
Xmontana
b8b8869f05 updated translation to catalan 2011-07-10 17:07:42 +02:00
77web
e151c805a0 updated japanese translations 2011-07-10 23:53:04 +09:00
Vladislav
cd7eb02816 Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ru.xliff via GitHub 2011-07-10 06:28:16 -07:00
Javier Eguíluz
bb6eefed55 [FrameworkBundle] Updated Spanish validator translations 2011-07-10 13:39:21 +02:00
Deni
c3f89992b5 [FrameworkBundle] Fixes Russian translations for the validators. 2011-07-10 12:47:22 +04:00
Fabien Potencier
21cf0b15ab merged branch yethee/ru_translations (PR #1601)
Commits
-------

c1cab27 [FrameworkBundle] Updated Russian translations for validators.

Discussion
----------

[FrameworkBundle] Updated Russian translations for validators.

Sync translations with the actual validator constraints.

Removed some translations (they are not found among the constraints):

  - `This value should be instance of class {{ class }}`
  - `This field group should not contain extra fields`
  - `The uploaded file was too large. Please try to upload a smaller file`
2011-07-10 09:58:31 +02:00
Fabien Potencier
bbf2f05566 merged branch excelwebzone/hebrew_translations (PR #1605)
Commits
-------

801e578  Add hebrew translations

Discussion
----------

Add hebrew translations
2011-07-10 09:56:53 +02:00
excelwebzone
801e578112 Add hebrew translations 2011-07-09 10:37:38 -07:00
Christophe Coevoet
7517fa4448 [DoctrineBundle] Fixed the transient test 2011-07-09 16:52:49 +02:00
Deni
c1cab277be [FrameworkBundle] Updated Russian translations for validators. 2011-07-09 18:49:22 +04:00
Christophe Coevoet
f21dc42358 [DoctrineBundle] Fixed the Registry::getEntityManagerForObject method 2011-07-09 16:31:24 +02:00
Joseph Bielawski
c1866e3710 Profiler search typo 2011-07-09 00:42:37 -07:00
Alif Rachmawadi
937af2f7d2 add indonesian translations 2011-07-09 09:52:20 +07:00
Fabien Potencier
aed87c50f0 merged branch aboks/dutch_translations (PR #1586)
Commits
-------

45c2da7 [FrameworkBundle] Updated Dutch validator translations

Discussion
----------

[FrameworkBundle] Updated Dutch validator translations

Synchronized Dutch validator translations for some recent changes.
2011-07-08 10:45:31 +02:00
Arnout Boks
45c2da75cf [FrameworkBundle] Updated Dutch validator translations 2011-07-08 10:39:56 +02:00
Sortex
d0258dd483 [FrameworkBundle]Slovak translations 2011-07-08 09:23:39 +02:00
Fabien Potencier
c85fd081c8 [FrameworkBundle] fixed _internal route when the path contains dots 2011-07-07 17:25:53 +02:00
Fabien Potencier
6645cb44c7 merged branch dlsniper/romanian-validation (PR #1568)
Commits
-------

8a6ac0c Added Romanian translations for validators

Discussion
----------

[Validator] Added Romanian translations

Added all strings up to commit SHA: d58ba34246
2011-07-07 07:10:20 +02:00
Fabien Potencier
430b5cdfa9 merged branch lenar/validator-et (PR #1567)
Commits
-------

b4cdecd Additional et translations

Discussion
----------

[Validator] Additional Estonian translations
2011-07-07 07:09:45 +02:00
Florin Patan
8a6ac0ce4e Added Romanian translations for validators 2011-07-06 18:59:43 -04:00
lenar
b4cdecd423 Additional et translations 2011-07-07 00:24:48 +03:00
jdreesen
39d3a90b6c Sync German translation with commit: d58ba34246 2011-07-06 22:55:00 +02:00
Michel Weimerskirch
a5822314eb Complete Luxembourgish translation 2011-07-06 12:41:51 -07:00
Joseph Bielawski
23ec11949e Revert copy&paste 2011-07-06 10:25:12 -07:00
Joseph Bielawski
7a95330804 Sync polish translation with commit: d58ba34246 2011-07-06 10:22:51 -07:00
Fabien Potencier
498f72ce9c merged branch stof/monolog (PR #1556)
Commits
-------

f8b5f35 [MonologBundle] Refactored the way to configure the email prototype for swiftmailer
874fb95 [MonologBundle] Refactored the configuration of processors

Discussion
----------

Monolog

This refactors the way processors and email prototype are configured in MonologBundle for consistency with the other bundles. The hack using ``@id`` to use a service in the semantic configuration is not used anywhere else in Symfony2.
This removes the ability to use a static callback as processor (or a PHP function) but adds the support of adding a processor only for a given logging channel (for processors attached to the logger) which was not possible previously.

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

by stof at 2011/07/06 07:33:52 -0700

the PR for the doc and the standard edition are coming.
2011-07-06 17:49:40 +02:00
Fabien Potencier
722ad12a2d renamed proxy setting to trust_proxy_headers 2011-07-06 17:42:58 +02:00
Christophe Coevoet
f8b5f350dc [MonologBundle] Refactored the way to configure the email prototype for swiftmailer 2011-07-06 16:25:32 +02:00
Christophe Coevoet
874fb9540a [MonologBundle] Refactored the configuration of processors 2011-07-06 15:52:04 +02:00
Fabien Potencier
14c8cc2962 [DoctrineBundle] ensured that the ORM\ prefix is always set for CLI commands 2011-07-06 15:49:36 +02:00
Fabien Potencier
b9adab9796 merged branch vicb/form/ini-max-size (PR #1542)
Commits
-------

d58ba34 [Validator] Consider the ini directive 'upload_max_filesize' while validating an uploaded file (fixes GH-1441)

Discussion
----------

[Validator] FileValidator support for uploaded files

[Validator] Consider the ini directive 'upload_max_filesize' while validating an uploaded file (fixes GH-1441)

Added validator messages should get translated in all the available languages.
2011-07-06 14:22:15 +02:00
Fabien Potencier
082473659e fixed validation of Doctrine proxy objects 2011-07-06 13:03:38 +02:00
Fabien Potencier
090a51a0fe added Registry::getEntityManagerForObject() to conveniently get the entity manager associated with a given Entity 2011-07-06 12:33:49 +02:00