From 8ac41983d4b1d1cd8226fc5274081aabfe42ce49 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 31 Jul 2019 23:57:34 +0200
Subject: [PATCH] [Bridge/PhpUnit] rename ForwardCompatTrait to
 ForwardCompatTestTrait

---
 ...{ForwardCompatTrait.php => ForwardCompatTestTrait.php} | 8 ++++----
 ...mpatTraitForV5.php => ForwardCompatTestTraitForV5.php} | 2 +-
 ...mpatTraitForV8.php => ForwardCompatTestTraitForV8.php} | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename src/Symfony/Bridge/PhpUnit/{ForwardCompatTrait.php => ForwardCompatTestTrait.php} (77%)
 rename src/Symfony/Bridge/PhpUnit/Legacy/{ForwardCompatTraitForV5.php => ForwardCompatTestTraitForV5.php} (97%)
 rename src/Symfony/Bridge/PhpUnit/Legacy/{ForwardCompatTraitForV8.php => ForwardCompatTestTraitForV8.php} (96%)

diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatTrait.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatTestTrait.php
similarity index 77%
rename from src/Symfony/Bridge/PhpUnit/ForwardCompatTrait.php
rename to src/Symfony/Bridge/PhpUnit/ForwardCompatTestTrait.php
index 462587b823..bdff8c1882 100644
--- a/src/Symfony/Bridge/PhpUnit/ForwardCompatTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/ForwardCompatTestTrait.php
@@ -16,13 +16,13 @@ use PHPUnit\Framework\TestCase;
 // A trait to provide forward compatibility with newest PHPUnit versions
 
 if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
-    trait ForwardCompatTrait
+    trait ForwardCompatTestTrait
     {
-        use Legacy\ForwardCompatTraitForV8;
+        use Legacy\ForwardCompatTestTraitForV8;
     }
 } else {
-    trait ForwardCompatTrait
+    trait ForwardCompatTestTrait
     {
-        use Legacy\ForwardCompatTraitForV5;
+        use Legacy\ForwardCompatTestTraitForV5;
     }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTraitForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php
similarity index 97%
rename from src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTraitForV5.php
rename to src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php
index 5262719fe5..5b35e80182 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTraitForV5.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php
@@ -14,7 +14,7 @@ namespace Symfony\Bridge\PhpUnit\Legacy;
 /**
  * @internal
  */
-trait ForwardCompatTraitForV5
+trait ForwardCompatTestTraitForV5
 {
     /**
      * @return void
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTraitForV8.php b/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV8.php
similarity index 96%
rename from src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTraitForV8.php
rename to src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV8.php
index 4d7fc2aca2..4963ed9e0c 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTraitForV8.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV8.php
@@ -14,7 +14,7 @@ namespace Symfony\Bridge\PhpUnit\Legacy;
 /**
  * @internal
  */
-trait ForwardCompatTraitForV8
+trait ForwardCompatTestTraitForV8
 {
     public static function setUpBeforeClass(): void
     {