Remove error-catcher dependency from Debug component

yceruto · yceruto · commit fa47bebfb493 · 2019-07-08T09:12:06.000-04:00
diff --git a/src/Symfony/Component/Debug/Exception/FlattenException.php b/src/Symfony/Component/Debug/Exception/FlattenException.php
@@ -11,11 +11,10 @@
 
 namespace Symfony\Component\Debug\Exception;
 
-use Symfony\Component\ErrorCatcher\Exception\FlattenException as BaseFlattenException;
 use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', FlattenException::class, BaseFlattenException::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "Symfony\Component\ErrorCatcher\Exception\FlattenException" instead.', FlattenException::class), E_USER_DEPRECATED);
 
 /**
  * FlattenException wraps a PHP Error or Exception to be able to serialize it.
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Debug;
 
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
-use Symfony\Component\ErrorCatcher\Exception\FlattenException;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
 
 /**
diff --git a/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php b/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
@@ -31,6 +31,9 @@ protected function tearDown()
         testHeader();
     }
 
+    /**
+     * @group legacy
+     */
     public function testDebug()
     {
         $handler = new ExceptionHandler(false);
diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json
@@ -17,8 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "psr/log": "~1.0",
-        "symfony/error-catcher": "^4.4|^5.0"
+        "psr/log": "~1.0"
     },
     "conflict": {
         "symfony/http-kernel": "<3.4"

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ protected function tearDown()`
`31`	`31`	`testHeader();`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ /**`
	`35`	`+ * @group legacy`
	`36`	`+ */`
`34`	`37`	`public function testDebug()`
`35`	`38`	`{`
`36`	`39`	`$handler = new ExceptionHandler(false);`