adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-06 03:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding a __set() method to make some tests pass.

Browse source 
Updating internal usage to not use deprecated attributes.
Updating test cases to not use deprecated attributes.
This commit is contained in:
mark_story 2010-09-10 23:37:15 -04:00
parent 84565151de
commit a521291afd
2 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cake/libs/controller/controller.php
View file

@ -348,6 +348,26 @@ class Controller extends Object {
return null;
}
/**
* Provides backwards compatiblity access for setting values to the request object.
*
* @return void
*/
public function __set($name, $value) {
switch ($name) {
case 'base':
case 'here':
case 'webroot':
case 'data':
return $this->request->{$name} = $value;
case 'action':
return $this->request->params['action'] = $value;
case 'params':
return $this->request->params = $value;
}
return $this->{$name} = $value;
}
/**
* Sets the request objects and configures a number of controller properties
* based on the contents of the request.
@ -716,7 +736,7 @@ class Controller extends Object {
* @return mixed Returns the return value of the called action
*/
public function setAction($action) {
$this->action = $action;
$this->request->action = $action;
$args = func_get_args();
unset($args[0]);
return call_user_func_array(array(&$this, $action), $args);
@ -798,7 +818,7 @@ class Controller extends Object {
App::import('View', $this->view);
}
$this->params['models'] = $this->modelNames;
$this->request->params['models'] = $this->modelNames;
$View = new $viewClass($this);
@ -899,8 +919,8 @@ class Controller extends Object {
*/
public function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive = false) {
if (!is_array($data) || empty($data)) {
if (!empty($this->data)) {
$data = $this->data;
if (!empty($this->request->data)) {
$data = $this->request->data;
} else {
return null;
}