From 3392f9f32d8c16348cf4a501e54859d84e4e3a07 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 29 Sep 2017 12:59:58 +0200
Subject: [PATCH] Fix conflicts between Bridge/PhpUnit and Debug fixtures

---
 src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php   | 4 ++--
 .../Tests/Fixtures/coverage/src/{Bar.php => BarCov.php}     | 4 ++--
 .../Tests/Fixtures/coverage/src/{Foo.php => FooCov.php}     | 2 +-
 .../PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php       | 6 +++---
 .../PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/{Bar.php => BarCov.php} (87%)
 rename src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/{Foo.php => FooCov.php} (96%)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
index 0d548aa912..64984ee0b9 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
@@ -27,11 +27,11 @@ class CoverageListenerTest extends TestCase
 
         exec("$php -d zend_extension=xdebug.so $phpunit -c $dir/phpunit-without-listener.xml.dist $dir/tests/ --coverage-text", $output);
         $output = implode("\n", $output);
-        $this->assertContains('Foo', $output);
+        $this->assertContains('FooCov', $output);
 
         exec("$php -d zend_extension=xdebug.so $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text", $output);
         $output = implode("\n", $output);
-        $this->assertNotContains('Foo', $output);
+        $this->assertNotContains('FooCov', $output);
         $this->assertContains("SutNotFoundTest::test\nCould not find the tested class.", $output);
         $this->assertNotContains("CoversTest::test\nCould not find the tested class.", $output);
         $this->assertNotContains("CoversDefaultClassTest::test\nCould not find the tested class.", $output);
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/BarCov.php
similarity index 87%
rename from src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php
rename to src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/BarCov.php
index b50305a402..c399e8def2 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Bar.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/BarCov.php
@@ -11,11 +11,11 @@
 
 namespace PhpUnitCoverageTest;
 
-class Bar
+class BarCov
 {
     private $foo;
 
-    public function __construct(Foo $foo)
+    public function __construct(FooCov $foo)
     {
         $this->foo = $foo;
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/FooCov.php
similarity index 96%
rename from src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php
rename to src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/FooCov.php
index f811ae70b1..7a7b116345 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/Foo.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/src/FooCov.php
@@ -11,7 +11,7 @@
 
 namespace PhpUnitCoverageTest;
 
-class Foo
+class FooCov
 {
     public function fooZ()
     {
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
index b49fc706a9..def55c5e97 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/BarTest.php
@@ -17,12 +17,12 @@ class BarTest extends TestCase
 {
     public function testBar()
     {
-        if (!class_exists('PhpUnitCoverageTest\Foo')) {
+        if (!class_exists('PhpUnitCoverageTest\FooCov')) {
             $this->markTestSkipped('This test is not part of the main Symfony test suite. It\'s here to test the CoverageListener.');
         }
 
-        $foo = new \PhpUnitCoverageTest\Foo();
-        $bar = new \PhpUnitCoverageTest\Bar($foo);
+        $foo = new \PhpUnitCoverageTest\FooCov();
+        $bar = new \PhpUnitCoverageTest\BarCov($foo);
 
         $this->assertSame('bar', $bar->barZ());
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php
index 9647a8658d..925f4831ac 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/../src/Bar.php';
-require __DIR__.'/../src/Foo.php';
+require __DIR__.'/../src/BarCov.php';
+require __DIR__.'/../src/FooCov.php';
 
 require __DIR__.'/../../../../Legacy/CoverageListenerTrait.php';
 if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {