Merge branch '11.5'

sebastianbergmann · Nov 28, 2024 · 43368e6 · 43368e6
2 parents ecb3aed + 72de5c0
commit 43368e6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/Framework/Assert.php b/src/Framework/Assert.php
@@ -278,6 +278,13 @@ final public static function assertContainsOnly(string $type, iterable $haystack
             $isNativeType = self::isNativeType($type);
         }
 
+        if (!$isNativeType || class_exists($type) || interface_exists($type)) {
+            Event\Facade::emitter()->testTriggeredPhpunitDeprecation(
+                null,
+                'Using assertContainsOnly() with classes or interfaces is deprecated. Support for this will be removed in PHPUnit 12. Please use assertContainsOnlyInstancesOf() instead.',
+            );
+        }
+
         self::assertThat(
             $haystack,
             new TraversableContainsOnly(
@@ -324,6 +331,13 @@ final public static function assertNotContainsOnly(string $type, iterable $hayst
             $isNativeType = self::isNativeType($type);
         }
 
+        if (!$isNativeType || class_exists($type) || interface_exists($type)) {
+            Event\Facade::emitter()->testTriggeredPhpunitDeprecation(
+                null,
+                'Using assertNotContainsOnly() with classes or interfaces is deprecated. Support for this will be removed in PHPUnit 12. Please use assertContainsOnlyInstancesOf() instead.',
+            );
+        }
+
         self::assertThat(
             $haystack,
             new LogicalNot(

diff --git a/tests/unit/Framework/Assert/assertContainsOnlyTest.php b/tests/unit/Framework/Assert/assertContainsOnlyTest.php
@@ -12,6 +12,7 @@
 use function fopen;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\IgnorePhpunitDeprecations;
 use PHPUnit\Framework\Attributes\Small;
 use PHPUnit\Framework\Attributes\TestDox;
 use stdClass;
@@ -20,6 +21,7 @@
 #[CoversMethod(Assert::class, 'isNativeType')]
 #[TestDox('assertContainsOnly()')]
 #[Small]
+#[IgnorePhpunitDeprecations]
 final class assertContainsOnlyTest extends TestCase
 {
     /**

diff --git a/tests/unit/Framework/Assert/assertNotContainsOnlyTest.php b/tests/unit/Framework/Assert/assertNotContainsOnlyTest.php
@@ -11,13 +11,15 @@
 
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\DataProviderExternal;
+use PHPUnit\Framework\Attributes\IgnorePhpunitDeprecations;
 use PHPUnit\Framework\Attributes\Small;
 use PHPUnit\Framework\Attributes\TestDox;
 
 #[CoversMethod(Assert::class, 'assertNotContainsOnly')]
 #[CoversMethod(Assert::class, 'isNativeType')]
 #[TestDox('assertNotContainsOnly()')]
 #[Small]
+#[IgnorePhpunitDeprecations]
 final class assertNotContainsOnlyTest extends TestCase
 {
     #[DataProviderExternal(assertContainsOnlyTest::class, 'failureProvider')]