From 034e1de6e66a964b3bd4d56bfd78b118b147bcce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcello=20M=C3=B6nkemeyer?= <marcello@moenkemeyer.email>
Date: Wed, 19 Feb 2020 14:20:42 +0000
Subject: [PATCH] [PhpUnitBridge] Use trait instead of extending deprecated
 class

---
 .../Bridge/PhpUnit/Legacy/CoverageListenerForV6.php        | 7 +++++--
 src/Symfony/Bridge/PhpUnit/composer.json                   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV6.php b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV6.php
index 0917ea4710c2..1b3ceec161f8 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV6.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV6.php
@@ -11,8 +11,9 @@
 
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
-use PHPUnit\Framework\BaseTestListener;
 use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestListener;
+use PHPUnit\Framework\TestListenerDefaultImplementation;
 
 /**
  * CoverageListener adds `@covers <className>` on each test when possible to
@@ -22,8 +23,10 @@
  *
  * @internal
  */
-class CoverageListenerForV6 extends BaseTestListener
+class CoverageListenerForV6 implements TestListener
 {
+    use TestListenerDefaultImplementation;
+
     private $trait;
 
     public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFound = false)
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
index 25dcb0cd1027..f7d9492613ab 100644
--- a/src/Symfony/Bridge/PhpUnit/composer.json
+++ b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -24,7 +24,7 @@
         "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
     },
     "conflict": {
-        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0"
     },
     "autoload": {
         "files": [ "bootstrap.php" ],