Changeset 3890 for trunk/tests_old/models

Timestamp:

02/23/08 22:04:39 (11 months ago)

Author:

romanb

Message:

validator refactorings and others

Location:

trunk/tests_old/models

Files:

• Email.php (modified) (1 diff)
• Entity.php (modified) (1 diff)
• ValidatorTest.php (modified) (1 diff)
• ValidatorTest_AddressModel.php (modified) (1 diff)
• ValidatorTest_DateModel.php (modified) (1 diff)
• ValidatorTest_Person.php (modified) (1 diff)

trunk/tests_old/models/Email.php

@@ -4 +4 @@
     public static function initMetadata($class)
     {
-        $class->setColumn('address', 'string', 150, array('email', 'unique' => true));
+        $class->setColumn('address', 'string', 150,
+                array('email', 'unique' => true, 'validators' => array('email', 'unique')));
     }
     

trunk/tests_old/models/Entity.php

@@ -6 +6 @@
         $class->setColumn('id', 'integer',20, array('autoincrement' => true, 'primary' => true));
         $class->setColumn('name', 'string',50);
-        $class->setColumn('loginname', 'string',20, array('unique' => true));
+        $class->setColumn('loginname', 'string',20, array('unique' => true, 'validators' => array('unique')));
         $class->setColumn('password', 'string',16);
         $class->setColumn('type', 'integer');

trunk/tests_old/models/ValidatorTest.php

@@ -3 +3 @@
     public static function initMetadata($class) {
         $class->setColumn('mymixed', 'string', 100);
-        $class->setColumn('mystring', 'string', 100, array('notnull', 'unique'));
+        $class->setColumn('mystring', 'string', 100,
+                array('validators' => array('notnull', 'unique'))
+        );
         $class->setColumn('myarray', 'array', 1000);
         $class->setColumn('myobject', 'object', 1000);
         $class->setColumn('myinteger', 'integer', 11);
-        $class->setColumn('myrange', 'integer', 11, array('range' => array(4,123)));
-        $class->setColumn('myregexp', 'string', 5, array('regexp' => '/^[0-9]+$/'));
-
-        $class->setColumn('myemail', 'string', 100, array('email'));
-        $class->setColumn('myemail2', 'string', 100, array('email', 'notblank'));
+        $class->setColumn('myrange', 'integer', 11,
+                array('validators' => array('range' => array(4,123)))
+        );
+        $class->setColumn('myregexp', 'string', 5,
+                array('validators' => array('regexp' => '/^[0-9]+$/'))
+        );
+        $class->setColumn('myemail', 'string', 100,
+                array('validators' => array('email'))
+        );
+        $class->setColumn('myemail2', 'string', 100,
+                array('validators' => array('email', 'notblank'))
+        );
     }
 }

trunk/tests_old/models/ValidatorTest_AddressModel.php

@@ -5 +5 @@
                                                                                                         'primary'       => true
                                                                                                         ));
-                $class->setColumn('address1', 'string', 255, array('notnull' => true, 'notblank'));
-                $class->setColumn('address2', 'string', 255, array('notnull' => true));
-                $class->setColumn('city', 'string', 255, array('notnull' => true, 'notblank'));
-                $class->setColumn('state', 'string', 10, array('notnull' => true, 'notblank', 'usstate'));
-                $class->setColumn('zip', 'string', 15, array('notnull' => true, 'notblank', 'regexp' => '/^[0-9-]*$/'));
+                $class->setColumn('address1', 'string', 255, array('notnull' => true,
+                        'validators' => array('notnull', 'notblank')));
+                $class->setColumn('address2', 'string', 255, array('notnull' => true,
+                        'validators' => array('notnull')));
+                $class->setColumn('city', 'string', 255, array('notnull' => true,
+                        'validators' => array('notnull', 'notblank')));
+                $class->setColumn('state', 'string', 10, array('notnull' => true,
+                        'validators' => array('notnull', 'notblank', 'usstate')));
+                $class->setColumn('zip', 'string', 15, array('notnull' => true,
+                        'validators' => array('notnull', 'notblank', 'regexp' => '/^[0-9-]*$/')));
                 $class->hasMany('ValidatorTest_ClientModel', array('local' => 'address_id', 'foreign' => 'client_id', 'refClass' => 'ValidatorTest_ClientToAddressModel'));
         }

trunk/tests_old/models/ValidatorTest_DateModel.php

@@ -2 +2 @@
 class ValidatorTest_DateModel extends Doctrine_Record {
     public static function initMetadata($class) {
-        $class->setColumn('birthday', 'date', null, array('past'));
-        $class->setColumn('death', 'date', null, array('future'));
+        $class->setColumn('birthday', 'date', null,
+                array('validators' => array('past')));
+        $class->setColumn('death', 'date', null,
+                array('validators' => array('future')));
     }
 }

trunk/tests_old/models/ValidatorTest_Person.php

@@ -2 +2 @@
 class ValidatorTest_Person extends Doctrine_Record {
    public static function initMetadata($class) {
-      $class->setColumn('identifier', 'integer', 4, array('notblank', 'unique'));
+      $class->setColumn('identifier', 'integer', 4,
+            array('validators' => array('notblank', 'unique')));
       $class->setColumn('is_football_player', 'boolean');
-      $class->hasOne('ValidatorTest_FootballPlayer', array('local' => 'id', 'foreign' => 'person_id'));
+      $class->hasOne('ValidatorTest_FootballPlayer',
+            array('local' => 'id', 'foreign' => 'person_id'));
    }
 }