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

FIX for #4129: Ensure belongsToComponent() and hasManyComponent() methods return null instead of false, to be consistent with other relation component methods.

Browse Source
This commit is contained in:
Patrick Nelson 2015-04-28 15:41:19 -04:00
parent 72a284c9b8
commit cadc02b63b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
model/DataObject.php
View File

@ -1857,7 +1857,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @param string $component * @param string $component
* @param bool $classOnly If this is TRUE, than any has_many relationships in the form "ClassName.Field" will have * @param bool $classOnly If this is TRUE, than any has_many relationships in the form "ClassName.Field" will have
* the field data stripped off. It defaults to TRUE. * the field data stripped off. It defaults to TRUE.
* @return string|false * @return string|null
*/ */
public function belongsToComponent($component, $classOnly = true) { public function belongsToComponent($component, $classOnly = true) {
$belongsTo = (array)Config::inst()->get($this->class, 'belongs_to', Config::INHERITED); $belongsTo = (array)Config::inst()->get($this->class, 'belongs_to', Config::INHERITED);
@ -1865,7 +1865,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
if($belongsTo && array_key_exists($component, $belongsTo)) { if($belongsTo && array_key_exists($component, $belongsTo)) {
$belongsTo = $belongsTo[$component]; $belongsTo = $belongsTo[$component];
} else { } else {
return false; return null;
} }
return ($classOnly) ? preg_replace('/(.+)?\..+/', '$1', $belongsTo) : $belongsTo; return ($classOnly) ? preg_replace('/(.+)?\..+/', '$1', $belongsTo) : $belongsTo;
@ -1955,7 +1955,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @param string $component * @param string $component
* @param bool $classOnly If this is TRUE, than any has_many relationships in the form "ClassName.Field" will have * @param bool $classOnly If this is TRUE, than any has_many relationships in the form "ClassName.Field" will have
* the field data stripped off. It defaults to TRUE. * the field data stripped off. It defaults to TRUE.
* @return string|false * @return string|null
*/ */
public function hasManyComponent($component, $classOnly = true) { public function hasManyComponent($component, $classOnly = true) {
$hasMany = (array)Config::inst()->get($this->class, 'has_many', Config::INHERITED); $hasMany = (array)Config::inst()->get($this->class, 'has_many', Config::INHERITED);
@ -1963,7 +1963,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
if($hasMany && array_key_exists($component, $hasMany)) { if($hasMany && array_key_exists($component, $hasMany)) {
$hasMany = $hasMany[$component]; $hasMany = $hasMany[$component];
} else { } else {
return false; return null;
} }
return ($classOnly) ? preg_replace('/(.+)?\..+/', '$1', $hasMany) : $hasMany; return ($classOnly) ? preg_replace('/(.+)?\..+/', '$1', $hasMany) : $hasMany;