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

Author: dbu

DependencyInjection/FOSUserExtension.php

@@ -30,6 +30,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         if ('custom' !== $config['db_driver']) {
             $loader->load(sprintf('%s.xml', $config['db_driver']));
+            $container->setParameter($this->getAlias() . '.backend_type_' . $config['db_driver'], true);
         }
 
         foreach (array('validator', 'security', 'util', 'mailer', 'listeners') as $basename) {

FOSUserBundle.php

@@ -12,6 +12,7 @@
 namespace FOS\UserBundle;
 
 use FOS\UserBundle\DependencyInjection\Compiler\ValidationPass;
+use Doctrine\Bundle\DoctrineBundle\DependencyInjection\CompilerPass\RegisterMappingsPass;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -25,5 +26,14 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
         $container->addCompilerPass(new ValidationPass());
+
+        if (class_exists('Doctrine\Bundle\DoctrineBundle\DependencyInjection\CompilerPass\RegisterMappingsPass')) {
+            $mappings = array(
+                realpath(__DIR__.'/Resources/config/doctrine/model') => 'FOS\UserBundle\Model',
+            );
+            $container->addCompilerPass(new RegisterMappingsPass($mappings, 'xml', 'fos_user.backend_type_orm'));
+        }
+
+        // TODO: couch, mongo
     }
 }

Resources/config/doctrine/Group.couchdb.xml renamed to Resources/config/doctrine/model/Group.couchdb.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping>
-    <mapped-superclass name="FOS\UserBundle\Document\Group" indexed="true">
+    <mapped-superclass name="FOS\UserBundle\Model\Group" indexed="true">
 
         <field name="name" fieldName="name" type="string" indexed="true" />
         <field name="roles" fieldName="roles" type="mixed" />

Resources/config/doctrine/Group.mongodb.xml renamed to Resources/config/doctrine/model/Group.mongodb.xml

@@ -4,7 +4,7 @@
                         xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                         http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
 
-    <mapped-superclass name="FOS\UserBundle\Document\Group" collection="fos_user_group">
+    <mapped-superclass name="FOS\UserBundle\Model\Group" collection="fos_user_group">
 
         <field name="name" fieldName="name" type="string" />
 

Resources/config/doctrine/Group.orm.xml renamed to Resources/config/doctrine/model/Group.orm.xml

@@ -4,7 +4,7 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                   http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <mapped-superclass name="FOS\UserBundle\Entity\Group">
+    <mapped-superclass name="FOS\UserBundle\Model\Group">
 
         <field name="name" column="name" type="string" length="255" unique="true" />
 

Resources/config/doctrine/User.couchdb.xml renamed to Resources/config/doctrine/model/User.couchdb.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <doctrine-mapping>
 
-    <mapped-superclass name="FOS\UserBundle\Document\User" indexed="true">
+    <mapped-superclass name="FOS\UserBundle\Model\User" indexed="true">
 
         <field name="username" fieldName="username" type="string" indexed="true" />
         <field name="usernameCanonical" fieldName="usernameCanonical" type="string" indexed="true" />

Resources/config/doctrine/User.mongodb.xml renamed to Resources/config/doctrine/model/User.mongodb.xml

@@ -4,7 +4,7 @@
                         xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                         http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
 
-    <mapped-superclass name="FOS\UserBundle\Document\User" collection="fos_user_user">
+    <mapped-superclass name="FOS\UserBundle\Model\User" collection="fos_user_user">
 
         <field name="username" fieldName="username" type="string" />
 

Resources/config/doctrine/User.orm.xml renamed to Resources/config/doctrine/model/User.orm.xml

@@ -4,7 +4,7 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                   http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <mapped-superclass name="FOS\UserBundle\Entity\User">
+    <mapped-superclass name="FOS\UserBundle\Model\User">
 
         <field name="username" column="username" type="string" length="255" />