make setUp a static method

diff --git a/ipf/admin/models/_generated/BaseAdminLog.php b/ipf/admin/models/_generated/BaseAdminLog.php
index 9f55ad4d3a881a89ecc782bc42646a7d617974ca..a26051ea14a2386696b25aca3db708ee026963bd 100644 (file)
--- a/ipf/admin/models/_generated/BaseAdminLog.php
+++ b/ipf/admin/models/_generated/BaseAdminLog.php
@@ -28,9 +28,8 @@ abstract class BaseAdminLog extends IPF_ORM_Record
 
   }
 
-  public function setUp()
+  public static function setUp(IPF_ORM_Table $table)
   {
-    $table = $this->getTable();
     $table->addTemplate(new IPF_ORM_Template_Timestampable(array('updated' => array('disabled' => true))));
   }
 

diff --git a/ipf/auth/models/_generated/BasePermission.php b/ipf/auth/models/_generated/BasePermission.php
index 190b33ea5c662316d4e66e7efb3d349e83bbc24a..62ab8c44416980b7b460042db3d382ad09f0f3b9 100644 (file)
--- a/ipf/auth/models/_generated/BasePermission.php
+++ b/ipf/auth/models/_generated/BasePermission.php
@@ -18,9 +18,8 @@ abstract class BasePermission extends IPF_ORM_Record
 
   }
 
-  public function setUp()
+  public static function setUp(IPF_ORM_Table $table)
   {
-    $table = $this->getTable();
     $table->hasMany('User', 'Users', array('refClass' => 'UserPermission', 'local' => 'permission_id', 'foreign' => 'user_id'));
     $table->hasMany('Role', 'Roles', array('refClass' => 'RolePermission', 'local' => 'permission_id', 'foreign' => 'role_id'));
     $table->hasMany('RolePermission', '', array('local' => 'id', 'foreign' => 'permission_id'));

diff --git a/ipf/auth/models/_generated/BaseRole.php b/ipf/auth/models/_generated/BaseRole.php
index 0e72b2459c9f2e453798781350abf3e28112f963..0099fabf11fcb77af752e9d22cbdfec0e0ed076c 100644 (file)
--- a/ipf/auth/models/_generated/BaseRole.php
+++ b/ipf/auth/models/_generated/BaseRole.php
@@ -18,9 +18,8 @@ abstract class BaseRole extends IPF_ORM_Record
 
   }
 
-  public function setUp()
+  public static function setUp(IPF_ORM_Table $table)
   {
-    $table = $this->getTable();
     $table->hasMany('Permission', 'Permissions', array('refClass' => 'RolePermission', 'local' => 'role_id', 'foreign' => 'permission_id'));
     $table->hasMany('User', 'Users', array('refClass' => 'UserRole', 'local' => 'role_id', 'foreign' => 'user_id'));
     $table->hasMany('RolePermission', '', array('local' => 'id', 'foreign' => 'role_id'));

diff --git a/ipf/auth/models/_generated/BaseRolePermission.php b/ipf/auth/models/_generated/BaseRolePermission.php
index e01c1defab0f83ac566e3efad7c0a571de96b799..b4da1a4d62bd276340c11c22ab066ca9ba77d2cb 100644 (file)
--- a/ipf/auth/models/_generated/BaseRolePermission.php
+++ b/ipf/auth/models/_generated/BaseRolePermission.php
@@ -19,9 +19,8 @@ abstract class BaseRolePermission extends IPF_ORM_Record
 
   }
 
