Skip to content

use the new doctrine compiler pass to map the model classes directly #1081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
May 25, 2013
Merged

Conversation

dbu
Copy link

@dbu dbu commented Apr 8, 2013

this is to show how we would use the compiler pass of the doctrine bundle to map our model classes directly. See symfony/symfony#7599

this is done for orm, mongo and couch. we have a simplified compiler pass in this bundle for backwards compatibility with symfony < 2.3. that can be removed once this bundle is declared to only work with symfony 2.3.

@stof
Copy link
Member

stof commented Apr 12, 2013

This is a BC break for users: If they extend Entity\User, they won't get the inherited mapping of the MappedSuperclass anymore as Doctrine ORM stops reading metadata when it finds a transient class (not lookign if parent classses are mapped)

@dbu
Copy link
Author

dbu commented Apr 12, 2013

oh, that was not intended. then we would need to keep an empty mappedsuperclass mapping for this class? otherwise we rather should delete the class right away to make people notice the BC break. which do you prefer?

@stof
Copy link
Member

stof commented Apr 13, 2013

@dbu I would prefer keeping a mapped superclass for the entity (with no mapping it in as everything is inherited) to keep the BC

@dbu
Copy link
Author

dbu commented Apr 13, 2013

alright, will fix that (on monday, the weather is just too nice to stay inside for a long moment :-)

do you have input on the listeners locations? and i plan to write a cookbook entry describing best practices for bundles providing multi-database models - what could be a better folder strategy if a bundle indeed needs a persistence specific model class for some reason? (like PHPCR-ODM having a parent and a name field)

@stof
Copy link
Member

stof commented Apr 13, 2013

@dbu As listeners are specific to Doctrine, I suggest Doctrine if they are common to all and Doctrine\(ORM|PHPCR) if they need to have different implementations (eventually putting them in a Listener subfolder if you also need custom repositories and custom doctrine types for instance).

@dbu
Copy link
Author

dbu commented Apr 15, 2013

adjusted to the factory method of the compiler pass and re-added empty mappings to keep BC

