Use is_subclass_of instead of Reflection when possible

Author: GuilhemN

Controller/ExceptionController.php

@@ -185,18 +185,12 @@ protected function getAndCleanOutputBuffering(Request $request)
     protected function isSubclassOf($exception, $exceptionMap)
     {
         $exceptionClass = $exception->getClass();
-        $reflectionExceptionClass = new \ReflectionClass($exceptionClass);
-        try {
-            foreach ($exceptionMap as $exceptionMapClass => $value) {
-                if ($value
-                    && ($exceptionClass === $exceptionMapClass || $reflectionExceptionClass->isSubclassOf($exceptionMapClass))
-                ) {
-                    return $value;
-                }
+        foreach ($exceptionMap as $exceptionMapClass => $value) {
+            if ($value
+                && ($exceptionClass === $exceptionMapClass || is_subclass_of($exceptionClass, $exceptionMapClass))
+            ) {
+                return $value;
             }
-        } catch (\ReflectionException $re) {
-            return 'FOSUserBundle: Invalid class in  fos_res.exception.messages: '
-                    .$re->getMessage();
         }
 
         return false;

Routing/Loader/Reader/RestActionReader.php

@@ -351,7 +351,8 @@ private function getMethodArguments(\ReflectionMethod $method)
             $argumentClass = $argument->getClass();
             if ($argumentClass) {
                 foreach ($ignoreClasses as $class) {
-                    if ($argumentClass->getName() === $class || $argumentClass->isSubclassOf($class)) {
+                    $className = $argumentClass->getName();
+                    if ($className === $class || is_subclass_of($className)) {
                         continue 2;
                     }
                 }

Tests/Functional/Bundle/TestBundle/Controller/SerializerErrorController.php

@@ -25,9 +25,9 @@ class SerializerErrorController extends Controller
     /**
      * @View
      */
-    public function exceptionAction()
+    public function logicExceptionAction()
     {
-        throw new \Exception('Something bad happened.');
+        throw new \LogicException('Something bad happened.');
     }
 
     /**

Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml

@@ -4,7 +4,7 @@ request_body_param_converter:
 
 test_serializer_error_exception:
     path:     /serializer-error/exception.{_format}
-    defaults: { _controller: TestBundle:SerializerError:exception }
+    defaults: { _controller: TestBundle:SerializerError:logicException }
 
 test_serializer_error_invalid_form:
     path:     /serializer-error/invalid-form.{_format}
@@ -20,4 +20,4 @@ test_param_fetcher_test:
 
 test_view_response_listener:
     resource: FOS\RestBundle\Tests\Functional\Bundle\TestBundle\Controller\ArticleController
-    type:     rest
+    type:     rest

Tests/Functional/SerializerErrorTest.php

@@ -25,7 +25,7 @@ public function testSerializeExceptionJson($testCase, $expectedContent)
     {
         $this->iniSet('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul');
 
-        $client = $this->createClient(array('test_case' => $testCase));
+        $client = $this->createClient(array('test_case' => $testCase, 'debug' => false));
         $client->request('GET', '/serializer-error/exception.json');
 
         $this->assertEquals($expectedContent, $client->getResponse()->getContent());
@@ -46,7 +46,7 @@ public function testSerializeExceptionXml($testCase, $expectedContent)
     {
         $this->iniSet('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul');
 
-        $client = $this->createClient(array('test_case' => $testCase));
+        $client = $this->createClient(array('test_case' => $testCase, 'debug' => false));
         $client->request('GET', '/serializer-error/exception.xml');
 
         $this->assertEquals($expectedContent, $client->getResponse()->getContent());
@@ -81,7 +81,7 @@ public function serializeExceptionXmlProvider()
      */
     public function testSerializeInvalidFormJson($testCase, $expectedContent)
     {
-        $client = $this->createClient(array('test_case' => $testCase));
+        $client = $this->createClient(array('test_case' => $testCase, 'debug' => false));
         $client->request('GET', '/serializer-error/invalid-form.json');
 
         $this->assertEquals($expectedContent, $client->getResponse()->getContent());
@@ -100,7 +100,7 @@ public function serializeInvalidFormJsonProvider()
      */
     public function testSerializeInvalidFormXml($testCase, $expectedContent)
     {
-        $client = $this->createClient(array('test_case' => $testCase));
+        $client = $this->createClient(array('test_case' => $testCase, 'debug' => false));
         $client->request('GET', '/serializer-error/invalid-form.xml');
 
         $this->assertEquals($expectedContent, $client->getResponse()->getContent());

Tests/Functional/app/JMSSerializer/config.yml

@@ -1,8 +1,7 @@
 imports:
     - { resource: ../config/default.yml }
+    - { resource: ../config/exception_listener.yml }
 
 fos_rest:
     view:
         view_response_listener: 'force'
-    exception:
-        enabled: true

Tests/Functional/app/Serializer/config.yml

@@ -1,5 +1,6 @@
 imports:
     - { resource: ../config/default.yml }
+    - { resource: ../config/exception_listener.yml }
 
 framework:
     serializer:
@@ -8,5 +9,3 @@ framework:
 fos_rest:
     view:
         view_response_listener: 'force'
-    exception:
-        enabled: true

Tests/Functional/app/config/exception_listener.yml

@@ -0,0 +1,5 @@
+fos_rest:
+    exception:
+        enabled: true
+        messages:
+            LogicException: true