Merge pull request #443 from FriendsOfCake/cake-3.3

Account for new PSR7 middleware of Cake 3.3.
FriendsOfCake · Aug 27, 2016 · 038cb86 · 038cb86
2 parents c837b74 + 80d0bc0
commit 038cb86
Show file tree

Hide file tree

Showing 16 changed files with 317 additions and 276 deletions.
diff --git a/docs/listeners/api.rst b/docs/listeners/api.rst
@@ -115,6 +115,10 @@ class and enabling it with the `exceptionRenderer` configuration option.
     }
   }
 
+However if you are using CakePHP 3.3's PSR7 middleware feature the ``exceptionRenderer``
+config won't be used and instead you will have to set the ``Error.exceptionRenderer``
+config in ``config/app.php`` to ``'Crud\Error\ExceptionRenderer'``.
+
 Request type enforcing
 ----------------------
 

diff --git a/src/Listener/ApiListener.php b/src/Listener/ApiListener.php
@@ -84,7 +84,13 @@ public function setup()
             return;
         }
 
-        $this->registerExceptionHandler();
+        $appClass = Configure::read('App.namespace') . '\Application';
+
+        // If `App\Application` class exists it means Cake 3.3's PSR7 middleware
+        // implementation is used and it's too late to register new error handler.
+        if (!class_exists($appClass, false)) {
+            $this->registerExceptionHandler();
+        }
     }
 
     /**

diff --git a/src/TestSuite/IntegrationTestCase.php b/src/TestSuite/IntegrationTestCase.php
@@ -4,6 +4,7 @@
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Event\EventManager;
+use Cake\Routing\Router;
 use Crud\TestSuite\Traits\CrudTestTrait;
 use FriendsOfCake\TestUtilities\AccessibilityHelperTrait;
 use FriendsOfCake\TestUtilities\CounterHelperTrait;
@@ -35,5 +36,14 @@ public function setUp()
         $existing = Configure::read('App.paths.templates');
         $existing[] = Plugin::path('Crud') . 'tests/App/Template/';
         Configure::write('App.paths.templates', $existing);
+
+
+        Configure::write('App.namespace', 'Crud\Test\App');
+
+        Router::extensions('json');
+
+        Router::connect('/:controller', ['action' => 'index'], ['routeClass' => 'DashedRoute']);
+        Router::connect('/:controller/:action/*', [], ['routeClass' => 'DashedRoute']);
+        $this->useHttpServer(false);
     }
 }
diff --git a/tests/TestCase/Action/AddActionTest.php b/tests/TestCase/Action/AddActionTest.php
@@ -82,13 +82,13 @@ public function testActionGetWithQueryArgs()
     public function testActionPost()
     {
         $this->_eventManager->on(
-            'Dispatcher.beforeDispatch',
+            'Dispatcher.invokeController',
             ['priority' => 1000],
             function ($event) {
-                $this->_controller->Flash = $this->getMock(
-                    'Cake\Controller\Component\Flash',
-                    ['set']
-                );
+                $this->_controller->Flash = $this->getMockBuilder('Cake\Controller\Component\FlashComponent')
+                    ->setMethods(['set'])
+                    ->disableOriginalConstructor()
+                    ->getMock();
 
                 $this->_controller->Flash
                     ->expects($this->once())
@@ -127,13 +127,13 @@ function ($event) {
     public function testActionPostWithAddRedirect()
     {
         $this->_eventManager->on(
-            'Dispatcher.beforeDispatch',
+            'Dispatcher.invokeController',
             ['priority' => 1000],
             function ($event) {
-                $this->_controller->Flash = $this->getMock(
-                    'Cake\Controller\Component\Flash',
-                    ['set']
-                );
+                $this->_controller->Flash = $this->getMockBuilder('Cake\Controller\Component\FlashComponent')
+                    ->setMethods(['set'])
+                    ->disableOriginalConstructor()
+                    ->getMock();
 
                 $this->_controller->Flash
                     ->expects($this->once())
@@ -172,13 +172,13 @@ function ($event) {
     public function testActionPostWithEditRedirect()
     {
         $this->_eventManager->on(
-            'Dispatcher.beforeDispatch',
+            'Dispatcher.invokeController',
             ['priority' => 1000],
             function ($event) {
-                $this->_controller->Flash = $this->getMock(
-                    'Cake\Controller\Component\Flash',
-                    ['set']
-                );
+                $this->_controller->Flash = $this->getMockBuilder('Cake\Controller\Component\FlashComponent')
+                    ->setMethods(['set'])
+                    ->disableOriginalConstructor()
+                    ->getMock();
 
                 $this->_controller->Flash
                     ->expects($this->once())
@@ -216,13 +216,13 @@ function ($event) {
     public function testActionPostErrorSave()
     {
         $this->_eventManager->on(
-            'Dispatcher.beforeDispatch',
+            'Dispatcher.invokeController',
             ['priority' => 1000],
             function ($event) {
-                $this->_controller->Flash = $this->getMock(
-                    'Cake\Controller\Component\Flash',
-                    ['set']
-                );
+                $this->_controller->Flash = $this->getMockBuilder('Cake\Controller\Component\FlashComponent')
+                    ->setMethods(['set'])
+                    ->disableOriginalConstructor()
+                    ->getMock();
 
                 $this->_controller->Flash
                     ->expects($this->once())
@@ -269,13 +269,13 @@ function ($event) {
     public function testActionPostValidationErrors()
     {
         $this->_eventManager->on(
-            'Dispatcher.beforeDispatch',
+            'Dispatcher.invokeController',
             ['priority' => 1000],
             function ($event) {
-                $this->_controller->Flash = $this->getMock(
-                    'Cake\Controller\Component\Flash',
-                    ['set']
-                );
+                $this->_controller->Flash = $this->getMockBuilder('Cake\Controller\Component\FlashComponent')
+                    ->setMethods(['set'])
+                    ->disableOriginalConstructor()
+                    ->getMock();
 
                 $this->_controller->Flash
                     ->expects($this->once())
@@ -339,7 +339,6 @@ public function apiGetHttpMethodProvider()
      */
     public function testApiGet($method)
     {
-        Router::extensions(['json']);
         Router::scope('/', function ($routes) {
             $routes->extensions(['json']);
             $routes->fallbacks();
@@ -374,13 +373,13 @@ public function apiUpdateHttpMethodProvider()
     public function testApiCreate($method)
     {
         $this->_eventManager->on(
-            'Dispatcher.beforeDispatch',
+            'Dispatcher.invokeController',
             ['priority' => 1000],
             function ($event) {
-                $this->_controller->Flash = $this->getMock(
-                    'Cake\Controller\Component\Flash',
-                    ['set']
-                );
+                $this->_controller->Flash = $this->getMockBuilder('Cake\Controller\Component\FlashComponent')
+                    ->setMethods(['set'])
+                    ->disableOriginalConstructor()
+                    ->getMock();
 
                 $this->_controller->Flash
                     ->expects($this->never())
@@ -393,8 +392,6 @@ function ($event) {
             }
         );
 
-        Router::extensions('json');
-
         $this->{$method}('/blogs/add.json', [
             'name' => '6th blog post',
             'body' => 'Amazing blog post'
@@ -418,16 +415,14 @@ function ($event) {
      */
     public function testApiCreateError($method)
     {
-        Router::extensions('json');
-
         $this->_eventManager->on(
-            'Dispatcher.beforeDispatch',
+            'Dispatcher.invokeController',
             ['priority' => 1000],
             function ($event) {
-                $this->_controller->Flash = $this->getMock(
-                    'Cake\Controller\Component\Flash',
-                    ['set']
-                );
+                $this->_controller->Flash = $this->getMockBuilder('Cake\Controller\Component\FlashComponent')
+                    ->setMethods(['set'])
+                    ->disableOriginalConstructor()
+                    ->getMock();
 
                 $this->_controller->Flash
                     ->expects($this->never())
@@ -468,16 +463,14 @@ function ($event) {
      */
     public function testApiCreateErrors($method)
     {
-        Router::extensions('json');
-
         $this->_eventManager->on(
-            'Dispatcher.beforeDispatch',
+            'Dispatcher.invokeController',
             ['priority' => 1000],
             function ($event) {
-                $this->_controller->Flash = $this->getMock(
-                    'Cake\Controller\Component\Flash',
-                    ['set']
-                );
+                $this->_controller->Flash = $this->getMockBuilder('Cake\Controller\Component\FlashComponent')
+                    ->setMethods(['set'])
+                    ->disableOriginalConstructor()
+                    ->getMock();
 
                 $this->_controller->Flash
                     ->expects($this->never())