Merge pull request #3 from halkyon/e_strict_fixes

E_STRICT fixes
This commit is contained in:
Sam Minnée 2012-04-11 20:16:11 -07:00
commit 89db95b044
8 changed files with 16 additions and 16 deletions

View File

@ -59,7 +59,7 @@ class BasicFieldsTestPage extends TestPage {
"TimeDisabled" => "23:59", "TimeDisabled" => "23:59",
); );
function getCMSFields() { function getCMSFields($params = null) {
$fields = parent::getCMSFields(); $fields = parent::getCMSFields();
$fields->addFieldsToTab('Root.Text', array( $fields->addFieldsToTab('Root.Text', array(

View File

@ -1,6 +1,6 @@
<?php <?php
class FileUploadRole extends DataExtension{ class FileUploadRole extends DataExtension{
function extraStatics() { function extraStatics($class = null, $extension = null) {
return array( return array(
'has_one' => array( 'has_one' => array(
'AFile' => 'File', 'AFile' => 'File',

View File

@ -1,7 +1,7 @@
<?php <?php
class FrameworkTestRole extends DataExtension { class FrameworkTestRole extends DataExtension {
function extraStatics() { function extraStatics($class = null, $extension = null) {
return array( return array(
'has_one' => array( 'has_one' => array(
'FavouritePage' => 'SiteTree', '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")); $fields->push(new TreeDropdownField("FavouritePageID", "Favourite page", "SiteTree"));
} }

View File

@ -1,7 +1,7 @@
<?php <?php
class FrameworkTestSiteTreeExtension extends DataExtension { class FrameworkTestSiteTreeExtension extends DataExtension {
function extraStatics() { function extraStatics($class = null, $extension = null) {
return array( return array(
'has_one' => array('RelationFieldsTestPage' => 'RelationFieldsTestPage'), 'has_one' => array('RelationFieldsTestPage' => 'RelationFieldsTestPage'),
'belongs_many_many' => array('RelationFieldsTestPages' => 'RelationFieldsTestPage'), 'belongs_many_many' => array('RelationFieldsTestPages' => 'RelationFieldsTestPage'),

View File

@ -28,7 +28,7 @@ class GridFieldTestPage extends Page {
$page->doPublish(); $page->doPublish();
} }
public function getCMSFields() { public function getCMSFields($class = null, $extension = null) {
$fields = parent::getCMSFields(); $fields = parent::getCMSFields();
$config = new GridFieldConfig_RecordEditor(); $config = new GridFieldConfig_RecordEditor();

View File

@ -2,7 +2,7 @@
class LegacyTableFieldsTestPage extends TestPage { class LegacyTableFieldsTestPage extends TestPage {
function getCMSFields() { function getCMSFields($class = null, $extension = null) {
$fields = parent::getCMSFields(); $fields = parent::getCMSFields();
$tf = new TableListField('CompaniesTF', 'Company'); $tf = new TableListField('CompaniesTF', 'Company');

View File

@ -15,7 +15,7 @@ class RelationFieldsTestPage extends TestPage {
"ManyManyPages" => "SiteTree", "ManyManyPages" => "SiteTree",
); );
function getCMSFields() { function getCMSFields($class = null, $extension = null) {
$fields = parent::getCMSFields(); $fields = parent::getCMSFields();
$fields->addFieldToTab("Root.CheckboxSet", $fields->addFieldToTab("Root.CheckboxSet",

View File

@ -8,7 +8,7 @@ class TestPage extends Page {
/** /**
* We can only create subclasses of TestPage * We can only create subclasses of TestPage
*/ */
function canCreate() { function canCreate($member = null) {
return $this->class != 'TestPage' && parent::canCreate(); return $this->class != 'TestPage' && parent::canCreate();
} }