Added MappedSuperClass to allow extensions.

ZF-Commons · Jul 18, 2012 · 263d2f1 · 263d2f1
1 parent 9584f56
commit 263d2f1
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 369 deletions.
diff --git a/Module.php b/Module.php
@@ -16,7 +16,7 @@ public function onBootstrap($e)
         // Add the default entity driver only if specified in configuration
         if ($options->getEnableDefaultEntities()) {
             $chain = $sm->get('doctrine.driver.odm_default');
-            $chain->addDriver(new XmlDriver(__DIR__ . '/config/xml/zfcuserdoctrinemongoodm'), 'ZfcUserDoctrineMongoODM\Document');
+            $chain->addDriver(new XmlDriver(__DIR__ . '/config/xml'), 'ZfcUserDoctrineMongoODM\Document');
         }
     }
 
@@ -47,7 +47,7 @@ public function getServiceConfiguration()
                     return new Options\ModuleOptions(isset($config['zfcuser']) ? $config['zfcuser'] : array());
                 },
                 'zfcuser_user_mapper' => function ($sm) {
-                    return new \ZfcUserDoctrineMongoODM\Mapper\User(
+                    return new \ZfcUserDoctrineMongoODM\Mapper\UserMongoDB(
                         $sm->get('zfcuser_doctrine_dm'),
                         $sm->get('zfcuser_module_options')
                     );

diff --git a/autoload_classmap.php b/autoload_classmap.php
@@ -3,7 +3,8 @@
 return array(
     'ZfcUserDoctrineMongoODM\Module'                            => __DIR__ . '/Module.php',
     'ZfcUserDoctrineMongoODM\Document\User'                     => __DIR__ . '/src/ZfcUserDoctrineMongoODM/Document/User.php',
+    'ZfcUserDoctrineMongoODM\Document\UserMappedSuperClass'     => __DIR__ . '/src/ZfcUserDoctrineMongoODM/Document/UserMappedSuperClass.php',
     'ZfcUserDoctrineMongoODM\Event\ResolveTargetEntityListener' => __DIR__ . '/src/ZfcUserDoctrineMongoODM/Event/ResolveTargetEntityListener.php',
-    'ZfcUserDoctrineMongoODM\Mapper\User'                       => __DIR__ . '/src/ZfcUserDoctrineMongoODM/Mapper/User.php',
+    'ZfcUserDoctrineMongoODM\Mapper\UserMongoDb'                => __DIR__ . '/src/ZfcUserDoctrineMongoODM/Mapper/UserMongoDb.php',
     'ZfcUserDoctrineMongoODM\Options\ModuleOptions'             => __DIR__ . '/src/ZfcUserDoctrineMongoODM/Options/ModuleOptions.php'
 );
diff --git a/config/module.config.php b/config/module.config.php
@@ -4,7 +4,7 @@
         'driver' => array(
             'zfcuser_document' => array(
                 'class' => 'Doctrine\ODM\MongoDB\Mapping\Driver\XmlDriver',
-                'paths' => __DIR__ . '/xml/zfcuserdoctrinemongoodm'
+                'paths' => __DIR__ . '/xml'
             ),
 
             'odm_default' => array(
@@ -14,41 +14,4 @@
             )
         )
     ),
-);
-
-//<?php
-//return array(
-//    'zfcuser' => array(
-//        'user_entity_class'     => 'ZfcUserDoctrineMongoODM\Document\User'
-//    ),
-//    'di' => array(
-//        'instance' => array(
-//            'alias' => array(
-//                'zfcuser_mongo_dm'        => 'mongo_dm', 
-//                'zfcuser_user_mapper'     => 'ZfcUserDoctrineMongoODM\Mapper\User'
-//            ),
-//            'mongo_driver_chain' => array(
-//                'parameters' => array(
-//                    'drivers' => array(
-//                        'zfcuser_xml_driver' => array(
-//                            'class'          => 'Doctrine\ODM\MongoDB\Mapping\Driver\XmlDriver',
-//                            'namespace'      => 'ZfcUserDoctrineMongoODM\Document',
-//                            'paths'          => array(__DIR__ . '/xml'),
-//                            'file_extension' => '.mongodb.xml',
-//                        ),
-//                    )
-//                )
-//            ),
-//            'ZfcUserDoctrineMongoODM\Mapper\UserMongoDB' => array(
-//                'parameters' => array(
-//                    'dm' => 'zfcuser_mongo_dm',
-//                ),
-//            ),
-//            'ZfcUserDoctrineMongoODM\Mapper\UserMetaMongoDB' => array(
-//                'parameters' => array(
-//                    'dm' => 'zfcuser_mongo_dm',
-//                ),
-//            ),
-//        ),
-//    ),
-//);
+);
diff --git a/...serDoctrineMongoODM.Document.User.dcm.xml → ...serDoctrineMongoODM.Document.User.dcm.xml b/...serDoctrineMongoODM.Document.User.dcm.xml → ...serDoctrineMongoODM.Document.User.dcm.xml
@@ -4,15 +4,7 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                   http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
 