-  public function setUp()
+  public static function setUp(IPF_ORM_Table $table)
   {
-    $table = $this->getTable();
     $table->hasOne('Role', '', array('local' => 'role_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
     $table->hasOne('Permission', '', array('local' => 'permission_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
   }

diff --git a/ipf/auth/models/_generated/BaseUser.php b/ipf/auth/models/_generated/BaseUser.php
index 98c8483351537c5753da11d11916213748208a6e..0411e71cf45010f9c4e74065d5a83abbc4261b24 100644 (file)
--- a/ipf/auth/models/_generated/BaseUser.php
+++ b/ipf/auth/models/_generated/BaseUser.php
@@ -26,9 +26,8 @@ abstract class BaseUser extends IPF_ORM_Record
 
   }
 
-  public function setUp()
+  public static function setUp(IPF_ORM_Table $table)
   {
-    $table = $this->getTable();
     $table->hasMany('Role', 'Roles', array('refClass' => 'UserRole', 'local' => 'user_id', 'foreign' => 'role_id'));
     $table->hasMany('Permission', 'Permissions', array('refClass' => 'UserPermission', 'local' => 'user_id', 'foreign' => 'permission_id'));
     $table->hasMany('UserRole', '', array('local' => 'id', 'foreign' => 'user_id'));

diff --git a/ipf/auth/models/_generated/BaseUserPermission.php b/ipf/auth/models/_generated/BaseUserPermission.php
index c45e3a63be0c5309552e2cb991601878cf53e795..198ac9663431581857482941abf99966c9f6db07 100644 (file)
--- a/ipf/auth/models/_generated/BaseUserPermission.php
+++ b/ipf/auth/models/_generated/BaseUserPermission.php
@@ -19,9 +19,8 @@ abstract class BaseUserPermission extends IPF_ORM_Record
 
   }
 
-  public function setUp()
+  public static function setUp(IPF_ORM_Table $table)
   {
-    $table = $this->getTable();
     $table->hasOne('User', '', array('local' => 'user_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
     $table->hasOne('Permission', '', array('local' => 'permission_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
   }

diff --git a/ipf/auth/models/_generated/BaseUserRole.php b/ipf/auth/models/_generated/BaseUserRole.php
index c9d50e0ab0698c4ea6255b85efdf2787d1a06873..9297d1625b636fd2551b91ca436ff701e3fa76c9 100644 (file)
--- a/ipf/auth/models/_generated/BaseUserRole.php
+++ b/ipf/auth/models/_generated/BaseUserRole.php
@@ -19,9 +19,8 @@ abstract class BaseUserRole extends IPF_ORM_Record
 
   }
 
-  public function setUp()
+  public static function setUp(IPF_ORM_Table $table)
   {
-    $table = $this->getTable();
     $table->hasOne('User', '', array('local' => 'user_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
     $table->hasOne('Role', '', array('local' => 'role_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
   }

diff --git a/ipf/orm/import/builder.php b/ipf/orm/import/builder.php
index 6e3bc0f99d9132e4977cf463e0a587b9b4d56d76..362de0bbdc83ceaedf1da299b141240f6d9671e5 100644 (file)
--- a/ipf/orm/import/builder.php
+++ b/ipf/orm/import/builder.php
@@ -135,15 +135,14 @@ class IPF_ORM_Import_Builder
         // then we need call the parent::setUp() before the body of the function
         // Class table inheritance is the only one we shouldn't call parent::setUp() for
         if (count($ret) && isset($definition['inheritance']['type']) && $definition['inheritance']['type'] != 'class_table') {
-            array_unshift($ret, '    parent::setUp();');
+            array_unshift($ret, '    parent::setUp($table);');
         }
 
         // If we have some code for the function then lets define it and return it
         if (count($ret)) {
             array_unshift($ret,
-                '  public function setUp()',
-                '  {',
-                '    $table = $this->getTable();'
+                '  public static function setUp(IPF_ORM_Table $table)',
+                '  {'
             );
             $ret[] = '  }';
         }

diff --git a/ipf/orm/record.php b/ipf/orm/record.php
index a89718d97451de8a53f8ea439a0002df1320a531..29b0e0dfde4a9632c6a47b5b6fff554b5ce76dad 100644 (file)
--- a/ipf/orm/record.php
+++ b/ipf/orm/record.php
@@ -82,7 +82,6 @@ abstract class IPF_ORM_Record extends IPF_ORM_Record_Abstract implements Countab
         return self::$_index;
     }
 
-    public function setUp(){}
     public function construct(){}
 
     public function getOid()

diff --git a/ipf/orm/record/abstract.php b/ipf/orm/record/abstract.php
index 3276a677921a3f3c3188db509dbd7bd9141e97c7..63651877624a72513f9a6e90740d06c68cd169dd 100644 (file)
--- a/ipf/orm/record/abstract.php
+++ b/ipf/orm/record/abstract.php
@@ -8,7 +8,7 @@ abstract class IPF_ORM_Record_Abstract extends IPF_ORM_Access
     {
     }
 
-    public function setUp()
+    public static function setUp(IPF_ORM_Table $table)
     {
     }
 

diff --git a/ipf/orm/table.php b/ipf/orm/table.php
index aec975a2ecd6a07c181432f813f43914a96f00c7..af035c020d9bad4d6005df0018c53e3235eb0b3b 100644 (file)
--- a/ipf/orm/table.php
+++ b/ipf/orm/table.php
@@ -65,8 +65,7 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable
 
         $this->initIdentifier();
 
-        $record = new $name($this);
-        $record->setUp();
+        $name::setUp($this);
 
         $this->_filters[]  = new IPF_ORM_Record_Filter_Standard();
         $this->_repository = new IPF_ORM_Table_Repository($this);