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

Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3

Browse source
This commit is contained in:
Mark Story 2010-02-28 12:26:54 -05:00
commit 6360d8d306
2 changed files with 64 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -542,7 +542,7 @@ class Controller extends Object {
* @access public * @access public
*/ */
function shutdownProcess() { function shutdownProcess() {
$this->Component->triggerCallback('shutdown', $controller); $this->Component->triggerCallback('shutdown', $this);
$this->afterFilter(); $this->afterFilter();
} }

64
cake/tests/cases/libs/controller/controller.test.php
View file

@ -366,6 +366,31 @@ class TestComponent extends Object {
*/ */
function beforeRedirect() { function beforeRedirect() {
} }
/**
* initialize method
*
* @access public
* @return void
*/
function initialize(&$controller) {
}
/**
* startup method
*
* @access public
* @return void
*/
function startup(&$controller) {
}
/**
* shutdown method
*
* @access public
* @return void
*/
function shutdown(&$controller) {
}
} }
/** /**
@ -382,7 +407,6 @@ class AnotherTestController extends AppController {
* @access public * @access public
*/ */
var $name = 'AnotherTest'; var $name = 'AnotherTest';
/** /**
* uses property * uses property
* *
@ -1307,5 +1331,43 @@ class ControllerTest extends CakeTestCase {
$expected = array(404 => 'Sorry Bro'); $expected = array(404 => 'Sorry Bro');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }
/**
* Tests that the startup process calls the correct functions
*
* @access public
* @return void
*/
function testStartupProcess() {
Mock::generatePartial('AnotherTestController','MockedController', array('beforeFilter'));
Mock::generate('TestComponent', 'MockTestComponent', array('startup', 'initialize'));
$MockedController =& new MockedController();
$MockedController->components = array('MockTest');
$MockedController->Component =& new Component();
$MockedController->Component->init($MockedController);
$MockedController->startupProcess();
$MockedController->expectCallCount('beforeFilter', 1);
$MockedController->MockTest->expectOnce('initialize', array($MockedController));
$MockedController->MockTest->expectOnce('startup', array($MockedController));
}
/**
* Tests that the shutdown process calls the correct functions
*
* @access public
* @return void
*/
function testShutdownProcess() {
Mock::generatePartial('AnotherTestController','MockedController2', array('afterFilter'));
Mock::generate('TestComponent', 'MockTestComponent', array('shutdown'));
$MockedController =& new MockedController2();
$MockedController->components = array('MockTest');
$MockedController->Component =& new Component();
$MockedController->Component->init($MockedController);
$MockedController->shutdownProcess();
$MockedController->expectCallCount('afterFilter', 1);
$MockedController->MockTest->expectOnce('shutdown', array($MockedController));
}
} }
?> ?>