[PHPUnitTask] renamed formatter (#1448)

phingofficial · Nov 26, 2020 · 7a3d331 · 7a3d331
1 parent 605b65f
commit 7a3d331
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/classes/phing/tasks/ext/phpunit/FormatterElement.php b/classes/phing/tasks/ext/phpunit/FormatterElement.php
@@ -27,7 +27,7 @@
 class FormatterElement
 {
     /**
-     * @var PHPUnitResultFormatter7 $fomatter
+     * @var PHPUnitResultFormatter $fomatter
      */
     protected $formatter;
 
@@ -155,8 +155,8 @@ public function getExtension()
     /**
      * Returns formatter object
      *
+     * @return PHPUnitResultFormatter
      * @throws BuildException
-     * @return PHPUnitResultFormatter7
      */
     public function getFormatter()
     {
@@ -166,18 +166,18 @@ public function getFormatter()
 
         if ($this->type === "summary") {
             $this->useFile = false; // Summary formatter never writes to a file
-            $this->formatter = new SummaryPHPUnitResultFormatter7($this->parent);
+            $this->formatter = new SummaryPHPUnitResultFormatter($this->parent);
         } elseif ($this->type === "clover") {
-            $this->formatter = new CloverPHPUnitResultFormatter7($this->parent);
+            $this->formatter = new CloverPHPUnitResultFormatter($this->parent);
         } elseif ($this->type === "clover-html") {
             $this->useFile = false; // Clover HTML formatter never writes to a single file
-            $this->formatter = new CloverHtmlPHPUnitResultFormatter9($this->parent, $this->toDir);
+            $this->formatter = new CloverHtmlPHPUnitResultFormatter($this->parent, $this->toDir);
         } elseif ($this->type === "xml") {
-            $this->formatter = new XMLPHPUnitResultFormatter7($this->parent);
+            $this->formatter = new XMLPHPUnitResultFormatter($this->parent);
         } elseif ($this->type === "plain") {
-            $this->formatter = new PlainPHPUnitResultFormatter7($this->parent);
+            $this->formatter = new PlainPHPUnitResultFormatter($this->parent);
         } elseif ($this->type === "crap4j") {
-            $this->formatter = new Crap4JPHPUnitResultFormatter7($this->parent);
+            $this->formatter = new Crap4JPHPUnitResultFormatter($this->parent);
         } else {
             throw new BuildException("Formatter '" . $this->type . "' not implemented");
         }

diff --git a/...er9/CloverHtmlPHPUnitResultFormatter9.php → ...tter/CloverHtmlPHPUnitResultFormatter.php b/...er9/CloverHtmlPHPUnitResultFormatter9.php → ...tter/CloverHtmlPHPUnitResultFormatter.php
@@ -23,7 +23,7 @@
  * @author  Blair Cooper <dev@raincitysolutions.com>
  * @package phing.tasks.ext.formatter
  */
-class CloverHtmlPHPUnitResultFormatter9 extends PHPUnitResultFormatter7
+class CloverHtmlPHPUnitResultFormatter extends PHPUnitResultFormatter
 {
     /**
      * @var PHPUnit\Framework\TestResult

diff --git a/...matter7/CloverPHPUnitResultFormatter7.php → ...ormatter/CloverPHPUnitResultFormatter.php b/...matter7/CloverPHPUnitResultFormatter7.php → ...ormatter/CloverPHPUnitResultFormatter.php
@@ -23,7 +23,7 @@
  * @author  Siad Ardroumli <siad.ardroumli@gmail.com>
  * @package phing.tasks.ext.formatter
  */
-class CloverPHPUnitResultFormatter7 extends PHPUnitResultFormatter7
+class CloverPHPUnitResultFormatter extends PHPUnitResultFormatter
 {
     /**
      * @var PHPUnit\Framework\TestResult

diff --git a/...matter7/Crap4JPHPUnitResultFormatter7.php → ...ormatter/Crap4JPHPUnitResultFormatter.php b/...matter7/Crap4JPHPUnitResultFormatter7.php → ...ormatter/Crap4JPHPUnitResultFormatter.php
@@ -23,7 +23,7 @@
  * @author  Daniel Kreckel <daniel@kreckel.koeln>
  * @package phing.tasks.ext.formatter
  */
-class Crap4JPHPUnitResultFormatter7 extends PHPUnitResultFormatter7
+class Crap4JPHPUnitResultFormatter extends PHPUnitResultFormatter
 {
     /**
      * @var PHPUnit\Framework\TestResult

diff --git a/...it/formatter7/PHPUnitResultFormatter7.php → ...unit/formatter/PHPUnitResultFormatter.php b/...it/formatter7/PHPUnitResultFormatter7.php → ...unit/formatter/PHPUnitResultFormatter.php
@@ -23,7 +23,7 @@
  * @author  Siad Ardroumli <siad.ardroumli@gmail.com>
  * @package phing.tasks.ext.phpunit.formatter
  */
-abstract class PHPUnitResultFormatter7 implements PHPUnit\Framework\TestListener
+abstract class PHPUnitResultFormatter implements PHPUnit\Framework\TestListener
 {
     protected $out;
 

diff --git a/...rmatter7/PlainPHPUnitResultFormatter7.php → ...formatter/PlainPHPUnitResultFormatter.php b/...rmatter7/PlainPHPUnitResultFormatter7.php → ...formatter/PlainPHPUnitResultFormatter.php
@@ -25,7 +25,7 @@
  * @author  Siad Ardroumli <siad.ardroumli@gmail.com>
  * @package phing.tasks.ext.phpunit.formatter
  */
-class PlainPHPUnitResultFormatter7 extends PHPUnitResultFormatter7
+class PlainPHPUnitResultFormatter extends PHPUnitResultFormatter
 {
     private $inner = "";
 

diff --git a/...atter7/SummaryPHPUnitResultFormatter7.php → ...rmatter/SummaryPHPUnitResultFormatter.php b/...atter7/SummaryPHPUnitResultFormatter7.php → ...rmatter/SummaryPHPUnitResultFormatter.php
@@ -24,7 +24,7 @@
  * @package phing.tasks.ext.formatter
  * @since   2.1.0
  */
-class SummaryPHPUnitResultFormatter7 extends PHPUnitResultFormatter7
+class SummaryPHPUnitResultFormatter extends PHPUnitResultFormatter
 {
     public function endTestRun()
     {

diff --git a/...formatter7/XMLPHPUnitResultFormatter7.php → ...t/formatter/XMLPHPUnitResultFormatter.php b/...formatter7/XMLPHPUnitResultFormatter7.php → ...t/formatter/XMLPHPUnitResultFormatter.php
@@ -24,7 +24,7 @@
  * @package phing.tasks.ext.formatter
  * @since   2.1.0
  */
-class XMLPHPUnitResultFormatter7 extends PHPUnitResultFormatter7
+class XMLPHPUnitResultFormatter extends PHPUnitResultFormatter
 {
     /**
      * @var JUnit

diff --git a/test/classes/phing/tasks/ext/PHPUnitTaskTest.php b/test/classes/phing/tasks/ext/PHPUnitTaskTest.php
@@ -33,7 +33,7 @@ public function setUp(): void
 
     /**
      * Regression test for http://www.phing.info/trac/ticket/655
-     * "PlainPHPUnitResultFormatter7 does not display errors if dataProvider was used"
+     * "PlainPHPUnitResultFormatter does not display errors if dataProvider was used"
      */
     public function testPlainFormatterDataProvider()
     {