[Debug] Remove deprecated ExceptionHandler::createResponse

nicolas-grekas · nicolas-grekas · commit 0254143b7b6b · 2015-08-01T09:05:44.000+02:00
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -1259,3 +1259,18 @@ UPGRADE FROM 2.x to 3.0
 ### HttpFoundation
 
 * `Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface` no longer implements the `IteratorAggregate` interface. Use the `all()` method instead of iterating over the flash bag.
+
+### Debug
+
+ * `DebugClassLoader::__construct()` now accepts only a `callable` argument.
+ * `DebugClassLoader::getClassLoader()` now always returns `callable`.
+ * `DebugClassLoader::findFile()` has been removed.
+ * `ErrorHandler::TYPE_DEPRECATION` has been removed.
+ * `ErrorHandler::setLevel()` has been removed, use throwAt() instead.
+ * `ErrorHandler::setDisplayErrors()` has been removed, use throwAt() instead.
+ * `ErrorHandler::setLogger()` has been removed, use setLoggers() or setDefaultLogger() instead.
+ * `ErrorHandler::handle()` has been removed, use handleError() instead.
+ * `ErrorHandler::handleFatal()` has been removed, use handleFatalError() instead.
+ * `ExceptionHandler::createException()` has been removed.
+ * `ExceptionHandler::utf8Htmlize()` has been removed.
+ * `Exception/DummyException` has been removed.
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -115,7 +115,7 @@ public function setFileLinkFormat($format)
     public function handle(\Exception $exception)
     {
         if (null === $this->handler || $exception instanceof OutOfMemoryException) {
-            $this->failSafeHandle($exception);
+            $this->sendPhpResponse($exception);
 
             return;
         }
@@ -128,8 +128,7 @@ public function handle(\Exception $exception)
             return '';
         });
 
-
-        $this->failSafeHandle($exception);
+        $this->sendPhpResponse($exception);
         while (null === $this->caughtBuffer && ob_end_flush()) {
             // Empty loop, everything is in the condition
         }
@@ -162,33 +161,6 @@ public function handle(\Exception $exception)
         }
     }
 
-    /**
-     * Sends a response for the given Exception.
-     *
-     * If you have the Symfony HttpFoundation component installed,
-     * this method will use it to create and send the response. If not,
-     * it will fallback to plain PHP functions.
-     *
-     * @param \Exception $exception An \Exception instance
-     */
-    private function failSafeHandle(\Exception $exception)
-    {
-        if (class_exists('Symfony\Component\HttpFoundation\Response', false)
-            && __CLASS__ !== get_class($this)
-            && ($reflector = new \ReflectionMethod($this, 'createResponse'))
-            && __CLASS__ !== $reflector->class
-        ) {
-            $response = $this->createResponse($exception);
-            $response->sendHeaders();
-            $response->sendContent();
-            @trigger_error(sprintf("The %s::createResponse method is deprecated since 2.8 and won't be called anymore when handling an exception in 3.0.", $reflector->class), E_USER_DEPRECATED);
-
-            return;
-        }
-
-        $this->sendPhpResponse($exception);
-    }
-
     /**
      * Sends the error associated with the given Exception as a plain PHP response.
      *
@@ -214,26 +186,6 @@ public function sendPhpResponse($exception)
         echo $this->decorate($this->getContent($exception), $this->getStylesheet($exception));
     }
 
-    /**
-     * Creates the error Response associated with the given Exception.
-     *
-     * @param \Exception|FlattenException $exception An \Exception instance
-     *
-     * @return Response A Response instance
-     *
-     * @deprecated since 2.8, to be removed in 3.0.
-     */
-    public function createResponse($exception)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        if (!$exception instanceof FlattenException) {
-            $exception = FlattenException::create($exception);
-        }
-
-        return Response::create($this->decorate($this->getContent($exception), $this->getStylesheet($exception)), $exception->getStatusCode(), $exception->getHeaders())->setCharset($this->charset);
-    }
-
     /**
      * Gets the HTML content associated with the given exception.
      *
