From 3bf78a01b8e1ce1b89966a0c5054ecbd4ac82c90 Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Sun, 7 Apr 2019 14:52:08 +0200
Subject: [PATCH] Try to move logic from runner to command

---
 .../Bridge/PhpUnit/Legacy/CommandForV5.php    | 20 +++++++-
 .../Bridge/PhpUnit/Legacy/CommandForV6.php    | 22 ++++++++-
 .../Bridge/PhpUnit/Legacy/TestRunnerForV5.php | 48 ------------------
 .../Bridge/PhpUnit/Legacy/TestRunnerForV6.php | 49 -------------------
 .../Bridge/PhpUnit/Legacy/TestRunnerForV7.php | 49 -------------------
 .../Bridge/PhpUnit/TextUI/TestRunner.php      | 26 ----------
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 12 -----
 7 files changed, 39 insertions(+), 187 deletions(-)
 delete mode 100644 src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php
 delete mode 100644 src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php
 delete mode 100644 src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php
 delete mode 100644 src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php

diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV5.php
index d4b5ea26d8cd8..95dcb1e5541fc 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV5.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV5.php
@@ -23,6 +23,24 @@ class CommandForV5 extends \PHPUnit_TextUI_Command
      */
     protected function createRunner()
     {
-        return new TestRunnerForV5($this->arguments['loader']);
+        $listener = new SymfonyTestsListenerForV5();
+
+        $this->arguments['listeners'] = isset($this->arguments['listeners']) ? $this->arguments['listeners'] : array();
+
+        $registeredLocally = false;
+
+        foreach ($this->arguments['listeners'] as $registeredListener) {
+            if ($registeredListener instanceof SymfonyTestsListenerForV5) {
+                $registeredListener->globalListenerDisabled();
+                $registeredLocally = true;
+                break;
+            }
+        }
+
+        if (!$registeredLocally) {
+            $this->arguments['listeners'][] = $listener;
+        }
+
+        return parent::createRunner();
     }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV6.php b/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV6.php
index fc717ef415cb3..f8f75bb09a93b 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV6.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV6.php
@@ -13,7 +13,7 @@
 
 use PHPUnit\TextUI\Command as BaseCommand;
 use PHPUnit\TextUI\TestRunner as BaseRunner;
-use Symfony\Bridge\PhpUnit\TextUI\TestRunner;
+use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
 
 /**
  * {@inheritdoc}
@@ -27,6 +27,24 @@ class CommandForV6 extends BaseCommand
      */
     protected function createRunner(): BaseRunner
     {
-        return new TestRunner($this->arguments['loader']);
+        $listener = new SymfonyTestsListener();
+
+        $this->arguments['listeners'] = isset($this->arguments['listeners']) ? $this->arguments['listeners'] : [];
+
+        $registeredLocally = false;
+
+        foreach ($this->arguments['listeners'] as $registeredListener) {
+            if ($registeredListener instanceof SymfonyTestsListener) {
+                $registeredListener->globalListenerDisabled();
+                $registeredLocally = true;
+                break;
+            }
+        }
+
+        if (!$registeredLocally) {
+            $this->arguments['listeners'][] = $listener;
+        }
+
+        return parent::createRunner();
     }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php
deleted file mode 100644
index 7897861cf52f7..0000000000000
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bridge\PhpUnit\Legacy;
-
-/**
- * {@inheritdoc}
- *
- * @internal
- */
-class TestRunnerForV5 extends \PHPUnit_TextUI_TestRunner
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function handleConfiguration(array &$arguments)
-    {
-        $listener = new SymfonyTestsListenerForV5();
-
-        $result = parent::handleConfiguration($arguments);
-
-        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
-
-        $registeredLocally = false;
-
-        foreach ($arguments['listeners'] as $registeredListener) {
-            if ($registeredListener instanceof SymfonyTestsListenerForV5) {
-                $registeredListener->globalListenerDisabled();
-                $registeredLocally = true;
-                break;
-            }
-        }
-
-        if (!$registeredLocally) {
-            $arguments['listeners'][] = $listener;
-        }
-
-        return $result;
-    }
-}
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php
deleted file mode 100644
index 6da7c65448532..0000000000000
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bridge\PhpUnit\Legacy;
-
-use PHPUnit\TextUI\TestRunner as BaseRunner;
-use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
-
-/**
- * {@inheritdoc}
- *
- * @internal
- */
-class TestRunnerForV6 extends BaseRunner
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function handleConfiguration(array &$arguments)
-    {
-        $listener = new SymfonyTestsListener();
-
-        parent::handleConfiguration($arguments);
-
-        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
-
-        $registeredLocally = false;
-
-        foreach ($arguments['listeners'] as $registeredListener) {
-            if ($registeredListener instanceof SymfonyTestsListener) {
-                $registeredListener->globalListenerDisabled();
-                $registeredLocally = true;
-                break;
-            }
-        }
-
-        if (!$registeredLocally) {
-            $arguments['listeners'][] = $listener;
-        }
-    }
-}
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php
deleted file mode 100644
index a175fb65d7f5a..0000000000000
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bridge\PhpUnit\Legacy;
-
-use PHPUnit\TextUI\TestRunner as BaseRunner;
-use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
-
-/**
- * {@inheritdoc}
- *
- * @internal
- */
-class TestRunnerForV7 extends BaseRunner
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function handleConfiguration(array &$arguments): void
-    {
-        $listener = new SymfonyTestsListener();
-
-        parent::handleConfiguration($arguments);
-
-        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
-
-        $registeredLocally = false;
-
-        foreach ($arguments['listeners'] as $registeredListener) {
-            if ($registeredListener instanceof SymfonyTestsListener) {
-                $registeredListener->globalListenerDisabled();
-                $registeredLocally = true;
-                break;
-            }
-        }
-
-        if (!$registeredLocally) {
-            $arguments['listeners'][] = $listener;
-        }
-    }
-}
diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
deleted file mode 100644
index cda59209790d5..0000000000000
--- a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bridge\PhpUnit\TextUI;
-
-if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
-    class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunnerForV5', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
-} elseif (version_compare(\PHPUnit\Runner\Version::id(), '7.0.0', '<')) {
-    class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunnerForV6', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
-} else {
-    class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunnerForV7', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
-}
-
-if (false) {
-    class TestRunner
-    {
-    }
-}
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 5c05ea492cb5a..c81dcd26bec5e 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -100,18 +100,6 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     if ($exit) {
         exit($exit);
     }
-    if ($PHPUNIT_VERSION >= 8.0) {
-        // Fix compatibility to custom TestRunner for PhpUnit 8
-        $testRunnerFile = 'src/TextUI/TestRunner.php';
-        file_put_contents(
-            $testRunnerFile,
-            str_replace(
-                'final class TestRunner',
-                'class TestRunner',
-                file_get_contents($testRunnerFile)
-            )
-        );
-    }
     file_put_contents('phpunit', <<<'EOPHP'
 <?php