Merge pull request #242 from FriendsOfCake/3.0-fix-api-exceptions

Fix API exception rendering
FriendsOfCake · Jan 27, 2015 · e342e58 · e342e58
2 parents 7a12a35 + 21679c1
commit e342e58
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 41 deletions.
diff --git a/src/Error/ExceptionRenderer.php b/src/Error/ExceptionRenderer.php
@@ -44,7 +44,7 @@ public function validation($error)
             '_serialize' => ['code', 'url', 'message', 'errorCount', 'errors']
         ];
         $this->controller->set($sets);
-        $this->_outputMessage('error400');
+        return $this->_outputMessage('error400');
     }
 
     /**

diff --git a/src/Listener/ApiListener.php b/src/Listener/ApiListener.php
@@ -2,6 +2,7 @@
 namespace Crud\Listener;
 
 use Cake\Core\Configure;
+use Cake\Error\ErrorHandler;
 use Cake\Event\Event;
 use Cake\Network\Exception\BadRequestException;
 use Cake\Network\Request;
@@ -151,7 +152,8 @@ protected function _checkRequestMethods()
      */
     public function registerExceptionHandler()
     {
-        Configure::write('Error.exceptionRenderer', 'Crud\Error\ExceptionRenderer');
+        $exceptionRenderer = 'Crud\Error\ExceptionRenderer';
+        (new ErrorHandler(compact('exceptionRenderer') + (array)Configure::read('Error')))->register();
     }
 
     /**

diff --git a/tests/TestCase/Listener/ApiListenerTest.php b/tests/TestCase/Listener/ApiListenerTest.php
@@ -1022,45 +1022,6 @@ public function testSetupDetectorsIntigration()
         );
     }
 
-    /**
-     * testRegisterExceptionHandler with Api request
-     *
-     * @return void
-     */
-    public function testRegisterExceptionHandlerWithApi()
-    {
-        $listener = $this
-            ->getMockBuilder('\Crud\Listener\ApiListener')
-            ->setMethods(null)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $listener->registerExceptionHandler();
-
-        $expected = 'Crud\Error\ExceptionRenderer';
-        $result = Configure::read('Error.exceptionRenderer');
-        $this->assertEquals($expected, $result);
-    }
-
-    /**
-     * testRegisterExceptionHandler without Api request
-     *
-     * @return void
-     */
-    public function testRegisterExceptionHandlerWithoutApi()
-    {
-        $listener = $this
-            ->getMockBuilder('\Crud\Listener\ApiListener')
-            ->setMethods(null)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $listener->registerExceptionHandler();
-
-        $expected = 'Crud\Error\ExceptionRenderer';
-        $result = Configure::read('Error.exceptionRenderer');
-        $this->assertEquals($expected, $result);
-    }
     /**
      * data provider for testCheckRequestMethods
      *