From a50f9fbcac64cf450e3ea5dfa3d36263caddd862 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 12 Apr 2012 15:04:39 +1200 Subject: [PATCH] MINOR E_STRICT fixes --- code/BasicFieldsTestPage.php | 2 +- code/FileUploadRole.php | 4 ++-- code/FrameworkTestRole.php | 6 +++--- code/FrameworkTestSiteTreeExtension.php | 4 ++-- code/GridFieldTestPage.php | 4 ++-- code/LegacyTableFieldsTestPage.php | 4 ++-- code/RelationFieldsTestPage.php | 4 ++-- code/TestPage.php | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/BasicFieldsTestPage.php b/code/BasicFieldsTestPage.php index 56eb4e4..1e35d99 100644 --- a/code/BasicFieldsTestPage.php +++ b/code/BasicFieldsTestPage.php @@ -59,7 +59,7 @@ class BasicFieldsTestPage extends TestPage { "TimeDisabled" => "23:59", ); - function getCMSFields() { + function getCMSFields($params = null) { $fields = parent::getCMSFields(); $fields->addFieldsToTab('Root.Text', array( diff --git a/code/FileUploadRole.php b/code/FileUploadRole.php index a6cc9fc..f5a310a 100644 --- a/code/FileUploadRole.php +++ b/code/FileUploadRole.php @@ -1,6 +1,6 @@ array( 'AFile' => 'File', @@ -9,4 +9,4 @@ class FileUploadRole extends DataExtension{ ); } } -?> \ No newline at end of file +?> diff --git a/code/FrameworkTestRole.php b/code/FrameworkTestRole.php index 6286c52..51b421c 100644 --- a/code/FrameworkTestRole.php +++ b/code/FrameworkTestRole.php @@ -1,7 +1,7 @@ array( 'FavouritePage' => 'SiteTree', @@ -9,7 +9,7 @@ class FrameworkTestRole extends DataExtension { ); } - function updateCMSFields($fields) { + function updateCMSFields(FieldList $fields) { $fields->push(new TreeDropdownField("FavouritePageID", "Favourite page", "SiteTree")); } @@ -40,4 +40,4 @@ class FrameworkTestRole extends DataExtension { 'Hayley', 'Octavius', 'Walker', 'Gary', 'Elton', 'Janna', 'Ursa', 'Lars', 'Moses', 'Lareina', 'Elmo', 'Shea', 'Duncan', 'Velma', 'Acton', 'Galena', 'Heidi', 'Troy', 'Elliott', 'Whitney', 'Summer', 'Olga', 'Tatum', 'Zeph', 'Jared', 'Hilda', 'Quinlan', 'Chaim', 'Xenos', 'Cara', 'Tatiana', 'Tyrone', 'Juliet', 'Chester', 'Hannah', 'Imani', 'Quinn', 'Ariel', 'Aretha', 'Courtney ', 'Shellie', 'Garrett', 'Camilla', 'Simon', 'Mohammad', 'Kirby', 'Rae', 'Xena', 'Noel', 'Omar', 'Shannon', 'Iola', 'Maia', 'Serina', 'Taylor', 'Alice', 'Lucy', 'Austin', 'Abel', 'Yetta', 'Ulysses', 'Donovan', 'Castor', 'Emmanuel', 'Nero', 'Virginia', 'Gregory', 'Neville', 'Len', 'Knox', 'Gavin', 'Pascale', 'Hyatt', 'Alden', 'Emerald', 'Cherokee', 'Adam', 'Uma', 'Serena', 'Isabelle', 'Kieran', 'Gay', 'Lavinia', 'Elvis', 'Illana', 'Lee', 'Ariana', 'Hilel', 'Gage', 'Larissa', 'Richard', 'Allen' ); } -} \ No newline at end of file +} diff --git a/code/FrameworkTestSiteTreeExtension.php b/code/FrameworkTestSiteTreeExtension.php index ce87607..b870045 100644 --- a/code/FrameworkTestSiteTreeExtension.php +++ b/code/FrameworkTestSiteTreeExtension.php @@ -1,11 +1,11 @@ array('RelationFieldsTestPage' => 'RelationFieldsTestPage'), 'belongs_many_many' => array('RelationFieldsTestPages' => 'RelationFieldsTestPage'), ); } -} \ No newline at end of file +} diff --git a/code/GridFieldTestPage.php b/code/GridFieldTestPage.php index 5661106..ac1b5a2 100644 --- a/code/GridFieldTestPage.php +++ b/code/GridFieldTestPage.php @@ -28,7 +28,7 @@ class GridFieldTestPage extends Page { $page->doPublish(); } - public function getCMSFields() { + public function getCMSFields($class = null, $extension = null) { $fields = parent::getCMSFields(); $config = new GridFieldConfig_RecordEditor(); @@ -70,4 +70,4 @@ class GridFieldTestPage_Controller extends Page_Controller { $grid = new GridField('Companies', 'Companies', new DataList('Company'),$config); return new Form($this,'Form',new FieldList($grid),new FieldList()); } -} \ No newline at end of file +} diff --git a/code/LegacyTableFieldsTestPage.php b/code/LegacyTableFieldsTestPage.php index dac0bf6..ceeb6c5 100644 --- a/code/LegacyTableFieldsTestPage.php +++ b/code/LegacyTableFieldsTestPage.php @@ -2,7 +2,7 @@ class LegacyTableFieldsTestPage extends TestPage { - function getCMSFields() { + function getCMSFields($class = null, $extension = null) { $fields = parent::getCMSFields(); $tf = new TableListField('CompaniesTF', 'Company'); @@ -20,4 +20,4 @@ class LegacyTableFieldsTestPage extends TestPage { class LegacyTableFieldsTestPage_Controller extends TestPage_Controller { -} \ No newline at end of file +} diff --git a/code/RelationFieldsTestPage.php b/code/RelationFieldsTestPage.php index cb8b3d1..6bac03b 100644 --- a/code/RelationFieldsTestPage.php +++ b/code/RelationFieldsTestPage.php @@ -15,7 +15,7 @@ class RelationFieldsTestPage extends TestPage { "ManyManyPages" => "SiteTree", ); - function getCMSFields() { + function getCMSFields($class = null, $extension = null) { $fields = parent::getCMSFields(); $fields->addFieldToTab("Root.CheckboxSet", @@ -38,4 +38,4 @@ class RelationFieldsTestPage extends TestPage { class RelationFieldsTestPage_Controller extends TestPage_Controller { -} \ No newline at end of file +} diff --git a/code/TestPage.php b/code/TestPage.php index 79849bd..d1370ce 100644 --- a/code/TestPage.php +++ b/code/TestPage.php @@ -8,7 +8,7 @@ class TestPage extends Page { /** * We can only create subclasses of TestPage */ - function canCreate() { + function canCreate($member = null) { return $this->class != 'TestPage' && parent::canCreate(); } @@ -85,4 +85,4 @@ class TestPage_Controller extends Page_Controller { echo "

email sent to " . $data['Email'] . "

"; } } -?> \ No newline at end of file +?>