From 542d727db2d2a6577dbae1248bcdf9f78d80ba37 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Wed, 23 May 2012 22:13:27 +1200 Subject: [PATCH] MINOR Don't use deprecated extraStatics when adding extra statics with DataExtension --- code/model/SiteTreeFileExtension.php | 14 +++++--------- tests/model/SiteTreeBacklinksTest.php | 13 +++++-------- tests/model/VirtualPageTest.php | 18 ++++++++---------- 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/code/model/SiteTreeFileExtension.php b/code/model/SiteTreeFileExtension.php index 955bec9f..05cf8d82 100644 --- a/code/model/SiteTreeFileExtension.php +++ b/code/model/SiteTreeFileExtension.php @@ -4,15 +4,11 @@ * @subpackage model */ class SiteTreeFileExtension extends DataExtension { - - function extraStatics($class = null, $extension = null) { - return array( - 'belongs_many_many' => array( - "BackLinkTracking" => "SiteTree", - ) - ); - } - + + public static $belongs_many_many = array( + 'BackLinkTracking' => 'SiteTree' + ); + /** * Extend through {@link updateBackLinkTracking()} in your own {@link Extension}. * diff --git a/tests/model/SiteTreeBacklinksTest.php b/tests/model/SiteTreeBacklinksTest.php index 7835155e..17cf26d3 100644 --- a/tests/model/SiteTreeBacklinksTest.php +++ b/tests/model/SiteTreeBacklinksTest.php @@ -243,14 +243,11 @@ class SiteTreeBacklinksTest extends SapphireTest { } class SiteTreeBacklinksTest_DOD extends DataExtension implements TestOnly { - function extraStatics($class = null, $extension = null) { - return array( - 'db' => array( - 'ExtraContent' => 'HTMLText', - ), - ); - } - + + static $db = array( + 'ExtraContent' => 'HTMLText', + ); + function updateCMSFields(FieldList $fields) { $fields->addFieldToTab("Root.Content", new HTMLEditorField("ExtraContent")); } diff --git a/tests/model/VirtualPageTest.php b/tests/model/VirtualPageTest.php index d556b5ef..ba4ef7ad 100644 --- a/tests/model/VirtualPageTest.php +++ b/tests/model/VirtualPageTest.php @@ -607,14 +607,12 @@ class VirtualPageTest_VirtualPageSub extends VirtualPage implements TestOnly { } class VirtualPageTest_PageExtension extends DataExtension implements TestOnly { - function extraStatics($class = null, $extension = null) { - return array( - 'db' => array( - // These fields are just on an extension to simulate shared properties between Page and VirtualPage. - // Not possible through direct $db definitions due to VirtualPage inheriting from Page, and Page being defined elsewhere. - 'MySharedVirtualField' => 'Text', - 'MySharedNonVirtualField' => 'Text', - ) - ); - } + + static $db = array( + // These fields are just on an extension to simulate shared properties between Page and VirtualPage. + // Not possible through direct $db definitions due to VirtualPage inheriting from Page, and Page being defined elsewhere. + 'MySharedVirtualField' => 'Text', + 'MySharedNonVirtualField' => 'Text', + ); + }