adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue where abstract or interface controllers

Browse source 
would be constructed by Dispatcher.
Tests added.
Fixes #2048
This commit is contained in:
mark_story 2011-09-30 22:40:30 -04:00
parent 115c656dcc
commit 4810518c7d
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Routing/Dispatcher.php
View file

@ -159,7 +159,11 @@ class Dispatcher {
if (!$ctrlClass) {
return false;
}
return new $ctrlClass($request, $response);
$reflection = new ReflectionClass($ctrlClass);
if ($reflection->isAbstract() || $reflection->isInterface()) {
return false;
}
return $reflection->newInstance($request, $response);
}
/**

43
lib/Cake/Test/Case/Routing/DispatcherTest.php
View file

@ -64,6 +64,14 @@ class TestDispatcher extends Dispatcher {
class MyPluginAppController extends AppController {
}
abstract class DispatcherTestAbstractController extends Controller {
abstract public function index();
}
interface DispatcherTestInterfaceController {
public function index();
}
/**
* MyPluginController class
*
@ -680,6 +688,41 @@ class DispatcherTest extends CakeTestCase {
$controller = $Dispatcher->dispatch($url, $response, array('return' => 1));
}
/**
* testMissingControllerInterface method
*
* @expectedException MissingControllerException
* @expectedExceptionMessage Controller class DispatcherTestInterfaceController could not be found.
* @return void
*/
public function testMissingControllerInterface() {
Router::connect('/:controller/:action/*');
$Dispatcher = new TestDispatcher();
Configure::write('App.baseUrl', '/index.php');
$url = new CakeRequest('dispatcher_test_interface/index');
$response = $this->getMock('CakeResponse');
$controller = $Dispatcher->dispatch($url, $response, array('return' => 1));
}
/**
* testMissingControllerInterface method
*
* @expectedException MissingControllerException
* @expectedExceptionMessage Controller class DispatcherTestAbstractController could not be found.
* @return void
*/
public function testMissingControllerAbstract() {
Router::connect('/:controller/:action/*');
$Dispatcher = new TestDispatcher();
Configure::write('App.baseUrl', '/index.php');
$url = new CakeRequest('dispatcher_test_abstract/index');
$response = $this->getMock('CakeResponse');
$controller = $Dispatcher->dispatch($url, $response, array('return' => 1));
}
/**
* testDispatch method
*