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

Merge pull request #1781 from silverstripe/pulls/3/ss3-php7

Browse Source 
Fixing VirtualPage for php7 patch
This commit is contained in:
Damian Mooyman 2017-04-05 13:09:50 +12:00 committed by GitHub
commit af1002194d
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
code/model/VirtualPage.php
View File

@ -12,7 +12,7 @@ class VirtualPage extends Page {
public static $virtualFields; public static $virtualFields;
/** /**
* @var Array Define fields that are not virtual - the virtual page must define these fields themselves. * @var array Define fields that are not virtual - the virtual page must define these fields themselves.
* Note that anything in {@link self::config()->initially_copied_fields} is implicitly included in this list. * Note that anything in {@link self::config()->initially_copied_fields} is implicitly included in this list.
*/ */
private static $non_virtual_fields = array( private static $non_virtual_fields = array(
@ -30,7 +30,7 @@ class VirtualPage extends Page {
); );
/** /**
* @var Array Define fields that are initially copied to virtual pages but left modifiable after that. * @var array Define fields that are initially copied to virtual pages but left modifiable after that.
*/ */
private static $initially_copied_fields = array( private static $initially_copied_fields = array(
'ShowInMenus', 'ShowInMenus',
@ -416,10 +416,28 @@ class VirtualPage extends Page {
} else if(parent::hasField($field) || ($field === 'ID' && !$this->exists())) { } else if(parent::hasField($field) || ($field === 'ID' && !$this->exists())) {
return $this->getField($field); return $this->getField($field);
} else { } else {
return $this->copyContentFrom()->$field; return $this->CopyContentFrom()->$field;
} }
} }
/**
* Allow attributes on the master page to pass
* through to the virtual page
*
* @param string $field
* @return mixed
*/
public function __isset($field) {
if(parent::hasMethod($funcName = "get$field")) {
return true;
} else if(parent::hasField($field) || ($field === 'ID' && !$this->exists())) {
return true;
} else {
return $this->CopyContentFrom()->__isset($field);
}
}
/** /**
* Pass unrecognized method calls on to the original data object * Pass unrecognized method calls on to the original data object
* *
@ -431,7 +449,7 @@ class VirtualPage extends Page {
if(parent::hasMethod($method)) { if(parent::hasMethod($method)) {
return parent::__call($method, $args); return parent::__call($method, $args);
} else { } else {
return call_user_func_array(array($this->copyContentFrom(), $method), $args); return call_user_func_array(array($this->CopyContentFrom(), $method), $args);
} }
} }
@ -441,13 +459,11 @@ class VirtualPage extends Page {
*/ */
public function hasField($field) { public function hasField($field) {
return ( return (
array_key_exists($field, $this->record) parent::hasField($field)
|| $this->hasDatabaseField($field)
|| array_key_exists($field, $this->db()) // Needed for composite fields
|| parent::hasMethod("get{$field}")
|| $this->CopyContentFrom()->hasField($field) || $this->CopyContentFrom()->hasField($field)
); );
} }
/** /**
* Overwrite to also check for method on the original data object * Overwrite to also check for method on the original data object
* *
@ -455,8 +471,10 @@ class VirtualPage extends Page {
* @return bool * @return bool
*/ */
public function hasMethod($method) { public function hasMethod($method) {
if(parent::hasMethod($method)) return true; return (
return $this->copyContentFrom()->hasMethod($method); parent::hasMethod($method)
|| $this->CopyContentFrom()->hasMethod($method)
);
} }
/** /**
@ -467,8 +485,8 @@ class VirtualPage extends Page {
* @return string * @return string
*/ */
public function castingHelper($field) { public function castingHelper($field) {
if($this->copyContentFrom()) { if($this->CopyContentFrom()) {
return $this->copyContentFrom()->castingHelper($field); return $this->CopyContentFrom()->castingHelper($field);
} else { } else {
return parent::castingHelper($field); return parent::castingHelper($field);
} }
@ -510,8 +528,8 @@ class VirtualPage_Controller extends Page_Controller {
* We can't load the content without an ID or record to copy it from. * We can't load the content without an ID or record to copy it from.
*/ */
public function init(){ public function init(){
if(isset($this->record) && $this->record->ID){ if(isset($this->record) && $this->record['ID']){
if($this->record->VersionID != $this->failover->CopyContentFrom()->Version){ if($this->record['VersionID'] != $this->failover->CopyContentFrom()->Version){
$this->reloadContent(); $this->reloadContent();
$this->VersionID = $this->failover->CopyContentFrom()->VersionID; $this->VersionID = $this->failover->CopyContentFrom()->VersionID;
} }
@ -542,7 +560,7 @@ class VirtualPage_Controller extends Page_Controller {
$originalClass = get_class($this->CopyContentFrom()); $originalClass = get_class($this->CopyContentFrom());
if ($originalClass == 'SiteTree') $name = 'ContentController'; if ($originalClass == 'SiteTree') $name = 'ContentController';
else $name = $originalClass."_Controller"; else $name = $originalClass."_Controller";
$controller = new $name($this->dataRecord->copyContentFrom()); $controller = new $name($this->dataRecord->CopyContentFrom());
$haveIt = $controller->hasMethod($method); $haveIt = $controller->hasMethod($method);
} }
return $haveIt; return $haveIt;
@ -567,7 +585,7 @@ class VirtualPage_Controller extends Page_Controller {
throw $e; throw $e;
} }
$original = $this->copyContentFrom(); $original = $this->CopyContentFrom();
$controller = ModelAsController::controller_for($original); $controller = ModelAsController::controller_for($original);
// Ensure request/response data is available on virtual controller // Ensure request/response data is available on virtual controller