fix merge

Author: xabbuh

Tests/Debug/TraceableEventDispatcherTest.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\EventDispatcher\Tests\Debug;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Debug\BufferingLogger;
+use Symfony\Component\ErrorHandler\BufferingLogger;
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcher;

composer.json

@@ -23,7 +23,7 @@
         "symfony/dependency-injection": "^3.4|^4.0|^5.0",
         "symfony/expression-language": "^3.4|^4.0|^5.0",
         "symfony/config": "^3.4|^4.0|^5.0",
-        "symfony/debug": "~3.4|~4.4",
+        "symfony/error-handler": "~3.4|~4.4",
         "symfony/http-foundation": "^3.4|^4.0|^5.0",
         "symfony/service-contracts": "^1.1|^2",
         "symfony/stopwatch": "^3.4|^4.0|^5.0",