Changeset 4776 for trunk/tests/models

Timestamp:

08/16/08 20:40:59 (5 months ago)

Author:

romanb

Message:

continued refactorings.

Location:

trunk/tests/models

Files:

• cms/CmsArticle.php (modified) (1 diff)
• cms/CmsUser.php (modified) (1 diff)
• forum/ForumAvatar.php (added)
• forum/ForumBoard.php (modified) (1 diff)
• forum/ForumCategory.php (modified) (1 diff)
• forum/ForumUser.php (modified) (2 diffs)

trunk/tests/models/cms/CmsArticle.php

@@ -35 +35 @@
             'length' => 4
         ));
-        $mapping->hasMany('CmsComment as comments', array(
-              'local' => 'id', 'foreign' => 'article_id'));
+        
+        /*$mapping->hasMany('CmsComment as comments', array(
+              'local' => 'id', 'foreign' => 'article_id'));*/
+        
+        $mapping->mapOneToMany(array(
+            'fieldName' => 'comments',
+            'targetEntity' => 'CmsComment',
+        ));
+        
+        /*$mapping->mapManyToOne(array(
+            'fieldName' => 'author',
+            'joinColumns' => array('user_id' => 'id')
+        ));*/
     }
 }

trunk/tests/models/cms/CmsUser.php

@@ -37 +37 @@
         ));
 
-        $mapping->hasMany('CmsPhonenumber as phonenumbers', array(
+        /*$mapping->hasMany('CmsPhonenumber as phonenumbers', array(
               'local' => 'id', 'foreign' => 'user_id'));
         $mapping->hasMany('CmsArticle as articles', array(
-              'local' => 'id', 'foreign' => 'user_id'));
+              'local' => 'id', 'foreign' => 'user_id'));*/
+        
+        $mapping->mapOneToMany(array(
+            'fieldName' => 'phonenumbers',
+            'targetEntity' => 'CmsPhonenumber',
+            
+        ));
+        
+        $mapping->mapOneToMany(array(
+            'fieldName' => 'articles',
+            'targetEntity' => 'CmsArticle',
+        ));
+        
     }
 }

trunk/tests/models/forum/ForumBoard.php

@@ -26 +26 @@
         ));
         
-        $mapping->hasOne('ForumCategory as category',
-                array('local' => 'category_id', 'foreign' => 'id'));
-        /*       
-        $metadata->mapOneToOne(array(
-            'fieldName' => 'category', // optional, defaults to targetEntity
+        /*$mapping->hasOne('ForumCategory as category',
+                array('local' => 'category_id', 'foreign' => 'id'));*/
+               
+        $mapping->mapOneToOne(array(
+            'fieldName' => 'category',
             'targetEntity' => 'ForumCategory',
             'joinColumns' => array('category_id' => 'id')
-            )); 
-        */       
+        ));
     }
 }

trunk/tests/models/forum/ForumCategory.php

@@ -21 +21 @@
         ));
         
-        $mapping->hasMany('ForumBoard as boards', array(
-                'local' => 'id' , 'foreign' => 'category_id')); 
+        /*$mapping->hasMany('ForumBoard as boards', array(
+                'local' => 'id' , 'foreign' => 'category_id'));*/
+        
+        $mapping->mapOneToMany(array(
+            'fieldName' => 'boards',
+            'targetEntity' => 'ForumBoard'
+        ));
     }
 }

trunk/tests/models/forum/ForumUser.php

@@ -7 +7 @@
 class ForumUser extends Doctrine_Entity
 {
-    #protected $dtype;
     #protected $id;
     #protected $username;
+    #protected $avatar;
     
     public static function initMetadata($mapping) 
@@ -43 +43 @@
         ));
         
+        $mapping->mapOneToOne(array(
+            'fieldName' => 'avatar',
+            'targetEntity' => 'ForumAvatar',
+            'joinColumns' => array('avatar_id' => 'id'),
+        ));
+        
     }