Merge branch '11.5'

Author: sebastianbergmann

composer.json

@@ -83,6 +83,7 @@
             "tests/unit/Framework/Assert/assertContainsOnlyInstancesOfTest.php",
             "tests/unit/Framework/Assert/assertContainsOnlyIntTest.php",
             "tests/unit/Framework/Assert/assertContainsOnlyIterableTest.php",
+            "tests/unit/Framework/Assert/assertContainsOnlyNullTest.php",
             "tests/unit/Framework/Assert/assertContainsOnlyNumericTest.php",
             "tests/unit/Framework/Assert/assertContainsOnlyObjectTest.php",
             "tests/unit/Framework/Assert/assertContainsOnlyResourceTest.php",

src/Framework/Assert.php

@@ -440,6 +440,24 @@ final public static function assertContainsOnlyIterable(iterable $haystack, stri
         );
     }
 
+    /**
+     * Asserts that a haystack contains only values of type null.
+     *
+     * @param iterable<mixed> $haystack
+     *
+     * @throws ExpectationFailedException
+     */
+    final public static function assertContainsOnlyNull(iterable $haystack, string $message = ''): void
+    {
+        self::assertThat(
+            $haystack,
+            TraversableContainsOnly::forNativeType(
+                NativeType::Null,
+            ),
+            $message,
+        );
+    }
+
     /**
      * Asserts that a haystack contains only values of type numeric.
      *
@@ -757,6 +775,26 @@ final public static function assertContainsNotOnlyIterable(iterable $haystack, s
         );
     }
 
+    /**
+     * Asserts that a haystack does not contain only values of type null.
+     *
+     * @param iterable<mixed> $haystack
+     *
+     * @throws ExpectationFailedException
+     */
+    final public static function assertContainsNotOnlyNull(iterable $haystack, string $message = ''): void
+    {
+        self::assertThat(
+            $haystack,
+            new LogicalNot(
+                TraversableContainsOnly::forNativeType(
+                    NativeType::Null,
+                ),
+            ),
+            $message,
+        );
+    }
+
     /**
      * Asserts that a haystack does not contain only values of type numeric.
      *

src/Framework/Assert/Functions.php

@@ -401,6 +401,24 @@ function assertContainsOnlyIterable(iterable $haystack, string $message = ''): v
     }
 }
 
+if (!function_exists('PHPUnit\Framework\assertContainsOnlyNull')) {
+    /**
+     * Asserts that a haystack contains only values of type null.
+     *
+     * @param iterable<mixed> $haystack
+     *
+     * @throws ExpectationFailedException
+     *
+     * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+     *
+     * @see Assert::assertContainsOnlyNull
+     */
+    function assertContainsOnlyNull(iterable $haystack, string $message = ''): void
+    {
+        Assert::assertContainsOnlyNull(...func_get_args());
+    }
+}
+
 if (!function_exists('PHPUnit\Framework\assertContainsOnlyNumeric')) {
     /**
      * Asserts that a haystack contains only values of type numeric.
@@ -659,6 +677,24 @@ function assertContainsNotOnlyIterable(iterable $haystack, string $message = '')
     }
 }
 
+if (!function_exists('PHPUnit\Framework\assertContainsNotOnlyNull')) {
+    /**
+     * Asserts that a haystack does not contain only values of type null.
+     *
+     * @param iterable<mixed> $haystack
+     *
+     * @throws ExpectationFailedException
+     *
+     * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+     *
+     * @see Assert::assertContainsNotOnlyNull
+     */
+    function assertContainsNotOnlyNull(iterable $haystack, string $message = ''): void
+    {
+        Assert::assertContainsNotOnlyNull(...func_get_args());
+    }
+}
+
 if (!function_exists('PHPUnit\Framework\assertContainsNotOnlyNumeric')) {
     /**
      * Asserts that a haystack does not contain only values of type numeric.

tests/unit/Framework/Assert/assertContainsNotOnlyNullTest.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Framework;
+
+use PHPUnit\Framework\Attributes\CoversMethod;
+use PHPUnit\Framework\Attributes\DataProviderExternal;
+use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\Attributes\TestDox;
+
+#[CoversMethod(Assert::class, 'assertContainsNotOnlyNull')]
+#[TestDox('assertContainsNotOnlyNull()')]
+#[Small]
+final class assertContainsNotOnlyNullTest extends TestCase
+{
+    #[DataProviderExternal(assertContainsOnlyNullTest::class, 'failureProvider')]
+    public function testSucceedsWhenConstraintEvaluatesToTrue(iterable $haystack): void
+    {
+        $this->assertContainsNotOnlyNull($haystack);
+    }
+
+    #[DataProviderExternal(assertContainsOnlyNullTest::class, 'successProvider')]
+    public function testFailsWhenConstraintEvaluatesToFalse(iterable $haystack): void
+    {
+        $this->expectException(AssertionFailedError::class);
+
+        $this->assertContainsNotOnlyNull($haystack);
+    }
+}

tests/unit/Framework/Assert/assertContainsOnlyNullTest.php

@@ -0,0 +1,55 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Framework;
+
+use PHPUnit\Framework\Attributes\CoversMethod;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\Attributes\TestDox;
+
+#[CoversMethod(Assert::class, 'assertContainsOnlyNull')]
+#[TestDox('assertContainsOnlyNull()')]
+#[Small]
+final class assertContainsOnlyNullTest extends TestCase
+{
+    /**
+     * @return non-empty-list<array{0: iterable}>
+     */
+    public static function successProvider(): array
+    {
+        return [
+            [[null]],
+        ];
+    }
+
+    /**
+     * @return non-empty-list<array{0: iterable}>
+     */
+    public static function failureProvider(): array
+    {
+        return [
+            [[true]],
+        ];
+    }
+
+    #[DataProvider('successProvider')]
+    public function testSucceedsWhenConstraintEvaluatesToTrue(iterable $haystack): void
+    {
+        $this->assertContainsOnlyNull($haystack);
+    }
+
+    #[DataProvider('failureProvider')]
+    public function testFailsWhenConstraintEvaluatesToFalse(iterable $haystack): void
+    {
+        $this->expectException(AssertionFailedError::class);
+
+        $this->assertContainsOnlyNull($haystack);
+    }
+}