Remove TAP (Test Anything Protocol) test listener (--tap and --log-ta…

…p commandline options)
sebastianbergmann · Nov 22, 2016 · 7a5b62c · 7a5b62c
1 parent 1f82346
commit 7a5b62c
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 375 deletions.
diff --git a/ChangeLog-6.0.md b/ChangeLog-6.0.md
@@ -34,9 +34,11 @@ All notable changes of the PHPUnit 6.0 release series are documented in this fil
 * Removed the `PHPUnit_Extensions_RepeatedTest` class
 * Removed the `PHPUnit_Extensions_TestDecorator` class
 * Removed the `PHPUnit_Extensions_TicketListener` class
+* Removed the `PHPUnit_Util_Log_TAP` class
 * Removed the `PHPUnit_Util_Test::getTickets()` method
 * Removed the `checkForUnintentionallyCoveredCode` configuration setting (deprecated in PHPUnit 5.2)
 * Removed the `--self-update` and `--self-upgrade` commandline options
+* Removed the `--tap` and `--log-tap` commandline options
 * Removed the `--report-useless-tests` commandline option
 * Removed the `--no-globals-backup` commandline option
 * PHPUnit is no longer supported on PHP 5.6

diff --git a/build.xml b/build.xml
@@ -240,14 +240,6 @@
             </fileset>
         </copy>
 
-        <copy file="${basedir}/vendor/symfony/yaml/LICENSE" tofile="${basedir}/build/phar/symfony/LICENSE"/>
-        <copy todir="${basedir}/build/phar/symfony">
-            <fileset dir="${basedir}/vendor/symfony">
-                <include name="**/*.php" />
-                <exclude name="**/Tests/**" />
-            </fileset>
-        </copy>
-
         <copy todir="${basedir}/build/phar/dbunit">
             <fileset dir="${basedir}/vendor/phpunit/dbunit/src">
                 <include name="**/*.php" />

diff --git a/composer.json b/composer.json
@@ -27,7 +27,6 @@
         "phpunit/php-timer": "^1.0.6",
         "phpunit/phpunit-mock-objects": "^3.2",
         "phpspec/prophecy": "^1.3.1",
-        "symfony/yaml": "~2.1|~3.0",
         "sebastian/comparator": "~1.2.2",
         "sebastian/diff": "~1.2",
         "sebastian/environment": "^1.3 || ^2.0",

diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
@@ -63,7 +63,6 @@ class PHPUnit_TextUI_Command
         'loader='                    => null,
         'log-json='                  => null,
         'log-junit='                 => null,
-        'log-tap='                   => null,
         'log-teamcity='              => null,
         'no-configuration'           => null,
         'no-coverage'                => null,
@@ -85,7 +84,6 @@ class PHPUnit_TextUI_Command
         'strict-coverage'            => null,
         'disable-coverage-ignore'    => null,
         'strict-global-state'        => null,
-        'tap'                        => null,
         'teamcity'                   => null,
         'testdox'                    => null,
         'testdox-group='             => null,
@@ -449,10 +447,6 @@ protected function handleArguments(array $argv)
                     $this->arguments['junitLogfile'] = $option[1];
                     break;
 
-                case '--log-tap':
-                    $this->arguments['tapLogfile'] = $option[1];
-                    break;
-
                 case '--log-teamcity':
                     $this->arguments['teamcityLogfile'] = $option[1];
                     break;
@@ -501,10 +495,6 @@ protected function handleArguments(array $argv)
                     $this->arguments['failOnRisky'] = true;
                     break;
 
-                case '--tap':
-                    $this->arguments['printer'] = 'PHPUnit_Util_Log_TAP';
-                    break;
-
                 case '--teamcity':
                     $this->arguments['printer'] = 'PHPUnit_Util_Log_TeamCity';
                     break;
@@ -937,7 +927,6 @@ protected function showHelp()
 Logging Options:
 
   --log-junit <file>          Log test execution in JUnit XML format to file.
