diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[DoctrineBundle][DoctrineMongoDBBundle] Create DIC params for security user provider EM/DM aliases"

Browse Source 
This reverts commit 24c7715029.
This commit is contained in:
Fabien Potencier 2011-01-26 20:33:08 +01:00
parent 24c7715029
commit b154643b65
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
View File

@ -39,8 +39,7 @@
<!-- security/user -->
<parameter key="security.user.provider.entity.class">Symfony\Bundle\DoctrineBundle\Security\EntityUserProvider</parameter>
<parameter key="security.user.entity_manager.alias">doctrine.orm.entity_manager</parameter>
<!-- security/acl -->
<parameter key="security.acl.collection_cache.class">Symfony\Bundle\DoctrineBundle\Security\AclCollectionCache</parameter>
@ -57,7 +56,7 @@
</call>
</service>
<service id="security.user.entity_manager" alias="%security.user.entity_manager.alias%" public="false" />
<service id="security.user.entity_manager" alias="doctrine.orm.default_entity_manager" public="false" />
<service id="request.param_converter.doctrine" class="Symfony\Bundle\DoctrineBundle\Request\ParamConverter\DoctrineConverter" public="false">
<tag name="request.param_converter" />

7
src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
View File

@ -50,8 +50,7 @@
<!-- security/user -->
<parameter key="security.user.provider.document.class">Symfony\Bundle\DoctrineMongoDBBundle\Security\DocumentUserProvider</parameter>
<parameter key="security.user.document_manager.alias">doctrine.odm.mongodb.document_manager</parameter>
<!-- validator -->
<parameter key="doctrine_odm.mongodb.validator.unique.class">Symfony\Bundle\DoctrineMongoDBBundle\Validator\Constraints\DoctrineMongoDBUniqueValidator</parameter>
</parameters>
@ -88,8 +87,8 @@
<argument type="service" id="doctrine.odm.mongodb.logger" />
</service>
<service id="security.user.document_manager" alias="%security.user.document_manager.alias%" />
<service id="security.user.document_manager" alias="doctrine.odm.mongodb.default_document_manager" />
<!-- validator -->
<service id="doctrine_odm.mongodb.validator.unique" class="%doctrine_odm.mongodb.validator.unique.class%">
<argument type="service" id="doctrine.odm.mongodb.document_manager" />