[Debug] Drop compatibility layers

chalasr · chalasr · commit 7fc93e9ba69d · 2019-08-08T00:12:31.000+02:00
diff --git a/src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php b/src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php
@@ -51,9 +51,6 @@ 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) {
             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());
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
-    {
-    }
-}

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,6 @@ public static function generate(string $returnedValueExpression, ?\ReflectionMet`
`51`	`51`	`if ($functionLoader instanceof ClassLoader) {`
`52`	`52`	`return $functionLoader;`
`53`	`53`	`}`
`54`		`- if ($functionLoader instanceof \Symfony\Component\Debug\DebugClassLoader) {`
`55`		`- return $getComposerClassLoader($functionLoader->getClassLoader());`
`56`		`- }`
`57`	`54`	`if ($functionLoader instanceof \Symfony\Component\ErrorHandler\DebugClassLoader) {`
`58`	`55`	`return $getComposerClassLoader($functionLoader->getClassLoader());`
`59`	`56`	`}`