-    <document name="ZfcUserDoctrineMongoODM\Document\User" collection="users">
-
-        <field name="id" id="true"/>
-
-        <field name="username" type="string"/>
-        <field name="email" type="string"/>
-<!-- check case mismatch CamelCase or underscores        -->
-        <field name="display_name" type="string" />
-        <field name="password" type="string" />
+    <document name="ZfcUserDoctrineMongoODM\Document\User" collection="user">
 
     </document>
 

diff --git a/config/xml/ZfcUserDoctrineMongoODM.Document.User.mongodb.xml b/config/xml/ZfcUserDoctrineMongoODM.Document.User.mongodb.xml
diff --git a/...Document.UserMappedSuperClass.mongodb.xml → ...ODM.Document.UserMappedSuperClass.dcm.xml b/...Document.UserMappedSuperClass.mongodb.xml → ...ODM.Document.UserMappedSuperClass.dcm.xml
@@ -6,18 +6,13 @@
 
     <mapped-superclass name="ZfcUserDoctrineMongoODM\Document\UserMappedSuperClass" collection="user">
 
-        <field fieldName="userId" id="true" />
+        <field fieldName="id" id="true" />
+
         <field fieldName="username" type="string" unique="true" nullable="true" />
         <field fieldName="email" type="string" unique="true" length="100" />
-        <field fieldName="displayName" type="string" length="50" nullable="true" />
+        <field fieldName="display_name" type="string" length="50" nullable="true" />
         <field fieldName="password" type="string" length="128" />
-        <field fieldName="lastLogin" type="date" nullable="true" />
-        <field fieldName="lastIp" type="int" nullable="true" />
-        <field fieldName="registerTime" type="date" />
-        <field fieldName="registerIp" type="int" />
-        <field fieldName="active" type="boolean" />
-        <field fieldName="enabled" type="boolean" />
 
     </mapped-superclass>
 
-</doctrine-mongo-mapping>
+</doctrine-mongo-mapping>
diff --git a/config/xml/ZfcUserDoctrineMongoODM.Document.UserMeta.mongodb.xml b/config/xml/ZfcUserDoctrineMongoODM.Document.UserMeta.mongodb.xml
diff --git a/config/xml/ZfcUserDoctrineMongoODM.Document.UserMetaMappedSuperClass.mongodb.xml b/config/xml/ZfcUserDoctrineMongoODM.Document.UserMetaMappedSuperClass.mongodb.xml
diff --git a/src/ZfcUserDoctrineMongoODM/Document/User.php b/src/ZfcUserDoctrineMongoODM/Document/User.php
@@ -2,7 +2,5 @@
 
 namespace ZfcUserDoctrineMongoODM\Document;
 
-use ZfcUser\Entity\User as ZfcUserEntity;
-
-class User extends ZfcUserEntity
+class User extends UserMappedSuperClass
 {}
diff --git a/src/ZfcUserDoctrineMongoODM/Document/UserMappedSuperClass.php b/src/ZfcUserDoctrineMongoODM/Document/UserMappedSuperClass.php
@@ -2,7 +2,7 @@
 
 namespace ZfcUserDoctrineMongoODM\Document;
 
-use ZfcUser\Model\User;
+use ZfcUser\Entity\User;
 
 abstract class UserMappedSuperClass extends User
-{}
+{}
diff --git a/src/ZfcUserDoctrineMongoODM/Document/UserMeta.php b/src/ZfcUserDoctrineMongoODM/Document/UserMeta.php
diff --git a/src/ZfcUserDoctrineMongoODM/Document/UserMetaMappedSuperClass.php b/src/ZfcUserDoctrineMongoODM/Document/UserMetaMappedSuperClass.php
diff --git a/src/ZfcUserDoctrineMongoODM/Event/ResolveTargetEntityListener.php b/src/ZfcUserDoctrineMongoODM/Event/ResolveTargetEntityListener.php
diff --git a/src/ZfcUserDoctrineMongoODM/Mapper/User.php b/src/ZfcUserDoctrineMongoODM/Mapper/User.php