Merge branch '10.5' into 11.3

Author: sebastianbergmann

ChangeLog-11.3.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 11.3 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [11.3.7] - 2024-MM-DD
+
+### Changed
+
+* [#5957](https://github.com/sebastianbergmann/phpunit/pull/5957): Skip data provider build when requirements are not satisfied
+
 ## [11.3.6] - 2024-09-19
 
 ### Changed
@@ -75,6 +81,7 @@ All notable changes of the PHPUnit 11.3 release series are documented in this fi
 * [#5856](https://github.com/sebastianbergmann/phpunit/issues/5856): When the test runner is configured to fail on deprecations, notices, warnings, incomplete tests, or skipped tests then details for tests that triggered deprecations, notices, or warnings as well as tests that were marked as incomplete or skipped are always shown, respectively
 * [#5869](https://github.com/sebastianbergmann/phpunit/pull/5869): The configuration file generated using `--generate-configuration` now limits the export of arrays to 10 elements in order to improve performance
 
+[11.3.7]: https://github.com/sebastianbergmann/phpunit/compare/11.3.6...11.3
 [11.3.6]: https://github.com/sebastianbergmann/phpunit/compare/11.3.5...11.3.6
 [11.3.5]: https://github.com/sebastianbergmann/phpunit/compare/11.3.4...11.3.5
 [11.3.4]: https://github.com/sebastianbergmann/phpunit/compare/11.3.3...11.3.4

src/Framework/TestBuilder.php

@@ -13,6 +13,7 @@
 use function assert;
 use PHPUnit\Metadata\Api\DataProvider;
 use PHPUnit\Metadata\Api\Groups;
+use PHPUnit\Metadata\Api\Requirements;
 use PHPUnit\Metadata\BackupGlobals;
 use PHPUnit\Metadata\BackupStaticProperties;
 use PHPUnit\Metadata\ExcludeGlobalVariableFromBackup;
@@ -40,10 +41,11 @@ public function build(ReflectionClass $theClass, string $methodName, array $grou
     {
         $className = $theClass->getName();
 
-        $data = (new DataProvider)->providedData(
-            $className,
-            $methodName,
-        );
+        $data = null;
+
+        if ((new Requirements)->requirementsNotSatisfiedFor($className, $methodName) === []) {
+            $data = (new DataProvider)->providedData($className, $methodName);
+        }
 
         if ($data !== null) {
             return $this->buildDataProviderTestSuite(

tests/_files/DataProviderRequiresPhpUnitTest.php

@@ -0,0 +1,60 @@
+<?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;
+
+use Exception;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\DataProviderExternal;
+use PHPUnit\Framework\Attributes\RequiresPhpunit;
+use PHPUnit\Framework\TestCase;
+
+final class DataProviderRequiresPhpUnitTest extends TestCase
+{
+    public static function providerThatThrows(): array
+    {
+        throw new Exception('Should have been skipped.');
+    }
+
+    public static function validProvider(): array
+    {
+        return [[true], [true]];
+    }
+
+    public function invalidProvider(): array
+    {
+        return [[true], [true]];
+    }
+
+    #[RequiresPhpunit('< 10')]
+    #[DataProvider('invalidProvider')]
+    public function testWithInvalidDataProvider(bool $param): void
+    {
+        $this->assertTrue($param);
+    }
+
+    #[RequiresPhpunit('>= 10')]
+    #[DataProvider('validProvider')]
+    public function testWithValidDataProvider(bool $param): void
+    {
+        $this->assertTrue($param);
+    }
+
+    #[RequiresPhpunit('< 10')]
+    #[DataProvider('providerThatThrows')]
+    public function testWithDataProviderThatThrows(): void
+    {
+    }
+
+    #[RequiresPhpunit('< 10')]
+    #[DataProviderExternal(self::class, 'providerThatThrows')]
+    public function testWithDataProviderExternalThatThrows(): void
+    {
+    }
+}

tests/end-to-end/data-provider/requires-phpunit.phpt

@@ -0,0 +1,34 @@
+--TEST--
+phpunit ../../_files/DataProviderRequiresPhpUnitTest.php
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--display-skipped';
+$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderRequiresPhpUnitTest.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+S..SS                                                               5 / 5 (100%)
+
+Time: %s, Memory: %s
+
+There were 3 skipped tests:
+
+1) PHPUnit\TestFixture\DataProviderRequiresPhpUnitTest::testWithInvalidDataProvider
+PHPUnit < 10 is required.
+
+2) PHPUnit\TestFixture\DataProviderRequiresPhpUnitTest::testWithDataProviderThatThrows
+PHPUnit < 10 is required.
+
+3) PHPUnit\TestFixture\DataProviderRequiresPhpUnitTest::testWithDataProviderExternalThatThrows
+PHPUnit < 10 is required.
+
+OK, but some tests were skipped!
+Tests: 5, Assertions: 2, Skipped: 3.
+

tests/end-to-end/generic/invalid-requirements.phpt

@@ -20,9 +20,9 @@ Time: %s, Memory: %s
 
 There were 2 PHPUnit test runner warnings:
 
-1) Method PHPUnit\TestFixture\InvalidRequirementsTest::testInvalidVersionConstraint is annotated using an invalid version requirement: Version constraint ~~9.0 is not supported.
+1) Class PHPUnit\TestFixture\InvalidRequirementsTest is annotated using an invalid version requirement: Version constraint ~~9.0 is not supported.
 
-2) Class PHPUnit\TestFixture\InvalidRequirementsTest is annotated using an invalid version requirement: Version constraint ~~9.0 is not supported.
+2) Method PHPUnit\TestFixture\InvalidRequirementsTest::testInvalidVersionConstraint is annotated using an invalid version requirement: Version constraint ~~9.0 is not supported.
 
 WARNINGS!
 Tests: 1, Assertions: 1, Warnings: 2.