Merge branch '12.4' into 12.5

* 12.4:
  Fix CS/WS issues
  Update ChangeLog
  Fix WS issue
  fix: test IgnorePhpunitWarnings pattern in Emitter
  fix: ClassMethod for DataProvider events should be passed the real test class

Author: sebastianbergmann

src/Event/Emitter/DispatchingEmitter.php

@@ -11,6 +11,7 @@
 
 use function assert;
 use function memory_reset_peak_usage;
+use function preg_match;
 use PHPUnit\Event\Code\ClassMethod;
 use PHPUnit\Event\Code\ComparisonFailure;
 use PHPUnit\Event\Code\IssueTrigger\IssueTrigger;
@@ -1020,7 +1021,9 @@ public function testTriggeredPhpunitWarning(Code\Test $test, string $message): v
             if (isset($metadata[0])) {
                 assert($metadata[0] instanceof IgnorePhpunitWarnings);
 
-                if ($metadata[0]->shouldIgnore($message)) {
+                $messagePattern = $metadata[0]->messagePattern();
+
+                if ($messagePattern === null || (bool) preg_match('{' . $messagePattern . '}', $message)) {
                     $ignoredByTest = true;
                 }
             }

src/Metadata/Api/DataProvider.php

@@ -62,21 +62,23 @@ public function providedData(string $className, string $methodName): ?array
                 $this->triggerWarningForMixingOfDataProviderAndTestWith($testMethod);
             }
 
-            return $this->dataProvidedByMethods($testMethod, $dataProvider);
+            return $this->dataProvidedByMethods($className, $testMethod, $dataProvider);
         }
 
         return $this->dataProvidedByMetadata($testMethod, $testWith);
     }
 
     /**
+     * @param class-string<TestCase> $testClassName
+     *
      * @throws InvalidDataProviderException
      *
      * @return array<ProvidedData>
      */
-    private function dataProvidedByMethods(ReflectionMethod $testMethod, MetadataCollection $dataProvider): array
+    private function dataProvidedByMethods(string $testClassName, ReflectionMethod $testMethod, MetadataCollection $dataProvider): array
     {
         $testMethodValueObject = new Event\Code\ClassMethod(
-            $testMethod->getDeclaringClass()->getName(),
+            $testClassName,
             $testMethod->getName(),
         );
 

src/Metadata/IgnorePhpunitWarnings.php

@@ -9,8 +9,6 @@
  */
 namespace PHPUnit\Metadata;
 
-use function preg_match;
-
 /**
  * @immutable
  *
@@ -37,9 +35,11 @@ public function isIgnorePhpunitWarnings(): true
         return true;
     }
 
-    public function shouldIgnore(string $message): bool
+    /**
+     * @return null|non-empty-string
+     */
+    public function messagePattern(): ?string
     {
-        return $this->messagePattern === null ||
-            (bool) preg_match('{' . $this->messagePattern . '}', $message);
+        return $this->messagePattern;
     }
 }

tests/end-to-end/event/_files/DataProviderInParentTest.php

@@ -0,0 +1,31 @@
+<?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\Event;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class DataProviderInParentTest extends ParentTestCase
+{
+}
+
+abstract class ParentTestCase extends TestCase
+{
+    public static function data_provider(): iterable
+    {
+        yield [true];
+    }
+
+    #[DataProvider('data_provider')]
+    public function testSomething(bool $var): void
+    {
+        $this->assertTrue($var);
+    }
+}

tests/end-to-end/event/data-provider-in-parent-class.phpt

@@ -0,0 +1,34 @@
+--TEST--
+The right events are emitted in the right order for a test that uses a data provider that provides no data
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = __DIR__ . '/_files/DataProviderInParentTest.php';
+
+require __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit Started (PHPUnit %s using %s)
+Test Runner Configured
+Event Facade Sealed
+Data Provider Method Called (PHPUnit\TestFixture\Event\DataProviderInParentTest::data_provider for test method PHPUnit\TestFixture\Event\DataProviderInParentTest::testSomething)
+Data Provider Method Finished for PHPUnit\TestFixture\Event\DataProviderInParentTest::testSomething:
+- PHPUnit\TestFixture\Event\DataProviderInParentTest::data_provider
+Test Suite Loaded (1 test)
+Test Runner Started
+Test Suite Sorted
+Test Runner Execution Started (1 test)
+Test Suite Started (PHPUnit\TestFixture\Event\DataProviderInParentTest, 1 test)
+Test Suite Started (PHPUnit\TestFixture\Event\DataProviderInParentTest::testSomething, 1 test)
+Test Preparation Started (PHPUnit\TestFixture\Event\DataProviderInParentTest::testSomething#0)
+Test Prepared (PHPUnit\TestFixture\Event\DataProviderInParentTest::testSomething#0)
+Test Passed (PHPUnit\TestFixture\Event\DataProviderInParentTest::testSomething#0)
+Test Finished (PHPUnit\TestFixture\Event\DataProviderInParentTest::testSomething#0)
+Test Suite Finished (PHPUnit\TestFixture\Event\DataProviderInParentTest::testSomething, 1 test)
+Test Suite Finished (PHPUnit\TestFixture\Event\DataProviderInParentTest, 1 test)
+Test Runner Execution Finished
+Test Runner Finished
+PHPUnit Finished (Shell Exit Code: 0)