Merge branch '7.5'

sebastianbergmann · Jan 22, 2019 · 9d840a8 · 9d840a8
2 parents eea00a6 + 3db1971
commit 9d840a8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/ChangeLog-7.5.md b/ChangeLog-7.5.md
@@ -8,6 +8,10 @@ All notable changes of the PHPUnit 7.5 release series are documented in this fil
 
 * Fixed [#3490](https://github.com/sebastianbergmann/phpunit/pull/3490): Exceptions in `tearDownAfterClass()` kill PHPUnit
 
+### Deprecated
+
+* The method `assertArraySubset()` is now deprecated. There is no behavioral change in this version of PHPUnit. Using this method will trigger a deprecation warning in PHPUnit 8 and in PHPUnit 9 this method will be removed.
+
 ## [7.5.2] - 2019-01-15
 
 ### Fixed

diff --git a/src/Framework/Assert.php b/src/Framework/Assert.php
@@ -112,6 +112,8 @@ public static function assertArrayHasKey($key, $array, string $message = ''): vo
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      * @throws Exception
+     *
+     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/3494
      */
     public static function assertArraySubset($subset, $array, bool $checkForObjectIdentity = false, string $message = ''): void
     {

diff --git a/src/Framework/Assert/Functions.php b/src/Framework/Assert/Functions.php
@@ -85,6 +85,8 @@ function assertArrayHasKey($key, $array, string $message = ''): void
  *
  * @throws ExpectationFailedException
  * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+ *
+ * @deprecated https://github.com/sebastianbergmann/phpunit/issues/3494
  */
 function assertArraySubset($subset, $array, bool $checkForObjectIdentity = false, string $message = ''): void
 {

diff --git a/src/Framework/Constraint/ArraySubset.php b/src/Framework/Constraint/ArraySubset.php
@@ -17,6 +17,8 @@
  *
  * Uses array_replace_recursive() to check if a key value subset is part of the
  * subject array.
+ *
+ * @deprecated https://github.com/sebastianbergmann/phpunit/issues/3494
  */
 final class ArraySubset extends Constraint
 {