tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 09:59:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Provide a better error if incorrect number of arguments are passed

Browse Source 
to filter() or exclude() on a DataList
This commit is contained in:
Sean Harvey 2012-05-29 20:09:36 +12:00
parent d7a8fa9266
commit f43273f217
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
model/DataList.php
View File

@ -216,18 +216,18 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
* *
* @todo extract the sql from $customQuery into a SQLGenerator class * @todo extract the sql from $customQuery into a SQLGenerator class
* *
* @param String|array Escaped SQL statement. If passed as array, all keys and values are assumed to be escaped. * @param string|array Escaped SQL statement. If passed as array, all keys and values are assumed to be escaped.
* @return DataList * @return DataList
*/ */
public function filter() { public function filter() {
$numberFuncArgs = count(func_get_args()); $numberFuncArgs = count(func_get_args());
$whereArguments = array(); $whereArguments = array();
if($numberFuncArgs == 1 && is_array(func_get_arg(0))){ if($numberFuncArgs == 1 && is_array(func_get_arg(0))) {
$whereArguments = func_get_arg(0); $whereArguments = func_get_arg(0);
} elseif($numberFuncArgs == 2) { } elseif($numberFuncArgs == 2) {
$whereArguments[func_get_arg(0)] = func_get_arg(1); $whereArguments[func_get_arg(0)] = func_get_arg(1);
} else { } else {
throw new InvalidArgumentException('Arguments passed to filter() is wrong'); throw new InvalidArgumentException('Incorrect number of arguments passed to filter()');
} }
$SQL_Statements = array(); $SQL_Statements = array();
@ -307,19 +307,19 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
* *
* @todo extract the sql from this method into a SQLGenerator class * @todo extract the sql from this method into a SQLGenerator class
* *
* @param String|array Escaped SQL statement. If passed as array, all keys and values are assumed to be escaped. * @param string|array Escaped SQL statement. If passed as array, all keys and values are assumed to be escaped.
* @return DataList * @return DataList
*/ */
public function exclude(){ public function exclude() {
$numberFuncArgs = count(func_get_args()); $numberFuncArgs = count(func_get_args());
$whereArguments = array(); $whereArguments = array();
if($numberFuncArgs == 1 && is_array(func_get_arg(0))){ if($numberFuncArgs == 1 && is_array(func_get_arg(0))) {
$whereArguments = func_get_arg(0); $whereArguments = func_get_arg(0);
} elseif($numberFuncArgs == 2) { } elseif($numberFuncArgs == 2) {
$whereArguments[func_get_arg(0)] = func_get_arg(1); $whereArguments[func_get_arg(0)] = func_get_arg(1);
} else { } else {
throw new InvalidArgumentException('Arguments passed to exclude() is wrong'); throw new InvalidArgumentException('Incorrect number of arguments pased to exclude()');
} }
$SQL_Statements = array(); $SQL_Statements = array();