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

FIX: Fix ViewableData::__isset() for getXXX() getters.

Browse Source 
PHP7 is stricter about this.
This commit is contained in:
Sam Minnee 2016-10-26 14:37:58 +13:00
parent 7b44fc7bce
commit c80417a949
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
View/ViewableData.php
View File

@ -81,12 +81,25 @@ class ViewableData extends Object implements IteratorAggregate {
/** /**
* Check if a field exists on this object or its failover. * Check if a field exists on this object or its failover.
* Note that, unlike the core isset() implementation, this will return true if the property is defined
* and set to null.
* *
* @param string $property * @param string $property
* @return bool * @return bool
*/ */
public function __isset($property) { public function __isset($property) {
return $this->hasField($property) || ($this->failover && $this->failover->hasField($property)); // getField() isn't a field-specific getter and shouldn't be treated as such
if(strtolower($property) !== 'field' && $this->hasMethod($method = "get$property")) {
return true;
} elseif($this->hasField($property)) {
return true;
} elseif($this->failover) {
return isset($this->failover->$property);
}
return false;
} }
/** /**
@ -97,13 +110,17 @@ class ViewableData extends Object implements IteratorAggregate {
* @return mixed * @return mixed
*/ */
public function __get($property) { public function __get($property) {
if($this->hasMethod($method = "get$property")) { // getField() isn't a field-specific getter and shouldn't be treated as such
if(strtolower($property) !== 'field' && $this->hasMethod($method = "get$property")) {
return $this->$method(); return $this->$method();
} elseif($this->hasField($property)) { } elseif($this->hasField($property)) {
return $this->getField($property); return $this->getField($property);
} elseif($this->failover) { } elseif($this->failover) {
return $this->failover->$property; return $this->failover->$property;
} }
return null; return null;
} }