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

Adding orm: and mongodb: annotation aliases to avoid conflicts. Recommended is to use the aliases instead of relying on the default namespace for annotations. 

/** @orm:Entity */
/** @mongodb:Document */
This commit is contained in:
Jonathan H. Wage 2010-10-02 16:43:30 -05:00 committed by Fabien Potencier
parent 0fc8906feb
commit 8fbf19694f
2 changed files with 9 additions and 0 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

@ -45,6 +45,11 @@
<service id="doctrine.orm.metadata_driver.annotation" class="Doctrine\ORM\Mapping\Driver\AnnotationDriver">
<argument type="service" id="doctrine.orm.metadata_driver.annotation.reader" />
<argument>%doctrine.orm.metadata_driver.entity_dirs%</argument>
<call method="setDefaultAnnotationNamespace"><argument>%doctrine.orm.metadata.annotation_default_namespace%</argument></call>
<call method="setAnnotationNamespaceAlias">
<argument>Doctrine\ORM\Mapping\</argument>
<argument>orm</argument>
</call>
</service>
<service id="doctrine.orm.metadata_driver.annotation.reader" class="Doctrine\Common\Annotations\AnnotationReader">

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

@ -57,6 +57,10 @@
<service id="doctrine.odm.mongodb.metadata.annotation_reader" class="%doctrine.odm.mongodb.metadata.annotation_reader_class%">
<argument type="service" id="doctrine.odm.mongodb.cache" />
<call method="setDefaultAnnotationNamespace"><argument>%doctrine.odm.mongodb.metadata.annotation_default_namespace%</argument></call>
<call method="setAnnotationNamespaceAlias">
<argument>Doctrine\ODM\MongoDB\Mapping\</argument>
<argument>mongodb</argument>
</call>
</service>
<service id="doctrine.odm.mongodb.metadata.xml" class="%doctrine.odm.mongodb.metadata.xml_class%"><argument>%doctrine.odm.mongodb.xml_mapping_dirs%</argument></service>
<service id="doctrine.odm.mongodb.metadata.yml" class="%doctrine.odm.mongodb.metadata.yml_class%"><argument>%doctrine.odm.mongodb.yml_mapping_dirs%</argument></service>