Merge branch '10.5' into 11.5

sebastianbergmann · Jan 29, 2025 · 6dd4422 · 6dd4422
2 parents 339c2c8 + 53cb0cf
commit 6dd4422
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/ChangeLog-11.5.md b/ChangeLog-11.5.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 11.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [11.5.5] - 2025-MM-DD
+
+### Changed
+
+* Do not skip execution of test that depends on a test that is larger than itself
+
 ## [11.5.4] - 2025-01-28
 
 ### Changed
@@ -72,6 +78,7 @@ All notable changes of the PHPUnit 11.5 release series are documented in this fi
 * [#6055](https://github.com/sebastianbergmann/phpunit/issues/6055): `assertNotContainsOnly()` (use `assertContainsNotOnlyArray()`, `assertContainsNotOnlyBool()`, `assertContainsNotOnlyCallable()`, `assertContainsNotOnlyFloat()`, `assertContainsNotOnlyInt()`, `assertContainsNotOnlyIterable()`, `assertContainsNotOnlyNumeric()`, `assertContainsNotOnlyObject()`, `assertContainsNotOnlyResource()`, `assertContainsNotOnlyClosedResource()`, `assertContainsNotOnlyScalar()`, or `assertContainsNotOnlyString()` instead)
 * [#6059](https://github.com/sebastianbergmann/phpunit/issues/6059): `containsOnly()` (use `containsOnlyArray()`, `containsOnlyBool()`, `containsOnlyCallable()`, `containsOnlyFloat()`, `containsOnlyInt()`, `containsOnlyIterable()`, `containsOnlyNumeric()`, `containsOnlyObject()`, `containsOnlyResource()`, `containsOnlyClosedResource()`, `containsOnlyScalar()`, or `containsOnlyString()` instead)
 
+[11.5.5]: https://github.com/sebastianbergmann/phpunit/compare/11.5.4...11.5
 [11.5.4]: https://github.com/sebastianbergmann/phpunit/compare/11.5.3...11.5.4
 [11.5.3]: https://github.com/sebastianbergmann/phpunit/compare/11.5.2...11.5.3
 [11.5.2]: https://github.com/sebastianbergmann/phpunit/compare/11.5.1...11.5.2

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -1794,7 +1794,7 @@ private function handleDependencies(): bool
                     'This test depends on a test that is larger than itself',
                 );
 
-                return false;
+                return true;
             }
 
             $returnValue = $passedTests->returnValue($dependencyTarget);

diff --git a/tests/end-to-end/event/risky-depends-on-larger-test.phpt b/tests/end-to-end/event/risky-depends-on-larger-test.phpt
@@ -28,6 +28,10 @@ Test Suite Finished (PHPUnit\TestFixture\Event\RiskyBecauseDependencyOnLargerTes
 Test Suite Started (PHPUnit\TestFixture\Event\RiskyBecauseDependencyOnLargerTest\SmallTest, 1 test)
 Test Considered Risky (PHPUnit\TestFixture\Event\RiskyBecauseDependencyOnLargerTest\SmallTest::testOne)
 This test depends on a test that is larger than itself
+Test Preparation Started (PHPUnit\TestFixture\Event\RiskyBecauseDependencyOnLargerTest\SmallTest::testOne)
+Test Prepared (PHPUnit\TestFixture\Event\RiskyBecauseDependencyOnLargerTest\SmallTest::testOne)
+Test Passed (PHPUnit\TestFixture\Event\RiskyBecauseDependencyOnLargerTest\SmallTest::testOne)
+Test Finished (PHPUnit\TestFixture\Event\RiskyBecauseDependencyOnLargerTest\SmallTest::testOne)
 Test Suite Finished (PHPUnit\TestFixture\Event\RiskyBecauseDependencyOnLargerTest\SmallTest, 1 test)
 Test Suite Finished (CLI Arguments, 2 tests)
 Test Runner Execution Finished