From bc3f5ac329849266dde9d02705f3cf3100978c0d Mon Sep 17 00:00:00 2001 From: Hamish Friedlander Date: Fri, 9 Mar 2012 16:37:50 +1300 Subject: [PATCH] BUGFIX: DataObjectTest needs its extensions to use the new static-on-object method to keep the ordering as it expects --- tests/model/DataObjectTest.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/model/DataObjectTest.php b/tests/model/DataObjectTest.php index 056c8f2c9..aabae2827 100644 --- a/tests/model/DataObjectTest.php +++ b/tests/model/DataObjectTest.php @@ -1098,18 +1098,15 @@ class DataObjectTest_FieldlessSubTable extends DataObjectTest_Team implements Te class DataObjectTest_Team_Extension extends DataExtension implements TestOnly { - - function extraStatics($class=null, $extension=null) { - return array( - 'db' => array( - 'ExtendedDatabaseField' => 'Varchar' - ), - 'has_one' => array( - 'ExtendedHasOneRelationship' => 'DataObjectTest_Player' - ) - ); - } - + + static $db = array( + 'ExtendedDatabaseField' => 'Varchar' + ); + + static $has_one = array( + 'ExtendedHasOneRelationship' => 'DataObjectTest_Player' + ); + function getExtendedDynamicField() { return "extended dynamic field"; }