-  --log-tap <file>            Log test execution in TAP format to file.
   --log-teamcity <file>       Log test execution in TeamCity format to file.
   --log-json <file>           Log test execution in JSON format.
   --testdox-html <file>       Write agile documentation in HTML format to file.
@@ -987,7 +976,6 @@ protected function showHelp()
 
   --loader <loader>           TestSuiteLoader implementation to use.
   --repeat <times>            Runs the test(s) repeatedly.
-  --tap                       Report test execution progress in TAP format.
   --teamcity                  Report test execution progress in TeamCity format.
   --testdox                   Report test execution progress in TestDox format.
   --testdox-group             Only include tests from the specified group(s).

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -261,31 +261,29 @@ class_exists($arguments['printer'], false)) {
             }
         }
 
-        if (!$this->printer instanceof PHPUnit_Util_Log_TAP) {
-            $this->printer->write(
-                PHPUnit_Runner_Version::getVersionString() . "\n"
-            );
+        $this->printer->write(
+            PHPUnit_Runner_Version::getVersionString() . "\n"
+        );
 
-            self::$versionStringPrinted = true;
+        self::$versionStringPrinted = true;
 
-            if ($arguments['verbose']) {
-                $runtime = $this->runtime->getNameWithVersion();
+        if ($arguments['verbose']) {
+            $runtime = $this->runtime->getNameWithVersion();
 
-                if ($this->runtime->hasXdebug()) {
-                    $runtime .= sprintf(
-                        ' with Xdebug %s',
-                        phpversion('xdebug')
-                    );
-                }
+            if ($this->runtime->hasXdebug()) {
+                $runtime .= sprintf(
+                    ' with Xdebug %s',
+                    phpversion('xdebug')
+                );
+            }
 
-                $this->writeMessage('Runtime', $runtime);
+            $this->writeMessage('Runtime', $runtime);
 
-                if (isset($arguments['configuration'])) {
-                    $this->writeMessage(
-                        'Configuration',
-                        $arguments['configuration']->getFilename()
-                    );
-                }
+            if (isset($arguments['configuration'])) {
+                $this->writeMessage(
+                    'Configuration',
+                    $arguments['configuration']->getFilename()
+                );
             }
         }
 
@@ -365,9 +363,7 @@ class_exists($arguments['printer'], false)) {
             }
         }
 
-        if (!$this->printer instanceof PHPUnit_Util_Log_TAP) {
-            $this->printer->write("\n");
-        }
+        $this->printer->write("\n");
 
         if ($codeCoverageReports > 0) {
             $codeCoverage = new CodeCoverage(
@@ -424,12 +420,6 @@ class_exists($arguments['printer'], false)) {
             );
         }
 
-        if (isset($arguments['tapLogfile'])) {
-            $result->addListener(
-                new PHPUnit_Util_Log_TAP($arguments['tapLogfile'])
-            );
-        }
-
         if (isset($arguments['teamcityLogfile'])) {
             $result->addListener(
                 new PHPUnit_Util_Log_TeamCity($arguments['teamcityLogfile'])
@@ -974,11 +964,6 @@ protected function handleConfiguration(array &$arguments)
                 );
             }
 
-            if (isset($loggingConfiguration['tap']) &&
-                !isset($arguments['tapLogfile'])) {
-                $arguments['tapLogfile'] = $loggingConfiguration['tap'];
-            }
-
             if (isset($loggingConfiguration['teamcity']) &&
                 !isset($arguments['teamcityLogfile'])) {
                 $arguments['teamcityLogfile'] = $loggingConfiguration['teamcity'];

diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php
@@ -113,7 +113,6 @@
  *     <log type="coverage-crap4j" target="/tmp/crap.xml" threshold="30"/>
  *     <log type="json" target="/tmp/logfile.json"/>
  *     <log type="plain" target="/tmp/logfile.txt"/>
- *     <log type="tap" target="/tmp/logfile.tap"/>
  *     <log type="teamcity" target="/tmp/logfile.txt"/>
  *     <log type="junit" target="/tmp/logfile.xml"/>
  *     <log type="testdox-html" target="/tmp/testdox.html"/>