Closes #3495

ChangeLog-9.0.md

@@ -15,6 +15,7 @@ All notable changes of the PHPUnit 9.0 release series are documented in this fil
 * Implemented [#3339](https://github.com/sebastianbergmann/phpunit/issues/3339): Remove assertions (and helper methods) that operate on (non-public) attributes
 * Implemented [#3342](https://github.com/sebastianbergmann/phpunit/issues/3342): Remove optional parameters of `assertEquals()` and `assertNotEquals()`
 * Implemented [#3426](https://github.com/sebastianbergmann/phpunit/issues/3426): Clean up `assertContains()` and `assertNotContains()`
+* Implemented [#3495](https://github.com/sebastianbergmann/phpunit/issues/3495): Remove `assertArraySubset()`
 
 [9.0.0]: https://github.com/sebastianbergmann/phpunit/compare/8.5...master
 

src/Framework/Assert.php

@@ -14,7 +14,6 @@
 use DOMDocument;
 use DOMElement;
 use PHPUnit\Framework\Constraint\ArrayHasKey;
-use PHPUnit\Framework\Constraint\ArraySubset;
 use PHPUnit\Framework\Constraint\Callback;
 use PHPUnit\Framework\Constraint\ClassHasAttribute;
 use PHPUnit\Framework\Constraint\ClassHasStaticAttribute;
@@ -102,43 +101,6 @@ public static function assertArrayHasKey($key, $array, string $message = ''): vo
         static::assertThat($array, $constraint, $message);
     }
 
-    /**
-     * Asserts that an array has a specified subset.
-     *
-     * @param array|ArrayAccess $subset
-     * @param array|ArrayAccess $array
-     *
-     * @throws ExpectationFailedException
-     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws Exception
-     *
-     * @codeCoverageIgnore
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/3494
-     */
-    public static function assertArraySubset($subset, $array, bool $checkForObjectIdentity = false, string $message = ''): void
-    {
-        self::createWarning('assertArraySubset() is deprecated and will be removed in PHPUnit 9.');
-
-        if (!(\is_array($subset) || $subset instanceof ArrayAccess)) {
-            throw InvalidArgumentException::create(
-                1,
-                'array or ArrayAccess'
-            );
-        }
-
-        if (!(\is_array($array) || $array instanceof ArrayAccess)) {
-            throw InvalidArgumentException::create(
-                2,
-                'array or ArrayAccess'
-            );
-        }
-
-        $constraint = new ArraySubset($subset, $checkForObjectIdentity);
-
-        static::assertThat($array, $constraint, $message);
-    }
-
     /**
      * Asserts that an array does not have a specified key.
      *

src/Framework/Assert/Functions.php

@@ -81,26 +81,6 @@ function assertArrayHasKey($key, $array, string $message = ''): void
     Assert::assertArrayHasKey(...\func_get_args());
 }
 
-/**
- * Asserts that an array has a specified subset.
- *
- * @param array|ArrayAccess $subset
- * @param array|ArrayAccess $array
- *
- * @throws ExpectationFailedException
- * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
- * @throws Exception
- *
- * @codeCoverageIgnore
- *
- * @deprecated https://github.com/sebastianbergmann/phpunit/issues/3494
- * @see Assert::assertArraySubset
- */
-function assertArraySubset($subset, $array, bool $checkForObjectIdentity = false, string $message = ''): void
-{
-    Assert::assertArraySubset(...\func_get_args());
-}
-
 /**
  * Asserts that an array does not have a specified key.
  *