adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing the deprecated properties.

Browse source 
Removing property copying to helpers.
Making the view test cases pass again.
This commit is contained in:
mark_story 2010-09-10 23:55:42 -04:00
parent 634cea24eb
commit e4b2fb173b
4 changed files with 30 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,7 +341,7 @@ class Controller extends Object {
case 'data':
return $this->request->{$name};
case 'action':
return $this->request->params['action'];
return isset($this->request->params['action']) ? $this->request->params['action'] : '';
case 'params':
return $this->request;
}

2
cake/libs/view/helper_collection.php
View file

@ -68,7 +68,7 @@ class HelperCollection extends ObjectCollection {
}
$this->_loaded[$name] = new $helperClass($this->_View, $settings);
$vars = array('request', 'base', 'webroot', 'here', 'params', 'action', 'data', 'theme', 'plugin');
$vars = array('request', 'theme', 'plugin');
foreach ($vars as $var) {
$this->_loaded[$name]->{$var} = $this->_View->{$var};
}

71
cake/libs/view/view.php
View file

@ -42,21 +42,6 @@ class View extends Object {
*/
public $Helpers;
/**
* Path parts for creating links in views.
*
* @var string Base URL
* @access public
*/
public $base = null;
/**
* Stores the current URL (for links etc.)
*
* @var string Current URL
*/
public $here = null;
/**
* Name of the plugin.
*
@ -73,21 +58,6 @@ class View extends Object {
*/
public $name = null;
/**
* Action to be performed.
*
* @var string Name of action
* @access public
*/
public $action = null;
/**
* Array of parameter data
*
* @var array Parameter data
*/
public $params = array();
/**
* Current passed params
*
@ -95,13 +65,6 @@ class View extends Object {
*/
public $passedArgs = array();
/**
* Array of data
*
* @var array Parameter data
*/
public $data = array();
/**
* An array of names of built-in helpers to include.
*
@ -269,6 +232,15 @@ class View extends Object {
*/
public $output = false;
/**
* An instance of a CakeRequest object that contains information about the current request.
* This object contains all the information about a request and several methods for reading
* additional information about the request.
*
* @var CakeRequest
*/
public $request;
/**
* List of variables to collect from the associated controller
*
@ -276,9 +248,8 @@ class View extends Object {
* @access protected
*/
private $__passedVars = array(
'viewVars', 'autoLayout', 'autoRender', 'ext', 'base', 'webroot',
'helpers', 'here', 'layout', 'name', 'layoutPath', 'viewPath',
'params', 'request', 'data', 'plugin', 'passedArgs', 'cacheAction'
'viewVars', 'autoLayout', 'autoRender', 'ext', 'helpers', 'layout', 'name',
'layoutPath', 'viewPath', 'request', 'plugin', 'passedArgs', 'cacheAction'
);
/**
@ -645,17 +616,25 @@ class View extends Object {
}
/**
* Magic accessor for helpers.
* Magic accessor for helpers. Provides access to attributes that were deprecated.
*
* @return void
* @param string $name Name of the attribute to get.
* @return mixed
*/
public function __get($name) {
if (isset($this->Helpers->{$name})) {
return $this->Helpers->{$name};
}
switch ($name) {
case 'base':
case 'here':
case 'webroot':
case 'data':
return $this->request->{$name};
case 'action':
return $this->request->params['action'];
return isset($this->request->params['action']) ? $this->request->params['action'] : '';
case 'params':
return $this->request;
}
return null;
}
@ -712,10 +691,10 @@ class View extends Object {
if ($caching) {
if (isset($this->Helpers->Cache)) {
$cache =& $this->Helpers->Cache;
$cache->base = $this->base;
$cache->here = $this->here;
$cache->base = $this->request->base;
$cache->here = $this->request->here;
$cache->helpers = $this->helpers;
$cache->action = $this->action;
$cache->action = $this->request->action;
$cache->controllerName = $this->name;
$cache->layout = $this->layout;
$cache->cacheAction = $this->cacheAction;

7
cake/tests/cases/libs/view/view.test.php
View file

@ -19,10 +19,8 @@
*/
App::import('Core', array('View', 'Controller'));
App::import('Helper', 'Cache');
App::import('Core', array('ErrorHandler'));
if (!class_exists('ErrorHandler')) {
App::import('Core', array('Error'));
}
/**
* ViewPostsController class
@ -227,8 +225,9 @@ class ViewTest extends CakeTestCase {
*/
function setUp() {
Router::reload();
$this->Controller = new Controller();
$request = $this->getMock('CakeRequest');
$this->Controller = new Controller($request);
$this->PostsController = new ViewPostsController($request);
$this->PostsController->viewPath = 'posts';
$this->PostsController->index();