tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR If $containerClass passed in to DataObject::get() isn't DataList,

Browse Source 
use Deprecation::notice() instead of throwing a notice
This commit is contained in:
Sean Harvey 2012-05-28 21:12:06 +12:00
parent ed1373d22b
commit 862d7f249b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
model/DataObject.php
View File

@ -2618,15 +2618,15 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* *
* @return mixed The objects matching the filter, in the class specified by $containerClass * @return mixed The objects matching the filter, in the class specified by $containerClass
*/ */
public static function get($callerClass = null, $filter = "", $sort = "", $join = "", $limit = null, $containerClass = "DataList") { public static function get($callerClass = null, $filter = "", $sort = "", $join = "", $limit = null, $containerClass = 'DataList') {
if($callerClass == null) { if($callerClass == null) {
$callerClass = get_called_class(); $callerClass = get_called_class();
if($callerClass == 'DataObject') { if($callerClass == 'DataObject') {
throw new \InvalidArgumentException("Call <classname>::get() instead of DataObject::get()"); throw new \InvalidArgumentException('Call <classname>::get() instead of DataObject::get()');
} }
if($filter || $sort || $join || $limit || ($containerClass != "DataList")) { if($filter || $sort || $join || $limit || ($containerClass != 'DataList')) {
throw new \InvalidArgumentException("If calling <classname>::get() then you shouldn't pass any other arguments"); throw new \InvalidArgumentException('If calling <classname>::get() then you shouldn\'t pass any other arguments');
} }
$result = DataList::create(get_called_class()); $result = DataList::create(get_called_class());
@ -2636,15 +2636,21 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// Todo: Determine if we can deprecate for 3.0.0 and use DI or something instead // Todo: Determine if we can deprecate for 3.0.0 and use DI or something instead
// Todo: Make the $containerClass method redundant // Todo: Make the $containerClass method redundant
if($containerClass != "DataList") user_error("The DataObject::get() \$containerClass argument has been deprecated", E_USER_NOTICE); if($containerClass != 'DataList') {
Deprecation::notice('3.0', '$containerClass argument is deprecated.');
}
$result = DataList::create($callerClass)->where($filter)->sort($sort); $result = DataList::create($callerClass)->where($filter)->sort($sort);
if($limit && strpos($limit, ',') !== false) { if($limit && strpos($limit, ',') !== false) {
$limitArguments = explode(',', $limit); $limitArguments = explode(',', $limit);
$result->limit($limitArguments[1],$limitArguments[0]); $result->limit($limitArguments[1],$limitArguments[0]);
} elseif($limit) { } elseif($limit) {
$result->limit($limit); $result->limit($limit);
} }
if($join) $result = $result->join($join); if($join) $result = $result->join($join);
$result->setDataModel(DataModel::inst()); $result->setDataModel(DataModel::inst());
return $result; return $result;
} }