Merge branch '12.4' into 12.5

* 12.4:
  Prepare release
  remove duplicated test
  remove XFAIL for fixed test
  fix --filter format used by PHPStorm
  Fix namespace
  fix test with xdebug installed
  fix cs
  fix namespace
  Added regression test

Author: sebastianbergmann

src/Framework/TestCase.php

@@ -860,10 +860,10 @@ final public function dataSetAsString(): string
     {
         if ($this->data !== []) {
             if (is_int($this->dataName)) {
-                return sprintf(' with data set %s', $this->dataSetAsFilterString());
+                return sprintf(' with data set #%s', $this->dataName);
             }
 
-            return sprintf(' with data set "%s"', $this->dataSetAsFilterString());
+            return sprintf(' with data set "%s"', $this->dataName);
         }
 
         return '';

src/Runner/Filter/NameFilterIterator.php

@@ -109,7 +109,7 @@ private function prepareFilter(string $filter): array
             //  * testDetermineJsonError@JSON.*
             elseif (preg_match('/^(.*?)@(.+)$/', $filter, $matches)) {
                 $filter = sprintf(
-                    '%s.*with data set "@%s"$',
+                    '%s.*with data set "%s"$',
                     $matches[1],
                     $matches[2],
                 );

tests/end-to-end/cli/filter/filter-dataprovider-by-phpstorm-regex-string-key.phpt

@@ -1,7 +1,5 @@
 --TEST--
 https://github.com/sebastianbergmann/phpunit/pull/6364
---XFAIL--
-https://github.com/sebastianbergmann/phpunit/pull/6364
 --FILE--
 <?php declare(strict_types=1);
 

tests/end-to-end/regression/6382.phpt

@@ -0,0 +1,19 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/6382
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/6382/Issue6382Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+
+Fatal error: Declaration of PHPUnit\TestFixture\Issue6382\Child6382::__invoke() must be compatible with PHPUnit\TestFixture\Issue6382\Ancestor6382::__invoke(): void in %sChild.php on line %d
+%AFatal error: Premature end of PHP process when running PHPUnit\TestFixture\Issue6382\Issue6382Test::testExample.

tests/end-to-end/regression/6382/Ancestor.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6382;
+
+interface Ancestor6382
+{
+    public function __invoke(): void;
+}

tests/end-to-end/regression/6382/Child.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6382;
+
+interface Child6382 extends Ancestor6382
+{
+    public function __invoke();
+}

tests/end-to-end/regression/6382/Issue6382Test.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6382;
+
+use PHPUnit\Framework\TestCase;
+
+class Issue6382Test extends TestCase
+{
+    public function testExample(): void
+    {
+        require_once __DIR__ . '/Ancestor.php';
+
+        require_once __DIR__ . '/Child.php';
+
+        new Child6382;
+    }
+}

tests/end-to-end/testdox/data-provider-with-string-data-set-name.phpt

@@ -20,8 +20,8 @@ Runtime:       %s
 Time: %s, Memory: %s
 
 Data Provider With String Data Set Name (PHPUnit\TestFixture\TestDox\DataProviderWithStringDataSetName)
- ✔ Something that works with data set "@data set name"
- ✘ Something that does not work with data set "@data set name"
+ ✔ Something that works with data set "data set name"
+ ✘ Something that does not work with data set "data set name"
    │
    │ Failed asserting that false is true.
    │

tests/end-to-end/testdox/metadata-data-provider-with-string-data-set-name.phpt

@@ -20,8 +20,8 @@ Runtime:       %s
 Time: %s, Memory: %s
 
 Text from class-level TestDox metadata
- ✔ Text from method-level TestDox metadata for successful test with data set "@data set name"
- ✘ Text from method-level TestDox metadata for failing test with data set "@data set name"
+ ✔ Text from method-level TestDox metadata for successful test with data set "data set name"
+ ✘ Text from method-level TestDox metadata for failing test with data set "data set name"
    │
    │ Failed asserting that false is true.
    │

tests/unit/Logging/TestDox/NamePrettifierTest.php

@@ -163,7 +163,7 @@ public function __toString(): string
                 false,
             ],
             [
-                'Two with data set "@a"',
+                'Two with data set "a"',
                 $testWithDataWithStringKey,
                 false,
             ],