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

allowing beforeFilter or Component::startup() to change params. closes #1643. Removed Controller::$namedArgs, passedArgs provides the same functionality, updated dispatcher test.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5824 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-10-20 23:59:46 +00:00
parent 7a1ec65ee7
commit 2eec6dc943
2 changed files with 63 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cake/dispatcher.php
View file

@ -184,16 +184,14 @@ class Dispatcher extends Object {
$controller->base = $this->base; $controller->base = $this->base;
$controller->here = $this->here; $controller->here = $this->here;
$controller->webroot = $this->webroot; $controller->webroot = $this->webroot;
$controller->params = $this->params;
$controller->plugin = $this->plugin; $controller->plugin = $this->plugin;
$controller->action = $this->params['action']; $controller->params =& $this->params;
$controller->webservices = $this->params['webservices']; $controller->action =& $this->params['action'];
$controller->webservices =& $this->params['webservices'];
$controller->passedArgs =& $this->params['pass'];
$controller->passedArgs = $this->params['pass']; if (!empty($this->params['data'])) {
$controller->namedArgs = Set::diff(Set::extract($this->params['pass'], '{n}'), $this->params['pass']); $controller->data =& $this->params['data'];
if (!empty($controller->params['data'])) {
$controller->data =& $controller->params['data'];
} else { } else {
$controller->data = null; $controller->data = null;
} }
@ -235,8 +233,9 @@ class Dispatcher extends Object {
$controller->constructClasses(); $controller->constructClasses();
$this->start($controller);
if ($privateAction) { if ($privateAction) {
$this->start($controller);
return $this->cakeError('privateAction', array( return $this->cakeError('privateAction', array(
array( array(
'className' => Inflector::camelize($this->params['controller']."Controller"), 'className' => Inflector::camelize($this->params['controller']."Controller"),
@ -261,9 +260,7 @@ class Dispatcher extends Object {
* @access protected * @access protected
*/ */
function _invoke (&$controller, $params, $missingAction = false) { function _invoke (&$controller, $params, $missingAction = false) {
$this->start($controller);
$classVars = get_object_vars($controller); $classVars = get_object_vars($controller);
if ($missingAction && in_array('scaffold', array_keys($classVars))) { if ($missingAction && in_array('scaffold', array_keys($classVars))) {
uses('controller'. DS . 'scaffold'); uses('controller'. DS . 'scaffold');
return new Scaffold($controller, $params); return new Scaffold($controller, $params);

68
cake/tests/cases/dispatcher.test.php
View file

@ -32,11 +32,10 @@ require_once CAKE.'app_controller.php';
class TestDispatcher extends Dispatcher { class TestDispatcher extends Dispatcher {
function _invoke(&$controller, $params, $missingAction) { function _invoke(&$controller, $params, $missingAction) {
$this->start($controller); $controller->params =& $params;
$classVars = get_object_vars($controller); $classVars = get_object_vars($controller);
if ($missingAction && in_array('scaffold', array_keys($classVars))) { if ($missingAction && in_array('scaffold', array_keys($classVars))) {
uses('controller'. DS . 'scaffold'); uses('controller'. DS . 'scaffold');
return new Scaffold($controller, $params); return new Scaffold($controller, $params);
} elseif ($missingAction && !in_array('scaffold', array_keys($classVars))) { } elseif ($missingAction && !in_array('scaffold', array_keys($classVars))) {
return $this->cakeError('missingAction', array( return $this->cakeError('missingAction', array(
@ -52,10 +51,6 @@ class TestDispatcher extends Dispatcher {
return $controller; return $controller;
} }
function start(&$controller) {
return;
}
function cakeError($filename) { function cakeError($filename) {
return $filename; return $filename;
} }
@ -131,6 +126,22 @@ class ArticlesTestController extends ArticlesTestAppController {
return true; return true;
} }
} }
class SomePostsController extends AppController {
var $name = 'SomePosts';
var $uses = array();
var $autoRender = false;
function beforeFilter() {
$this->params['action'] = 'view';
$this->params['pass'] = array('changed');
}
function index() {
return true;
}
}
/** /**
* Short description for class. * Short description for class.
* *
@ -370,6 +381,15 @@ class DispatcherTest extends UnitTestCase {
$expectedWebroot = '/CakeBB/app/webroot/'; $expectedWebroot = '/CakeBB/app/webroot/';
$this->assertEqual($expectedWebroot, $dispatcher->webroot); $this->assertEqual($expectedWebroot, $dispatcher->webroot);
Configure::write('App.baseUrl', '/dbhauser/index.php');
$_SERVER['DOCUMENT_ROOT'] = '/kunden/homepages/4/d181710652/htdocs/joomla';
$_SERVER['SCRIPT_FILENAME'] = '/kunden/homepages/4/d181710652/htdocs/joomla/dbhauser/index.php';
$result = $dispatcher->baseUrl();
$expected = '/dbhauser/index.php';
$this->assertEqual($expected, $result);
$expectedWebroot = '/dbhauser/app/webroot/';
$this->assertEqual($expectedWebroot, $dispatcher->webroot);
} }
function testBaseUrlAndWebrootWithBase() { function testBaseUrlAndWebrootWithBase() {
@ -447,8 +467,8 @@ class DispatcherTest extends UnitTestCase {
$expected = 'Pages'; $expected = 'Pages';
$this->assertEqual($expected, $controller->name); $this->assertEqual($expected, $controller->name);
$expected = array('param' => 'value', 'param2' => 'value2'); $expected = array('0' => 'home', 'param' => 'value', 'param2' => 'value2');
$this->assertIdentical($expected, $controller->namedArgs); $this->assertIdentical($expected, $controller->passedArgs);
} }
function testAdminDispatch() { function testAdminDispatch() {
@ -469,7 +489,7 @@ class DispatcherTest extends UnitTestCase {
$this->assertEqual($expected, $controller->name); $this->assertEqual($expected, $controller->name);
$expected = array('param' => 'value', 'param2' => 'value2'); $expected = array('param' => 'value', 'param2' => 'value2');
$this->assertIdentical($expected, $controller->namedArgs); $this->assertIdentical($expected, $controller->passedArgs);
$this->assertTrue($controller->params['admin']); $this->assertTrue($controller->params['admin']);
$expected = '/cake/repo/branches/1.2.x.x/index.php/admin/test_dispatch_pages/index/param:value/param2:value2'; $expected = '/cake/repo/branches/1.2.x.x/index.php/admin/test_dispatch_pages/index/param:value/param2:value2';
@ -513,8 +533,8 @@ class DispatcherTest extends UnitTestCase {
$expected = 'SomePages'; $expected = 'SomePages';
$this->assertIdentical($expected, $controller->name); $this->assertIdentical($expected, $controller->name);
$expected = array('param'=>'value', 'param2'=>'value2'); $expected = array('0' => 'home', 'param'=>'value', 'param2'=>'value2');
$this->assertIdentical($expected, $controller->namedArgs); $this->assertIdentical($expected, $controller->passedArgs);
$expected = '/cake/repo/branches/1.2.x.x/my_plugin/some_pages/home/param:value/param2:value2'; $expected = '/cake/repo/branches/1.2.x.x/my_plugin/some_pages/home/param:value/param2:value2';
$this->assertIdentical($expected, $controller->here); $this->assertIdentical($expected, $controller->here);
@ -547,7 +567,7 @@ class DispatcherTest extends UnitTestCase {
$this->assertIdentical($expected, $controller->action); $this->assertIdentical($expected, $controller->action);
$expected = array('param'=>'value', 'param2'=>'value2'); $expected = array('param'=>'value', 'param2'=>'value2');
$this->assertIdentical($expected, $controller->namedArgs); $this->assertIdentical($expected, $controller->passedArgs);
$expected = '/cake/repo/branches/1.2.x.x/my_plugin/other_pages/index/param:value/param2:value2'; $expected = '/cake/repo/branches/1.2.x.x/my_plugin/other_pages/index/param:value/param2:value2';
$this->assertIdentical($expected, $controller->here); $this->assertIdentical($expected, $controller->here);
@ -582,6 +602,8 @@ class DispatcherTest extends UnitTestCase {
$this->assertEqual($controller->params['pass'], $expected); $this->assertEqual($controller->params['pass'], $expected);
Router::reload(); Router::reload();
Router::connect('/admin/:controller/:action/*', array('controller' => 'pages', 'action' => 'index', 'admin' => true, 'prefix' => 'admin'));
$dispatcher =& new TestDispatcher(); $dispatcher =& new TestDispatcher();
$dispatcher->base = false; $dispatcher->base = false;
$url = 'admin/articles_test'; $url = 'admin/articles_test';
@ -602,7 +624,7 @@ class DispatcherTest extends UnitTestCase {
'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/articles_test'), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/articles_test'),
'bare' => 0, 'webservices' => null, 'return' => 1 'bare' => 0, 'webservices' => null, 'return' => 1
); );
$this->assertIdentical($controller->params, $expected); $this->assertEqual($controller->params, $expected);
} }
function testAutomaticPluginControllerMissingActionDispatch() { function testAutomaticPluginControllerMissingActionDispatch() {
@ -641,6 +663,26 @@ class DispatcherTest extends UnitTestCase {
$this->assertIdentical($expected, $controller); $this->assertIdentical($expected, $controller);
} }
function testChangingParamsFromBeforeFilter() {
$dispatcher =& new TestDispatcher();
$url = 'some_posts/index/param:value/param2:value2';
restore_error_handler();
$controller = $dispatcher->dispatch($url, array('return' => 1));
set_error_handler('simpleTestErrorHandler');
$expected = 'SomePosts';
$this->assertEqual($expected, $controller->name);
$expected = 'view';
$this->assertEqual($expected, $controller->action);
$expected = array('changed');
$this->assertIdentical($expected, $controller->params['pass']);
}
function tearDown() { function tearDown() {
$_GET = $this->_get; $_GET = $this->_get;
} }