Permalink
Browse files

Revert "FIX: Strict error warnings on DataExtension"

This reverts commit 1960df8.

Revert "FIX: validate doesn't take var by reference"
This reverts commit 866bb07.

@ajshort has changed the method signatures in 1f6f7f0. While it wasn't explicitly noted in the commit message, I think its a good change - objects like a FieldList are always passed by reference in PHP, no need to declare that behaviour.
  • Loading branch information...
1 parent 857d8bb commit accbd7f1e2cb74c1bef5728acd699e34b7b76f86 @chillu chillu committed Feb 4, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 model/DataExtension.php
View
@@ -58,7 +58,7 @@ public static function unload_extra_statics($class, $extension) {
* @param $validationResult Local validation result
* @throws ValidationException
*/
- public function validate(ValidationResult $validationResult) {
+ public function validate(ValidationResult &$validationResult) {
}
/**
@@ -145,7 +145,7 @@ public function extraStatics($class = null, $extension = null) {
*
* @param FieldList $fields FieldList with a contained TabSet
*/
- public function updateCMSFields(FieldList &$fields) {
+ public function updateCMSFields(FieldList $fields) {
}
/**
@@ -156,7 +156,7 @@ public function updateCMSFields(FieldList &$fields) {
*
* @param FieldList $fields FieldList without TabSet nesting
*/
- public function updateFrontEndFields(FieldList &$fields) {
+ public function updateFrontEndFields(FieldList $fields) {
}
/**
@@ -165,7 +165,7 @@ public function updateFrontEndFields(FieldList &$fields) {
*
* @param FieldList $actions FieldList
*/
- public function updateCMSActions(FieldList &$actions) {
+ public function updateCMSActions(FieldList $actions) {
}
/**

2 comments on commit accbd7f

Member

micmania1 replied Feb 5, 2013

Should line 61 $validationResult by declared as being passed by reference? This creates a Strict error on Hierarchy::validate() which is defined as:
public function validate(ValidationResult $validationResult) ...

Owner

chillu replied Feb 6, 2013

True, fixed in a1beda1

Please sign in to comment.