if (! class_exists('Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterMappingsPass')) {
// TODO: provide a temporary implementation of the compiler pass in FOSUserBundle
// so people can already use the Model class even with older symfony?
return;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should i copy the compiler pass into FOSUserBundle so that we have a workaround until we can depend on the right symfony bridge and doctrine versions? otherwise things would not be backwards compatible as the mapping on Entity/Document/... is just a stub now and relies on the class in Model being properly mapped by doctrine.

@dbu
Copy link
Author

dbu commented Apr 17, 2013

i added support for mongodb now. i think it works, though i have no clue of mongodb. when the mapping is active i get

> db.system.indexes.find()
{ "v" : 1, "key" : { "_id" : 1 }, "ns" : "test_database.User", "name" : "_id_" }
{ "v" : 1, "key" : { "usernameCanonical" : 1 }, "unique" : true, "ns" : "test_database.User", "name" : "usernameCanonical_1" }
{ "v" : 1, "key" : { "emailCanonical" : 1 }, "unique" : true, "ns" : "test_database.User", "name" : "emailCanonical_1" }

when the parent mapping did not work, i only got the _id so it does something. i never got more metadata in mongo, even when using the old mapping with the Document folder. so i hope its correct what i do here.

@@ -25,5 +27,25 @@ public function build(ContainerBuilder $container)
{
parent::build($container);
$container->addCompilerPass(new ValidationPass());

if (! class_exists('Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterMappingsPass')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you move this logic into a private method if you want to return early ? this will void weird issues if someone else adds another piece of code in build later and does not notice this early return

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point. i will add a fallback instead of return here, but still keeps the code more understandable

@stof
Copy link
Member

stof commented Apr 23, 2013

We should find a way to keep the compatibility with Symfony 2.2. I would like to avoid maintaining 2 versions of FOSUserBundle if possible

@dbu
Copy link
Author

dbu commented Apr 25, 2013

i moved things into a method and added a legacy support compiler pass (yeah symfony 2.2 is already legacy...)

@dbu
Copy link
Author

dbu commented May 5, 2013

how to handle couch, as the couch bundle is not even installable with symfony 2.2? should i just add legacy support for the mapping for it and test with symfony 2.1?

@dbu
Copy link
Author

dbu commented May 7, 2013

i somehow tricked couch to get installed in my testbed and made things work. see doctrine/DoctrineCouchDBBundle#27 - i think mapped superclass is broken in couchdb, so no clue if what fos userbundle was offering was ever working at all. with the fixes discussed in the couch bundle PR i get things to work however, so imho we can merge here and hope couchdb bundle gets fixed someday. we don't break anything that used to work as far as i can tell.

classes are deprecated, you should update your User and Group classes to extend
the classes found in Model directly.
The old classes will stay around for a while and continue to work, but will be
dropped for version 2.0.
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i just wrote this assuming there will be a 1.3.2 sometimes after this PR is merged, and that we want to drop the classes in 2.0. we can also do it later, they don't really hurt (except the eyes :-)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master is the dev branch of 2.0, not the maintenance branch for 1.3. So it won't be in a 1.3.2 release

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, then we dont want to have this in any 1.x branch? Just thinking it should be available asap so that people Start using it. Do we need the bc entity classes in 2.0?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say yes for now, to avoid breaking hard for people already using 2.0.x-dev. but with a trigger_error(E_USER_DEPRECATED) in the constructor so that they know they need to change their code before 2.0 stable.

@stof stof merged commit 33271c9 into FriendsOfSymfony:master May 25, 2013
@dbu dbu deleted the map-models branch May 26, 2013 11:49
@sroze
Copy link

sroze commented Jun 5, 2013

@dbu I've the same problem. I updated FOSUserBundle and I got this error.
I (we) have a user model that extends Model\User on which I added my own mappings, especially I have my own roles voter and I don't save them in the user model.
To make it working after this pull request, I had to remove every of my mappings that are also in Model\User and now I have a "roles" field in my table, but I don't want, and I have no choice...

@dbu
Copy link
Author

dbu commented Jun 6, 2013

ah, now i got what you mean. hm, indeed i see the issue. a quickfix you can do is

  • have Model\User class in your bundle that just extends the FOSUserBundle Model\User. but no mappings or anything for it
  • then extend that class from Entity\User

doctrine walks the class hierarchy to find mapped superclasses, but as soon as it encounters a class not mapped it stops. if i am not totally mistaken this way you get rid of the base mapping.

alternatively you can just copy the methods and fields from the FOSUserBundle User class into your class and not extend anything, but just implement UserInterface. then you don't have any methods or fields on the class you don't need (like when you don't need a roles field at all).

@stof what would be the clean solution for this? using "custom" instead of "orm" for the manager type would prevent the mapping from happening, but then one would have to manually ensure the doctrine listener gets loaded and tagged. do we need a different parameter fos_user.backend_type_orm_map that defaults to fos_user.backend_type_orm but can be overridden to not load the mapping but still load the orm services? (and similar for couch and mongo of course). Or should we promote not extending the Model\User but implement UserInterface?

@mvrhov
Copy link

mvrhov commented Jul 24, 2013

@dbu we really need a way to disable the automatic loading of mapping information.

P.S. Disabling it by trying to unset fos_user.backend_type_* cannot work as the container builder doesn't have the functionality to do so...

@dbu
Copy link
Author

dbu commented Jul 27, 2013

if you set the storage to custom, you won't get any mapping driver
active. you then might want to manually load the orm.xml and
orm_group.xml from Resources/config/ if you still want the user manager
and user listener services.

ondrejmirtes pushed a commit to ondrejmirtes/symfony that referenced this pull request Nov 25, 2013
This PR was squashed before being merged into the master branch (closes symfony#7599).

Discussion
----------

[Doctrine-Bridge] add a base compiler pass class to register doctrine mappings

| Q             | A
| ------------- | ---
| Bug fix?      |  no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | not on code, but defining best practices
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | symfony/symfony-docs#2507

Reusable bundles providing model classes should not rely on the automapping provided by the doctrine bundles. What is more, the same model can often be mapped to Doctrine ORM, MongoODM, CouchODM and PHPCR-ODM.

This pull request adds a base class for a compiler pass that the concrete doctrine bundles extend to provide a default compiler pass that makes it trivial for bundles to register their mappings. See doctrine/DoctrineBundle#177

The FOSUserBundle shows how this would look in practice. See FriendsOfSymfony/FOSUserBundle#1081

I will create the documentation pull request as well as pull requests for the mongo, couch and phpcr bundles once we agree how exactly to do this.

Commits
-------

099fd9f [Doctrine-Bridge] add a base compiler pass class to register doctrine mappings
@juanmf
Copy link

juanmf commented Jul 7, 2014

It'd be cool to have an example snippet of how to override the mappings, for instance to see how to implement roles differently. I've seen many questions around with misleading answers. I don't know if this is the recommended implementation of an override but this is what I could do by reading your docs, which are great by the way.

Edit: just created a repo with this bundle: https://github.com/juanmf/UserBundle

@merk
Copy link
Member

merk commented Jul 31, 2014

@dbu Now that doctrine/DoctrineBundle#177 has been tagged in a release we're seeing a few people report that there are weird errors with compiler passes conflicting when using 2.0@dev of this bundle and 1.3@beta of DoctrineBundle.

Is there something that needs to be done in FOSUserBundle to make sure we're compatible with DoctrineBundle 1.3?

@dbu
Copy link
Author

dbu commented Aug 4, 2014

@merk: from users using doctrine orm or something else? https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/DependencyInjection/Compiler/RegisterMappingsPass.php is a copy-paste of the compiler pass in DoctrineBundle, as at the time (and still) we wanted to support symfony < 2.3 and DoctrineBundle < 1.3. there is this check.

the doctrine code is this, the code that is used with older Doctrine versions provided by this bundle is this

i don't see the semantical difference or what we do, or a bug. but maybe there is - what exactly are the errors that come up?

@merk
Copy link
Member

merk commented Aug 4, 2014

I'll go through my logs to see what was said exactly, sorry - I should have done that before pinging you.

@dbu
Copy link
Author

dbu commented Aug 5, 2014

no worries. i had a good look at the compiler pass again and at least
can confirm that DoctrineBundle 1.2 does not provide the pass yet, so
only 1.3 leads to using the compiler pass provided by symfony + doctrine
instead of the local one.

@richardudovich
Copy link

hey guys, ive been following the following instructions...
http://stackoverflow.com/questions/22718628/fosuserbundle-override-roles-property-roles-in-acme-demobundle-entity-user
but im getting "Unrecognized field: usernameCanonical" error when trying to
authenticate... , ive debugged it and can see that getClassMetadata does
not return the meta data of inherited class, but i am not sure why... if
anyone can give me a hand with this would be appreciated...

im using same version of fosuserbundle as in the stackoverflow post...

On Tue, Aug 5, 2014 at 4:09 PM, David Buchmann [email protected]
wrote:

no worries. i had a good look at the compiler pass again and at least
can confirm that DoctrineBundle 1.2 does not provide the pass yet, so
only 1.3 leads to using the compiler pass provided by symfony + doctrine
instead of the local one.


Reply to this email directly or view it on GitHub
#1081 (comment)
.

Regards

*This e-mail and any attachments may contain confidential and privileged
information. If you are not the intended recipient, please notify the
sender immediately by return e-mail, delete this e-mail and destroy any
copies. Any dissemination or use of this information by a person other than
the intended recipient is unauthorized and may be illegal. *

@juanmf
Copy link

juanmf commented Aug 6, 2014

@richardudovich have you edited your composer.json as shown? (And composer
updated)
El ago 6, 2014 1:57 a.m., "richardudovich" [email protected]
escribió:

hey guys, ive been following the following instructions...

@richardudovich
Copy link

Hey, thanks for getting back to me, i have updates my composer file...
I have included it here for a reference: http://pastebin.com/0viTPgMM

On Wed, Aug 6, 2014 at 10:41 PM, Juan Manuel [email protected]
wrote:

@richardudovich have you edited yor composer.json as shown? (And composer
uodated)
El ago 6, 2014 1:57 a.m., "richardudovich" [email protected]
escribió:

hey guys, ive been following the following instructions...

http://stackoverflow.com/questions/22718628/fosuserbundle-override-roles-property-roles-in-acme-demobundle-entity-user
but im getting "Unrecognized field: usernameCanonical" error when trying
to
authenticate... , ive debugged it and can see that getClassMetadata does
not return the meta data of inherited class, but i am not sure why... if
anyone can give me a hand with this would be appreciated...

im using same version of fosuserbundle as in the stackoverflow post...

On Tue, Aug 5, 2014 at 4:09 PM, David Buchmann [email protected]

wrote:

no worries. i had a good look at the compiler pass again and at least
can confirm that DoctrineBundle 1.2 does not provide the pass yet, so
only 1.3 leads to using the compiler pass provided by symfony +
doctrine
instead of the local one.


Reply to this email directly or view it on GitHub
<

https://github.com/FriendsOfSymfony/FOSUserBundle/pull/1081#issuecomment-51153987>

.

Regards

*This e-mail and any attachments may contain confidential and privileged
information. If you are not the intended recipient, please notify the
sender immediately by return e-mail, delete this e-mail and destroy any
copies. Any dissemination or use of this information by a person other
than
the intended recipient is unauthorized and may be illegal. *


Reply to this email directly or view it on GitHub
<
https://github.com/FriendsOfSymfony/FOSUserBundle/pull/1081#issuecomment-51293897>

.


Reply to this email directly or view it on GitHub
#1081 (comment)
.

Regards

*This e-mail and any attachments may contain confidential and privileged
information. If you are not the intended recipient, please notify the
sender immediately by return e-mail, delete this e-mail and destroy any
copies. Any dissemination or use of this information by a person other than
the intended recipient is unauthorized and may be illegal. *

@juanmf
Copy link

juanmf commented Aug 6, 2014

Mmm.. Are you activating these mappings in your config.yml?

doctrine:
    orm:
        auto_generate_proxy_classes: "%kernel.debug%"
#        auto_mapping: true
        default_entity_manager: default
        entity_managers:
            default:
                connection: default
                mappings:
                    ApplicationUsuarioBundle: ~ # This is my UserBundle.

I think it might be more accurate to follow this discussion in stackoverflow...

@richardudovich
Copy link

Nope, i am using auto_mapping: true

On Thu, Aug 7, 2014 at 12:53 AM, Juan Manuel [email protected]
wrote:

Mmm.. Are you activating these mappings in your config.yml?

doctrine:
orm:
auto_generate_proxy_classes: "%kernel.debug%"# auto_mapping: true
default_entity_manager: default
entity_managers:
default:
connection: default
mappings:
ApplicationUsuarioBundle: ~ # This is my UserBundle.


Reply to this email directly or view it on GitHub
#1081 (comment)
.

Regards

*This e-mail and any attachments may contain confidential and privileged
information. If you are not the intended recipient, please notify the
sender immediately by return e-mail, delete this e-mail and destroy any
copies. Any dissemination or use of this information by a person other than
the intended recipient is unauthorized and may be illegal. *

@dbu
Copy link
Author

dbu commented Aug 7, 2014

hm, could it be that auto_mapping collides with this bundle registering the mappings?

for FOSUserBundle 2.0, we should probably completely drop the BC code in Entity and Document to avoid this issue.

@richardudovich
Copy link

So, at the end of the day i just want to know if the example posted in the
previous email actually works? considering same version as shown in the
example are used... can anyone actually verify this?

On Thu, Aug 7, 2014 at 4:17 PM, David Buchmann [email protected]
wrote:

hm, could it be that auto_mapping collides with this bundle registering
the mappings?

for FOSUserBundle 2.0, we should probably completely drop the BC code in
Entity and Document to avoid this issue.


Reply to this email directly or view it on GitHub
#1081 (comment)
.

Regards

*This e-mail and any attachments may contain confidential and privileged
information. If you are not the intended recipient, please notify the
sender immediately by return e-mail, delete this e-mail and destroy any
copies. Any dissemination or use of this information by a person other than
the intended recipient is unauthorized and may be illegal. *

@juanmf
Copy link

juanmf commented Aug 7, 2014

@richardudovich I'm using this USerBundle in two different projects successfully. I'll make a repo with it, I might have missed something in my documentation. Let me know if you manage to make it work and why didn't it work before..

Done: https://github.com/juanmf/UserBundle

@richardudovich
Copy link

Thanks, that would be appreciated

On Thu, Aug 7, 2014 at 6:09 AM, Juan Manuel [email protected]
wrote:

@richardudovich https://github.com/richardudovich I'm using this
USerBundle in two different projects successfully. I'll make a repo with
it, I might have missed something in my documentation.


Reply to this email directly or view it on GitHub
#1081 (comment)
.

Regards

*This e-mail and any attachments may contain confidential and privileged
information. If you are not the intended recipient, please notify the
sender immediately by return e-mail, delete this e-mail and destroy any
copies. Any dissemination or use of this information by a person other than
the intended recipient is unauthorized and may be illegal. *

@dbu
Copy link
Author

dbu commented Aug 8, 2014

we had this discussion: doctrine/DoctrinePHPCRBundle#152 (comment)

The issue is therefore triggered when:

  1. You are using automapping
  2. You have a Document namespace
  3. You have mapping files in the default Resources/config/doctrine folder
  4. The classes in your Document namespace are NOT odm documents but are named the same thing as your odm documents

but i don't think we have this situation here.

are people having problems using orm or mongo or couch?

@richardudovich
Copy link

Well if Juan can create repo with his version working just so i can get an
idea that would be appreciated.

On Fri, Aug 8, 2014 at 10:02 PM, David Buchmann [email protected]
wrote:

we had this discussion: doctrine/DoctrinePHPCRBundle#152 (comment)
doctrine/DoctrinePHPCRBundle#152 (comment)

The issue is therefore triggered when:

  1. You are using automapping
  2. You have a Document namespace
  3. You have mapping files in the default Resources/config/doctrine folder
  4. The classes in your Document namespace are NOT odm documents but are
    named the same thing as your odm documents

but i don't think we have this situation here.

are people having problems using orm or mongo or couch?


Reply to this email directly or view it on GitHub
#1081 (comment)
.

Regards

*This e-mail and any attachments may contain confidential and privileged
information. If you are not the intended recipient, please notify the
sender immediately by return e-mail, delete this e-mail and destroy any
copies. Any dissemination or use of this information by a person other than
the intended recipient is unauthorized and may be illegal. *

@xabbuh
Copy link
Member

xabbuh commented Aug 10, 2014

@juanmf
Copy link

juanmf commented Aug 10, 2014

@ChristianFlothmann Yes. That's it. Sorry I could not reach the laptop. CC
@richardudovich
El ago 10, 2014 1:30 p.m., "Christian Flothmann" [email protected]
escribió:

@richardudovich https://github.com/richardudovich It's
https://github.com/juanmf/UserBundle, isn't it?


Reply to this email directly or view it on GitHub
#1081 (comment)
.

stof added a commit that referenced this pull request Jan 19, 2015
This PR was submitted for the master branch but it was merged into the 1.3.x branch instead (closes #1724).

Discussion
----------

Update groups.md

Commits
-------

8983c9d Update groups.md
4ceecb6 Merge branch '1.3.x'
2c378af Merge branch '1.3.x'
3565dfb Merge branch '1.3.x'
9714a92 minor #1652 Remove quotes as they are invalid syntax (sekjun9878)
d731615 Remove quotes as they are invalid syntax
cac56e0 Merge pull request #1635 from apsylone/patch-1
05b6c30 Merge pull request #1636 from crash21/master
b277f7c Rename FOSUserBundle.gr.yml to FOSUserBundle.el.yml
f4f7dff Rename validators.gr.yml to validators.el.yml
659b5fe Update overriding_controllers.md
3be6e7b minor #1585 Add missing pt_BR translations (andreia)
327a7e1 Add missing pt_BR translations
e5ee24f Fixed the retrieval of the DI parameter in the controller
c6ee27d minor #1624 simplifying controllers by using Symfony Controller shortcuts (gondo)
7dab23d simplifying controllers by using Symfony Controller shortcuts
96e4542 Removed the BC layer for Symfony 2.1 in the previous merge
d47ad32 minor #1376 Hide user password in CLI if possible (nykopol)
f6be7fd Hide user password in CLI if possible
0619989 minor #1376 [WCM] Hide user password in CLI if possible (nykopol)
b121804 [WCM] Hide user password in CLI if possible
1e4689e minor #1614 Removed the deprecated entity classes (stof)
5c03ad2 minor #1613 Removed the option to switch to a different templating engine (stof)
56bd660 Updated the changelog
c27d16a minor #1257 Issue #1192 - removed isUser() (jaspernbrouwer)
e073ce7 minor #1556 update validators.ar.yml (Arkni)
047b0e6 Removed the deprecated entity classes
747de84 Fix typo in validators.ar.yml
bd15d22 Removed a useless test
f9abc64 Removed the option to switch to a different templating engine
20b97f6 minor #1528 [DX] Extends base controller Symfony class instead of ContainerAware (tgalopin)
05f7f43 Bumped the Symfony dependency to 2.3
f492498 Switched to PSR-4 instead of using target-dir in composer
db749b3 Removed useless translations
8488843 Tweaked the handling of error message in the login page
36d2dd2 minor #1149 Translations for the security messages (b-durand)
a883bcb Translations for the security messages
5a53273 Updated the changelog for 2.0.0-alpha1
364330c Merge branch '1.3.x'
349b637 minor #1400 [docs] validate invitation on registration only (nnscr)
a05e866 [docs] validate invitation on registration only
f89f380 Merge pull request #1575 from lucciano/patch-1
353216f Merge pull request #1318 from crash21/master
1813840 Merge pull request #1194 from sstok/patch-3
e3f8fcd Merge pull request #1515 from Dudytz/master
559655e Merge pull request #1554 from waldermort/patch-1
d13bfc2 Merge pull request #1599 from fejese/cleanup-uses
5f313d0 Cleaning up uses
7001669 Merge pull request #1594 from xavierfaucon/patch-2
8d8cfaf Update email.txt.twig
e009ce7 Merge pull request #1591 from aferrandini/group-routing-configuration-in-one-file
a6ca14a Add one single routing file and update documentation
094bea6 Improved the documentation about overwriting forms
9e5d620 Update groups.md
8acb3aa Update groups.md
7db989e Update groups.md
27a84ce Merge pull request #1560 from jaimeninolesjimeno/patch-1
03edefb Actualizar traducción FOSUserBundle.es.yml
1fe261d Merge pull request #1555 from Arkni/master
1d586ca Fix spelling errors in FOSUserBundle.ar.yml and validators.ar.yml
fe9ca48 Merge pull request #1552 from andrewmyhay/patch-1
6e94ac9 Update Changelog.md
567f72c Update validators.uk.yml
ef7ca32 Merge pull request #1432 from Szymciosek/patch-2
5a1a917 Merge pull request #1433 from Szymciosek/patch-3
f0e4ee9 Merge pull request #1532 from Nyholm/patch-1
62ee628 Added HHVM to travis.yml
853ae14 Merge branch '1.3.x'
27b6ac3 Merge pull request #1482 from mdurys/master
f10671a Merge pull request #1493 from ZiedJlassi/patch-2
42c6d18 Merge pull request #1518 from ysramirez/patch-1
be04c3b [DX] Extends base controller Symfony class instead of ContainerAware
ba3e099 Merge pull request #1525 from ousmaneNdiaye/FixErrorDoc
49648fa Fixed error : AcmeUserBundle should be compatible with FOS\UserBundle...
36fc739 Update FOSUserBundle.en.yml
8fa4614 Renamed to align with validators.pt.yml
71ed250 Merge branch '1.3.x'
a93c355 Merge pull request #1502 from vlad88sv/master
a176e88 Update index.md
b83dd8d Suggestion on the bundle install step 1
0b52c14 adding missing translation for security login
3969d7f Merge pull request #1491 from aitboudad/patch-2
63e308c [SecurityContext] Use SecurityContextInterface.
13c173f Merge pull request #1486 from yosmanyga/patch-1
dfc9dfe Fixed minor typo
254d2b6 Translated "User account is locked." error message
e4c000a Merge pull request #1470 from miukoba/master
eae85fd Added Japanese translation for password.mismatch
fa60226 Merge pull request #1463 from tweini/patch-1
041887f Merge pull request #1466 from toaotc/patch-1
9e6dfa6 fix documentation `fos_user.from_email.sender_name`
9895346 Merge pull request #1465 from haphan/patch-1
87473fa Fix consistency in Vietnamsese translation
3750c0c Merge pull request #1464 from liverbool/master
b91b81e translate to Thai.
8a23bdf translate to Thai.
3e06b5a Create FOSUserBundle.th.yml
e7ad071 Note on deprecation
f8e9255 Merge pull request #1455 from rjbijl/dutch-translation
8d2c9f4 Update FOSUserBundle.nl.yml
9b8bbbc Merge pull request #1444 from mathewrapid/master
c410317 Merge pull request #1453 from allanbrault/patch-1
54c1ac5 Update user_manager.md
4872585 Update FOSUserBundle.sv.yml
6051f59 Added invalid message when passwords do not match
7867dfc Merge pull request #1405 from sof1105/patch-1
6a79d37 Merge pull request #1431 from Szymciosek/patch-1
4f99643 Update UserManipulator.php
6147dc7 Update User.php
fabdb1f Update Group.php
815055b Merge pull request #1429 from jdreesen/patch-5
91ebe88 fixed german translation
ae2be6c Merge pull request #1416 from mbonneau/master
a331543 Merge pull request #1415 from tuxone/patch-1
3530753 Corrected typo in user_manager.md
e135b0d Update FOSUserBundle.it.yml
20e6259 Updating the configuration_reference.md
23d15ad Merge pull request #1402 from Smart-Core/master
62397ec Add missed message translation
da9a973 Merge pull request #1398 from Green-Cat/patch-2
16e38fb To go with my previous pull request
58958e5 Merge pull request #1395 from Green-Cat/patch-1
d0d115b German translation all in same formality
673a905 Merge pull request #1392 from davidromani/master
b9e34b8 Update FOSUserBundle.ca.yml
4d66b73 Update FOSUserBundle.es.yml
0828095 Merge pull request #1386 from infro42/master
fa577ff Updated lithuanian translations.
826f29a Merge pull request #1383 from nunojsferreira/patch-4
da51ad9 Fixed wrong mail subject on password recovery
c66cb66 Merge pull request #1378 from tgallice/rework_resetting
2287cb8 Remove parameter constant
afea530 Rework sendEmailAction to use GET parameter instead of Session component to forward email value
a02f6fe Merge pull request #1377 from aitboudad/patch-1
5db04dd Removed the old unique validator parameters.
6596b9d Merge pull request #1369 from 0biwan/patch-1
fb3a17b Fixed duplicated open tag and message
945eebb Merge pull request #1356 from nunojsferreira/patch-3
c608810 Fixed indentation problem
4251991 Merge pull request #1355 from nunojsferreira/patch-2
3657218 Fixed missing translations
7a5e29a Merge pull request #1287 from olegsv/master
f7380a4 Merge pull request #1333 from PayteR/patch-4
2dcdff2 Merge pull request #1353 from analogic/patch-2
2fef94f Update validators.cs.yml
eb459d5 Merge pull request #1348 from emgiezet/master
7f7bb1c Update FOSUserBundle.pl.yml
82fe46a Update FOSUserBundle.pl.yml
3a42a3e SK language fix
e543600 Merge pull request #1288 from christickner/flash_listener_configuration
c6338a7 Create FOSUserBundle.gr.yml
90ee148 Create validators.gr.yml
0cb0302 Merge pull request #1315 from orose/TypoFix
b19b619 Fixed typo in Norwegian Bokmål translation
4025c41 Merge pull request #1210 from armetiz/patch-doc
f9ea1de Merge pull request #1304 from spolischook/add-vietnamese-translation
343a4a5 Add vietnamese translation
5e23633 Revert "Added Integrity constraint violation for group name"
5a60adf Revert "Added Integrity constraint violation for group name"
ee5db1a Merge pull request #1297 from avinsol/patch-3
dd033f2 Merge pull request #1298 from avinsol/patch-4
4cb6a56 Added Integrity constraint violation for group name
6b9d72b Added Integrity constraint violation for group name
adef919 [Flash Notifications] make registering the FlashListener configurable
f1dee36 Added Hebrew translation
b4840d8 Removed PHP 5.5 from the allowed failures on travis
471f34b Merge branch '1.3.x'
988e106 Merge branch '1.3.x'
5e46565 Merge branch '1.3.x'
85ef11b Merge pull request #1280 from cordoval/patch-1
0e428f7 Update doctrine.md
1ee84a8 Merge pull request #1279 from bijibox/doc-typo-fix
23f4465 Fix typo in docs code example
a6c12cc Merge pull request #1272 from PayteR/patch-2
35890f4 Small Slovak language correction
1b8ffdb Merge pull request #1271 from havvg/feature/userresponseevent-on-registration
940c631 use GetResponseUserEvent on registration init
e060f8c Merge pull request #1266 from PayteR/patch-1
80bf109 Corecting "užívateľksé"
a19e42c Merge pull request #1263 from avinsol/patch-1
44be92e Update FOSUserBundle.ca.yml
d67fedd Merge pull request #1247 from Cydonia8/master
2f1aa0c Merge pull request #1240 from bangpound/couchdb-field-index
4a280b5 Merge pull request #1246 from xexu/master
fe77b85 Merge pull request #1262 from avinsol/master
4c093c8 Create validators.ca.yml
10f2b23 Removed isUser()
2038b75 Removed duplicate link to the doc
46de68f Added a link to the 1.3 doc in the readme
c835043 Merge pull request #1253 from fogs/master
db2fd4f Reorder fields in registration form
e536e8b Merge pull request #1251 from liuggio/patch-1
1b19141 little fix to the section ref.
3b8643c Merge pull request #1250 from peterkokot/patch-translations
ea5a737 slovenian translations fixed
7f0abca Extracting logic to a method in UserManipulator
62c6faa Fix spanish translation
503c126 Fix mistaken field mapping for index
96c5833 Merge pull request #1239 from sstok/fix-refreshuser-class
ea2ead6 fixed UserProvider::refreshUser() not checking the class-name
f821491 Merge pull request #1224 from DiliBau/patch-1
4e1f7da Fixed a link inside docs
be211ec Merge pull request #1191 from thvd/patch-1
88f9ed7 add doc type
6fc28e4 Merge pull request #1209 from armetiz/patch-1
f016998 group mergeGlobal inside sendMessage function
e3b335e Merge local variables with globals
e047dd8 Merge pull request #1207 from armetiz/patch-1
4e86c0b The format is required by FrameworkBundle
71ab148 Merge pull request #1195 from ardianys/patch-1
09091a5 Update typo
7447614 fixed type hinting of Mailer
ab93e2b Changed use of prependClientTransformer to addViewTransformer.
025e851 Merge pull request #1184 from hugohenrique/master
f657e7a corrected the format of the definition of assert Length
633a61a Update assert validation length to new format
bc750f6 Merge pull request #1179 from mr29a/master
12d7a76 mapping fields credendialsExpired and credentialExpiredAt camel case
b588ede just little change to mongo schema, this don't permit use sonata userBundle properly
b92850f just little change to mongo schema, this don't permit use sonata userBundle properly
a3c5cc2 Merge pull request #1173 from vtuz/master
16713f3 fix typo in ukrainian translation
5214fbd Merge pull request #1170 from xaben/patch-romanian
a72cb51 fix romanian translations
6cf71d1 Merge pull request #1169 from agiuliano/master
d7a36ed Add badge-poser
fb18ac4 Merge pull request #1167 from Kuro-dake/patch-1
2551017 Update FOSUserBundle.sk.yml
1111186 Merge pull request #1146 from felds/patch-1
c406ce0 Merge pull request #1164 from shieldo/patch-1
891a41b updated swiftmailer/swiftmailer version specification
ab580c1 Merge pull request #1136 from dbu/move-listeners
f0a7276 Added note about the UserProvider deprecation
16d963b remove unused 'use' statements
201267e Fix typo
8cd4cbd adjust to feedback
3dba740 consolidate doctrine listeners and move to Doctrine directory
9e60b38 Merge branch '1.3.x'
7015f82 Fixed the testsuite
063ed8a fixed the order of arguments for trigger_error
1d4ffd8 Added deprecation warnings when using the UserManager as user provider
8d06ec0 Merge pull request #966 from chrisjohnson00/patch-1
e6987e9 Tweaked previous merge
8952edc Merge pull request #1119 from BraisGabin/patch-1
95a948e Fixed the composer constraint in the doc
cd33542 Merge branch '1.3.x'
09ee522 Tweaked previous merge
33271c9 Merge pull request #1081 from dbu/map-models
8be0c33 Merge pull request #1083 from vlastv/patch-1
14f01c5 Groups ORM with yaml
eb31694 Code style
a9c13f9 Removed no neccesary ORM use
df248a1 Readd $id
c3b4044 Change generator strategy
2c3b05b Merge pull request #1126 from danieljames/patch-1
7f8a218 Merge pull request #1128 from yosmanyga/patch-2
03a48c8 Remove unused class
29ad8ce Fix namespace for UserProviderInterface in the documentation.
89be8e9 add deprecated errors to constructors, fix Upgrade.md
3ddc575 Merge pull request #953 from jmclean/patch-1
374283d Removed unnecessary code
b694cb3 Merge pull request #1103 from kbond/patch-1
96eae29 Change generator
d401b9e How to configure Doctrine using yaml
b7cd807 put #1113 into this PR
46e4046 added upgrade instructions
1d4a579 updated documentation
9035936 add support for couchdb
b77fc8b Updated the constraints to allow Symfony 2.3
5cab233 Used 2.1 syntax
c3caf9f Enforce POST for /login_check
4f5e0d2 Merge pull request #1099 from bartrail/master
13d7272 added "Annotations" namespace for mongodb
2fb70c3 add legacy symfony support
e8b39a2 adjust to symfony/symfony#7755
9f5768d do not have a fatal error if doctrine bridge is too old
973ad2c add support for mongo
d402948 re-adding empty mapping files to keep BC compatibility
84f196b adjust to factory method
20c2531 Merge pull request #1089 from ClementGautier/patch-1
bf58627 Update propel.xml
7521302 Update Canonicalizer.php
3c95a7d Update Canonicalizer.php
aa4b264 deprecate persistence specific classes
6290fd7 use the new doctrine compiler pass to map the model classes directly
a12abfa Merge pull request #1076 from aur1mas/master
9ac1a4d lt  grammar mistakes
3f98991 Merge pull request #1069 from jumpifzero/master
94b718c Merge pull request #1068 from jumpifzero/patch-1
8656195 typo - passord instead of password
5935ae0 Add pt_PT translation of "Bad Credentials"
85a153f Merge pull request #1059 from jongotlin/master
80fed5a Swedish translation for username.
b494786 Merge pull request #1058 from ddebree/default_translation_domain
b80d022 Added default transloation domains to template files and removed parameters to trans function
ec05bec Merge pull request #1044 from NAYZO/nzofos
71dc71c Update Arabic Validators
30cde14 Update Arabic Language
fd5afdb Merge pull request #1039 from aderuwe/mailer-fix-1
d4c69aa Fix phpdoc
7efda22 Merge pull request #1028 from Brammm/patch-1
af29736 Update canonicalizer.md
1f2cd0c Changed the constraint to the new one
8cfcf68 Added missing requirement
2137915 Merge pull request #1016 from pan100/pan100
442d816 added the validators translation to Norwegian Bokmål
adbd938 Added Norwegian Bokmål translation file (Norwegian language)
4b59ab8 Merge pull request #1009 from sumkincpp/patch-1
c4ae860 Fix for symfony 2.1 flash messages looping #978
993eebf Merge branch 'translation' (closes #1002)
3a012df Update Resources/translations/validators.fa_IR.yml
1ba8665 Simplified the display of flash messages
7d7c810 Merge pull request #994 from frne/master
f31a1fc Merge pull request #989 from jankramer/fix-csrf-dep
76cde1d Fixed dependency on form.csrf_provider
7d1339f Fixed flashbag output in layout.html.twig
df0cab6 Merge pull request #957 from scribblet/master
1a6ca83 Merge pull request #976 from yosmanyga/patch-1
03e5666 Update Resources/doc/index.md
398a844 Merge pull request #974 from vicmar/patch-1
0f866d5 Update Resources/translations/validators.es.yml
7bf5d3a Merge pull request #967 from whisller/removed_deprecated_get_flashes
1b3283d Removed deprecated call for getFlashes
4215015 Adding example for services defined in XML
7f282ae BC break - making DateTime props nullable on User
4a67cae Preserve entropy in TokenGenerator
d387679 Merge pull request #962 from phansys/master-documentation
9495d1e Updated configuration_reference.md.
7f27af0 Added credentials_expire_at to nullable columns
6781bce Add all datetime fields as nullable columns
06f10eb Merge pull request #948 from ondrowan/patch-1
c32b8bc Added slovak translation for password.mismatch
3ba8988 Merge pull request #944 from martiza/master
cd83da0 Add Arabic Language Translation for Validators
d529128 Create validators.ar.yml
fe5e742 Add Arabic Language Translation
7502cc9 Update Arabic Lang
db091f2 Create FOSUserBundle.ar.yml
844a5ad Merge pull request #943 from tonimunthi/indonesian-feature
8779a50 Add Indonesian Language Translation
ea5a8ea Merge pull request #939 from MDrollette/mongodb-collection-type
5d0a269 change mongodb type for roles to be collection instead of hash
7e29957 Merge pull request #938 from garak/patch-1
9ab4008 Update Resources/translations/FOSUserBundle.it.yml
91b8ae6 Merge pull request #937 from scribblet/patch-1
6fa3924 deleteAction in GroupController fired off wrong event
d42a471 Fixed another comment referring to wrong event
f6ae407 Corrected FOSUserEvents.php comment pointing to wrong event
1ee25d9 Allowed PHP 5.5 to fail on travis
3fc015b Merge pull request #932 from muratbeser/patch-1
26a9bdd Update Resources/doc/groups.md
7bbdf23 Merge pull request #929 from tonypiper/patch-1
62a4ada Update Resources/doc/controller_events.md
db1ebdc Merge pull request #927 from simshaun/patch-1
4738a18 Change "Change Password" translation key to match translations
4eee8ba Merge pull request #924 from sprain/master
c24d667 Improved German translation
401434d Merge pull request #918 from igorw/patch-2
71924b3 Fix typo in docs
450dfcd Added the initialize event in all edition controllers
8a129b8 Merge pull request #910 from phansys/master-documentation
2bb5d1a Updated configuration_reference.md to commit f48cc28#L1L97.
618b95d Merge pull request #864 from strayobject/patch-1
ee7a50c Removed the deprecated manager classes
dbcec05 Merge pull request #867 from stof/fosub_2
226bb5e Added PHP 5.5 on travis and forced the source install
25a4609 Changed the typehint for the Session in the FlashListener
e793772 Updated the changelog
1b59e04 Updated the documentation
8d2896a Added the request in all events and improved their naming
5ec31b7 Fixed the dispatched event
aa148c7 Moved the flash messages to the completed events
71d0abf Refactored the GroupController to use events
09363a2 Refactored the FlashListener to keep it more DRY
5668ef4 Added a way to change the redirection url when sending the email
ee8cb63 Refactored the ChangePasswordController to use events
44a1361 Refactored the password resetting submission
f48cc28 Refactored the profile controller to use events
27663a6 Added an event when logging the user in implicitly
4becccc Added an event before confirming the account
ddbb2dc Added an event to allow modifying the default values of the user
95d57ad Refactored the Registration controller
75c97e2 Fixed couple typos
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants