Commit Graph

6196 Commits

Author SHA1 Message Date
Fabien Potencier
a8faa83708 merged 2.0 2011-10-08 22:58:00 +02:00
Tigran Azatyan
d2d849cf60 First 2011-10-08 22:57:17 +02:00
Fabien Potencier
36f619b57d merged branch tigranazatyan/master (PR #2359)
Commits
-------

05663ec First

Discussion
----------

Armenian Translation

I added armenian translation to Framework Bundle Validators

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

by stof at 2011/10/08 13:48:31 -0700

Can you do a PR based on the 2.0 branch instead ?

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

by tigranazatyan at 2011/10/08 13:51:03 -0700

I do not have skills using github, please do it yourself:)
2011-10-08 22:56:09 +02:00
Tigran Azatyan
05663ec527 First 2011-10-09 01:07:53 +05:00
Fabien Potencier
74bc699b27 moved management of the locale from the Session class to the Request class
The locale management does not require sessions anymore.

In the Symfony2 spirit, the locale should be part of your URLs. If this is the case
(via the special _locale request attribute), Symfony will store it in the request
(getLocale()).

This feature is now also configurable/replaceable at will as everything is now managed
by the new LocaleListener event listener.

How to upgrade:

The default locale configuration has been moved from session to the main configuration:

Before:

framework:
    session:
        default_locale: en

After:

framework:
    default_locale: en

