minor #33027 Drop Debug compatibility layers (chalasr)

nicolas-grekas · nicolas-grekas · commit 245c52148940 · 2019-08-08T10:03:03.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- Drop Debug compatibility layers | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | -  Commits ------- 2326b80 [Debug] Drop compatibility layers
diff --git a/src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php b/src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php
@@ -12,6 +12,7 @@
 
 use Composer\Autoload\ClassLoader;
 use ProxyManager\Version;
+use Symfony\Component\ErrorHandler\DebugClassLoader;
 
 if (class_exists(Version::class) && version_compare(\defined(Version::class.'::VERSION') ? Version::VERSION : Version::getVersion(), '2.5', '<')) {
     /**
@@ -51,10 +52,7 @@ public static function generate(string $returnedValueExpression, ?\ReflectionMet
         if ($functionLoader instanceof ClassLoader) {
             return $functionLoader;
         }
-        if ($functionLoader instanceof \Symfony\Component\Debug\DebugClassLoader) {
-            return $getComposerClassLoader($functionLoader->getClassLoader());
-        }
-        if ($functionLoader instanceof \Symfony\Component\ErrorHandler\DebugClassLoader) {
+        if ($functionLoader instanceof DebugClassLoader) {
             return $getComposerClassLoader($functionLoader->getClassLoader());
         }
     };
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -41,8 +41,6 @@
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Debug\ErrorHandler as LegacyErrorHandler;
-use Symfony\Component\Debug\Exception\FatalThrowableError as LegacyFatalThrowableError;
 use Symfony\Component\ErrorHandler\ErrorHandler;
 use Symfony\Component\ErrorHandler\Exception\FatalThrowableError;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -124,7 +122,7 @@ public function run(InputInterface $input = null, OutputInterface $output = null
 
         $renderException = function ($e) use ($output) {
             if (!$e instanceof \Exception) {
-                $e = class_exists(FatalThrowableError::class) ? new FatalThrowableError($e) : (class_exists(LegacyFatalThrowableError::class) ? new LegacyFatalThrowableError($e) : new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine()));
+                $e = class_exists(FatalThrowableError::class) ? new FatalThrowableError($e) : new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
             }
             if ($output instanceof ConsoleOutputInterface) {
                 $this->renderException($e, $output->getErrorOutput());
@@ -134,7 +132,7 @@ public function run(InputInterface $input = null, OutputInterface $output = null
         };
         if ($phpHandler = set_exception_handler($renderException)) {
             restore_exception_handler();
-            if (!\is_array($phpHandler) || (!$phpHandler[0] instanceof ErrorHandler && !$phpHandler[0] instanceof LegacyErrorHandler)) {
+            if (!\is_array($phpHandler) || !$phpHandler[0] instanceof ErrorHandle)) {
                 $errorHandler = true;
             } elseif ($errorHandler = $phpHandler[0]->setExceptionHandler($renderException)) {
                 $phpHandler[0]->setExceptionHandler($errorHandler);
diff --git a/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php
@@ -364,18 +364,3 @@ public function getAsString()
         return rtrim($message);
     }
 }
-
-namespace Symfony\Component\Debug\Exception;
-
-if (!class_exists(FlattenException::class, false)) {
-    class_alias(\Symfony\Component\ErrorRenderer\Exception\FlattenException::class, FlattenException::class);
-}
-
-if (false) {
-    /**
-     * @deprecated since Symfony 4.4, use Symfony\Component\ErrorRenderer\Exception\FlattenException instead.
-     */
-    class FlattenException extends \Symfony\Component\ErrorRenderer\Exception\FlattenException
-    {
-    }
-}
