Merge branch '7.0' of github.com:Codeception/phpunit-wrapper into 7.0

Author: DavertMik

src/FilterTest.php

@@ -20,6 +20,12 @@ public function accept():bool
         }
 
         $name = Descriptor::getTestSignature($test);
+        $index = Descriptor::getTestDataSetIndex($test);
+
+        if (!is_null($index)) {
+            $name .= " with data set #{$index}";
+        }
+
         $accepted = preg_match($this->filter, $name, $matches);
 
         if ($accepted && isset($this->filterMax)) {

src/ResultPrinter/HTML.php

@@ -123,7 +123,7 @@ public function endTest(\PHPUnit\Framework\Test $test, float $time) : void
         );
 
         $failures = '';
-        $name = Descriptor::getTestSignature($test);
+        $name = Descriptor::getTestSignatureUnique($test);
         if (isset($this->failures[$name])) {
             $failTemplate = new \Text_Template(
                 $this->templatePath . 'fail.html'
@@ -236,7 +236,7 @@ protected function endRun():void
      */
     public function addError(\PHPUnit\Framework\Test $test, \Throwable $e, float $time) : void
     {
-        $this->failures[Descriptor::getTestSignature($test)][] = $this->cleanMessage($e);
+        $this->failures[Descriptor::getTestSignatureUnique($test)][] = $this->cleanMessage($e);
         parent::addError($test, $e, $time);
     }
 
@@ -249,18 +249,18 @@ public function addError(\PHPUnit\Framework\Test $test, \Throwable $e, float $ti
      */
     public function addFailure(\PHPUnit\Framework\Test $test, \PHPUnit\Framework\AssertionFailedError $e, float $time) : void
     {
-        $this->failures[Descriptor::getTestSignature($test)][] = $this->cleanMessage($e);
+        $this->failures[Descriptor::getTestSignatureUnique($test)][] = $this->cleanMessage($e);
         parent::addFailure($test, $e, $time);
     }
-    
+
     /**
      * Starts test
      *
      * @param \PHPUnit\Framework\Test $test
      */
     public function startTest(\PHPUnit\Framework\Test $test):void
     {
-        $name = Descriptor::getTestSignature($test);
+        $name = Descriptor::getTestSignatureUnique($test);
         if (isset($this->failures[$name])) {
             // test failed in before hook
             return;