Whenever you want to get the current locale, call getLocale() on the request (was on the
session before).
2011-10-08 18:34:49 +02:00
Christian Raue
2e5869db00 fixed "using $this when not in object context" error for 2.0 branch (replaces #2353) 2011-10-08 14:05:33 +02:00
stealth35
ae0685a314 [Translation] Loader should only load local files 2011-10-07 18:30:56 +02:00
Fabien Potencier
b25a8767ad merged branch schmittjoh/dbalSessionStorage (PR #2182)
Commits
-------

3f8e8c9 fixes a session max lifetime handling
3abb7f3 fixed some conflicts with garbage collection
a1888b2 added a dbal session storage

Discussion
----------

Dbal session storage

Adds a session storage based on Doctrine DBAL.

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

by lsmith77 at 2011/09/14 13:39:28 -0700

guess it would be nice to then provide a service inside the DoctrineBundle that reuses a global DoctrineDBAL connection, guess the connection to use would then need to be configured via the doctrine app config.

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

by schmittjoh at 2011/09/14 13:42:34 -0700

I haven't found a sane way to provide automatic configuration that's why I left this to the user to implement. It's also relatively easy:

```yml
services:
    dbal_session_storage:
        class: Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionStorage
        arguments: [@database_connection]

framework:
    session: { storage_id: dbal_session_storage }

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

by stof at 2011/09/14 13:57:48 -0700

@lsmith77 There is an issue about reusing another DBAL connection: if the transaction is aborted by the ORM, the session could be aborted too as you cannot have 2 independent transactions AFAIK

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

by lsmith77 at 2011/09/14 13:59:57 -0700

not sure how this is relevant. i mean why does the transaction need to be left open? just begin, write, commit ..

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

by stof at 2011/09/14 14:02:39 -0700

and what if the transaction of the ORM is still opened (let's say you use SimpleThingsTransactionalBundle) ?

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

by lsmith77 at 2011/09/14 14:06:12 -0700

well thats a bit of an edge case imho. also i wonder if SimpleThingsTransactionalBundle shouldn't make sure that its transaction is closed before the session is written.

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

by schmittjoh at 2011/09/14 14:06:56 -0700

It closes them.

On Wed, Sep 14, 2011 at 11:06 PM, Lukas Kahwe Smith <
reply@reply.github.com>wrote:

> well thats a bit of an edge case imho. also i wonder if
> SimpleThingsTransactionalBundle shouldn't make sure that its transaction is
> closed before the session is written.
>
> --
> Reply to this email directly or view it on GitHub:
> https://github.com/symfony/symfony/pull/2182#issuecomment-2098100
>

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

by stof at 2011/09/14 14:15:02 -0700

@schmittjoh Does it close them **before** writing the session ?

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

by schmittjoh at 2011/09/14 14:44:15 -0700

I think either commit, or rollback is called, but @beberlei can probably answer that better.

Anyway, it is not really related to this PR because it is up to the user which connection is used.

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

by stof at 2011/09/14 14:58:48 -0700

I know that one of them is called. But if they are called after the session is persisted to the DB, a rollback is an issue as it will rollback the session persistence as well.
The PR is indeed fine. What need to be changed is the doc about how to use it, to advocate using a separate connection instead of the default one (which is used in your example)

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

by schmittjoh at 2011/09/15 02:57:34 -0700

There is no doc yet, but lets see what @fabpot thinks of all of this first.

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

by fabpot at 2011/09/15 04:57:57 -0700

Any benefits over using the PDO session storage?

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

by lsmith77 at 2011/09/15 05:00:50 -0700

cleaner code, potentially better support for niche RDBMS, centralized logging and finally afaik DoctrineDBAL has emulation for nested transactions.

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

by schmittjoh at 2011/09/15 05:11:00 -0700

The benefits (for me) are:

- logging queries
- better interoperability with existing build processes (migrations)
- better database interoperability
- re-using existing connection (I don't have the problem that Stof mentioned above)

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

by beberlei at 2011/09/15 06:18:22 -0700

The nested transactions is the problem here as @stof already said. If you reuse the default connection and use nested transactions that fail then this will make your session not save. That is why the docs should recommend you create a second connection for a dbal based session storage, even if it is using the same database. The PDO session storage would be a second connection besides DBAL aswell.

I like the migrations/schema hook though to create the table automatically through schema commands.

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

by fabpot at 2011/09/15 10:45:31 -0700

ok, looks good to me. Can you add some documentation about its usage (like the possible keys for options)? Is it possible to add some tests too?

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

by jdreesen at 2011/09/22 06:34:11 -0700

why did you close this?

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

by schmittjoh at 2011/09/30 06:26:12 -0700

I can't put more time into this PR, however I'm using it for some time already, and there shouldn't be any major issues as it is basically copy/paste from the PDO session.
2011-10-07 14:11:24 +02:00
Fabien Potencier
50c47aa687 merged branch stloyd/form_texttypes (PR #2343)
Commits
-------

8bd0e42 [Form] Use proper parent (text) for EmailType and TextareaType

Discussion
----------

[2.0][Form] Use proper parent (text) for EmailType and TextareaType

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-07 14:07:29 +02:00
Fabien Potencier
f22566ca19 merged branch stloyd/ScalarTransformer (PR #2341)
Commits
-------

95049ef [Form] Added type check to `ScalarToChoiceTransformer`

Discussion
----------

[2.0][Form] Added type check to ScalarToChoiceTransformer

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-07 14:06:24 +02:00
Joseph Bielawski
8bd0e42233 [Form] Use proper parent (text) for EmailType and TextareaType 2011-10-07 13:47:48 +02:00
stloyd
18a83c67f4 [Form] Simplified a bit FormUtil and extended test coverage 2011-10-07 12:04:26 +02:00
stloyd
95049ef902 [Form] Added type check to ScalarToChoiceTransformer 2011-10-07 12:01:07 +02:00
Fabien Potencier
89fd9653b4 merged branch Seldaek/trans_charset (PR #2339)
Commits
-------

5473d3b [Translation] Allow use of UTF-8 encoded catalogues into non-UTF-8 applications
deb6dea [Translation] Add failing tests to verify that UTF-8 lang files can't be used with another charset

Discussion
----------

Allow use of UTF-8 catalogues in non-UTF-8 applications

This is #2313 but targetting the master branch.

Bug fix: yes
Feature addition: ?:)
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -

The problem I'm having is that, while porting an existing app, we are using UTF-8 everywhere to have a migration path ready, but the current application and DB is still in ISO-8859-1, which means translations containing accented chars are broken.

Also, we didn't hit the issue yet since we don't use forms much, but I imagine we would have similar issues with core translations for the validator which are all UTF-8 encoded.

Note that I explicitly suppressed this conversion in case your application is setup as UTF-8, to make sure most people are not affected by any slow down this introduces.
2011-10-07 12:00:26 +02:00
Jordi Boggiano
5473d3b6c9 [Translation] Allow use of UTF-8 encoded catalogues into non-UTF-8 applications 2011-10-07 11:21:05 +02:00
Helmer Aaviksoo
c4226bb6dc Removed redundant "@return void"-s 2011-10-07 11:15:35 +03:00
Fabien Potencier
a74ae9d325 [HttpFoundation] made X_REWRITE_URL only available on Windows platforms 2011-10-07 08:20:12 +02:00
Fabien Potencier
0e852fe232 Merge branch '2.0'
* 2.0:
  [DoctrineBundle] fixed a unit test (detected thanks to PHP 3.6.0)
  [Form] Fixed lacking attributes in DateTimeType
2011-10-06 21:40:44 +02:00
Fabien Potencier
15f19e50fc [DoctrineBundle] fixed a unit test (detected thanks to PHP 3.6.0) 2011-10-06 21:40:38 +02:00
Fabien Potencier
3f567b8208 [FrameworkBundle] moved a parameter in the same file as the one where the service is defined for better consistency 2011-10-05 19:17:58 +02:00
Katsuhiro OGAWA
828b18f467 [Form] Fixed lacking attributes in DateTimeType 2011-10-05 17:57:43 +09:00
Fabien Potencier
69922c41a9 merged branch SongoQ/polish_translations (PR #2319)
Commits
-------

4909169 Typo, should be "znaków"

Discussion
----------

[FrameworkBundle] Polish validator translations - Typo, should be "znaków"
2011-10-04 16:20:42 +02:00
Marcin Chylek
4909169ca4 Typo, should be "znaków" 2011-10-04 15:05:36 +02:00
Deni
9219cf9f7d [FrameworkBundle] Sync the Russian translations with the SizeLength constraint 2011-10-04 16:49:04 +04:00
Fabien Potencier
1f2e72d84a updated VERSION for 2.0.4 2011-10-04 13:47:14 +02:00
Fabien Potencier
1fa3d8e701 merged branch SongoQ/polish_translations (PR #2315)
Commits
-------

31840b9 Updated Polish validator translations (trans-unit id="47" and id="48")

Discussion
----------

Updated Polish validator translations (trans-unit id="47" and id="48")
2011-10-04 09:36:45 +02:00
Fabien Potencier
d81131ea65 merged branch alifity/id-trans-unit-47-48 (PR #2316)
Commits
-------

8404b35 Updated indonesian translations for trans-unit 47 and 48

Discussion
----------

Updated indonesian translations for trans-unit 47 and 48
2011-10-04 09:36:35 +02:00
Fabien Potencier
fbe9aa526e merged 2.0 2011-10-04 09:32:13 +02:00
Alif Rachmawadi
8404b354ba Updated indonesian translations for trans-unit 47 and 48 2011-10-04 10:26:20 +07:00
Marcin Chylek
31840b97c6 Updated Polish validator translations (trans-unit id="47" and id="48") 2011-10-03 23:13:07 +02:00
Fabien Potencier
cf4a91e923 [ClassLoader] fixed usage of trait_exists() 2011-10-03 18:02:59 +02:00
excelwebzone
eac2a7781d Oops.. translated the variable by mistake 2011-10-03 07:50:24 -07:00
excelwebzone
51b3b59b54 Updated Hebrew validator translations (trans-unit id="48") 2011-10-03 07:48:23 -07:00
Fabien Potencier
6b16757199 [Security] changed a RuntimeException to LogicException for consistencies between the different Token classes (closes #2310) 2011-10-03 09:03:36 +02:00
Fabien Potencier
8d6add638b [DoctrineBridge] fixed directory reference when the directory cannot be created 2011-10-03 08:58:15 +02:00
Danny Berger
54196382b7 [HttpKernel] Show the actual directory needing to be created. 2011-10-03 02:08:17 -04:00
Arnout Boks
0299d38570 [FrameworkBundle] Updated Dutch validator translations 2011-10-01 14:26:33 +02:00
Fabien Potencier
c78921f0d3 merged branch jalliot/missing-guessers (PR #2306)
Commits
-------

ee0fe7a Added guessers for Size and SizeLength constraints

Discussion
----------

Added guessers for Size and SizeLength constraints

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -

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

by jalliot at 2011/09/30 13:40:37 -0700

BTW, I've noticed that some constraints currently don't have guessers in 2.0:

* ``False`` (which could be guessed as a checkbox)
* ``True`` (which could be guessed as a required checkbox)
* ``Choice`` (which could be guessed as a choice type with medium confidence and with the choice list being guessed as the list provided for the constraint)

Are there any reasons why this is not implemented in 2.0 or should I try to make a PR for it?

There is also the ``Collection`` case but I guess it would be too difficult for this one...
2011-09-30 23:05:31 +02:00
Fabien Potencier
b639d74c5c merged branch jalliot/trans-fr (PR #2305)
Commits
-------

f9b2be9 Added french translation for SizeLength and UserPassword constraints

Discussion
----------

Added french translation for SizeLength and UserPassword constraints

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

by fabpot at 2011/09/30 13:45:46 -0700

47 is already taken for "This value should be the user current password". Should be 48.

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

by jalliot at 2011/09/30 13:59:01 -0700

@fabpot Fixed and added translation for 47 as well.
2011-09-30 23:02:43 +02:00
Jordan Alliot
f9b2be9c9c Added french translation for SizeLength and UserPassword constraints 2011-09-30 22:56:56 +02:00
Jordan Alliot
ee0fe7a2b5 Added guessers for Size and SizeLength constraints 2011-09-30 22:31:52 +02:00
Fabien Potencier
6295e55329 [DoctrineBundle] made the previous fix only available in the development environment 2011-09-30 18:10:34 +02:00
Fabien Potencier
87416b4756 [DoctrineBundle] tweaked previous merge 2011-09-30 18:08:38 +02:00
Fabien Potencier
4790a5e43f merged branch Gregwar/proxy_file_issue (PR #1968)
Commits
-------

0e00e3f [DoctrineBundle] CS
0c4b793 [DoctrineBundle] Fixed performances issues on "On-demand" proxy file generation
e866a67 [DoctrineBundle] Tries to auto-generate the missing proxy files on the autoloader

Discussion
----------

[DoctrineBundle] Tries to auto-generate the missing proxy files on the autoloaded

See:
https://github.com/symfony/symfony/issues/1965
https://github.com/symfony/symfony/issues/1535

This fix is not really clean and there's maybe a factorizing work to do on it, but this work and avoid me spending my day deleting session cookies each time I clear cache.

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

by stloyd at 2011/08/23 10:37:28 -0700

You should follow Symfony2 CS (http://symfony.com/doc/current/contributing/code/standards.html).

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

by ruudk at 2011/09/26 02:50:13 -0700

+1

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

by fabpot at 2011/09/27 07:01:51 -0700

It looks like a bug fix, so this PR should be closed and a new one based on the 2.0 branch should be open. @beberlei: are you fine with this patch?

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

by beberlei at 2011/09/29 04:24:22 -0700

What is this for? I dont understand the bug and the solution here screams cache slam.

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

by beberlei at 2011/09/29 04:34:02 -0700

Ok i get the problem but the solution is still a monsterous hack. Can we find a real solution to the problem? There has to be one.

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

by Gregwar at 2011/09/29 04:34:25 -0700

@beberlei, when an user is authenticated for instance, there can be proxies serialized in session.

Si if you clear the cache in dev environment you'll get an error because the matching proxy classes won't exist and you'll be forced to clear your cookies and reauth, which can be annoying

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

by Gregwar at 2011/09/29 04:38:45 -0700

@beberlei, yes, I agree that we should do something more elegant, but the problem is that when PHP "meet" the proxy class we can't really know what was the "original" class it is supposed to extend

And as @schmittjoh said, this will only be executed very rarely

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

by beberlei at 2011/09/29 05:18:35 -0700

You agree you want something more suitable and still want this to be merged?

To ease the immediate pain wr could allow this however only in debug mode. A real solution here is maybe to move the proxy files out of the env folders. Rhey dont depend ont the env after all.

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

by stloyd at 2011/09/29 05:21:33 -0700

Proxy is not depending on env, but generation of proxy is... So this solution will be hard IMO, or even unacceptable...

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

by Gregwar at 2011/09/29 05:25:39 -0700

@beberlei what I meant is that I agree that's dirty but I don't think of anything better to solve this...

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

by fabpot at 2011/09/29 06:23:03 -0700

Even if the current patch is not the best solution, we should probably apply it to fix the problem and think about a better solution afterwards. Does it sound good for everybody?
2011-09-30 18:07:40 +02:00
Daniel Holmes
84808f40b3 [DependencyInjection] Removed unused property
Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-01 00:46:18 +10:00
Fabien Potencier
5c8a2fb48d [Routing] fixed route overriden mechanism when using embedded collections (closes #2139) 2011-09-30 12:01:46 +02:00
Danny Berger
e70c884f49 [Bridge/Monolog] Fix WebProcessor to accept a Request object. 2011-09-30 01:58:45 -04:00
Fabien Potencier
1467bdb868 added RouterInterface::getRouteCollection() 2011-09-30 07:48:34 +02:00
Fabien Potencier
b3ea939c35 merged branch jalliot/event-subscriber (PR #2021)
Commits
-------

3223c5a Removed now useless test
21cf0ac Backported new behaviour from PR #2148 and removed check for interface at run-time
8b240d4 Implementation of kernel.event_subscriber tag for services.

Discussion
----------

Added missing kernel.event_subscriber tag (closes #2012)

This PR adds a ``kernel.event_subscriber`` tag which allows to register services as event subscribers in the same way ``kernel.event_listener`` allows to register them as event listeners.
The service is still lazy loaded and the DIC does not need to be recompiled for every modification in the service's code.

There is one important thing to remember:
If the service is created by a factory, the class parameter **MUST** reflect the real class of the service, although it is not needed at the moment for the DIC. For that issue, we could either forbid services created by factories or add a note to the documentation.

This PR closes #2012.

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

by jalliot at 2011/08/24 06:42:18 -0700

I'm not sure the test is good enough so feel free to add some more.

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

by jalliot at 2011/08/25 03:46:20 -0700

I re-implemented the check for EventSubscriberInterface in ContainerAwareEventDispatcher because I think the overhead is minimum and it allows to use this method even without the tag (at run-time).
I also added some tests for RegisterKernelListenersPass.

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

by stof at 2011/09/04 02:42:00 -0700

@jalliot Your branch conflicts with the current master. could you rebase it ?

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

by jalliot at 2011/09/04 02:57:03 -0700

Rebased

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

by jalliot at 2011/09/13 02:19:46 -0700

@fabpot What do you think about this PR? At the moment, the subscribers are not really usable in Symfony2 because of the lack of this tag.

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

by fabpot at 2011/09/13 04:17:46 -0700

I don't like subscribers. There are other PRs on adding more support for them, but the reality is that they are complex for no added benefit. I'm wondering if it wouldn't be better to just remove them altogether.

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

by jalliot at 2011/09/13 04:38:20 -0700

@fabpot Well I prefer listeners too but I think that if Symfony2 does support subscribers (which it does at the moment), it should do it properly and completely, thus allowing to register subscriber services like here or to register several methods for one same event like in #2148.
But I guess that if you merged those 2 PRs (well actually this one would have to be modified first if #2148 is merged but I'll do it then), many use cases would be covered and people should stop asking for more support :) (except maybe for removing the static modifier but this would be wrong IMO and prevent entirely this PR).

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

by fabpot at 2011/09/28 11:47:10 -0700

@jalliot: #2148 has been merged. Can you update this PR accordingly? thanks.

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

by jalliot at 2011/09/28 12:00:44 -0700

Sure thing. Will do it as well as removing the check for the interface tonight or tomorrow :)

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

by jalliot at 2011/09/29 08:53:17 -0700

@fabpot Check for interface removed and #2148 merged. Also rebased on latest master.

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

by fabpot at 2011/09/29 09:09:11 -0700

Tests do not pass.

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

by jalliot at 2011/09/29 09:18:48 -0700

@fabpot Fixed
2011-09-29 23:27:29 +02:00
Jordan Alliot
3223c5a1f3 Removed now useless test 2011-09-29 18:17:30 +02:00