Closes #5473

sebastianbergmann · Oct 7, 2024 · da4c344 · da4c344
1 parent d0f8ab9
commit da4c344
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 225 deletions.
diff --git a/ChangeLog-12.0.md b/ChangeLog-12.0.md
@@ -20,6 +20,7 @@ All notable changes of the PHPUnit 12.0 release series are documented in this fi
 * [#5314](https://github.com/sebastianbergmann/phpunit/issues/5314): `MockBuilder::getMockForAbstractClass()`
 * [#5316](https://github.com/sebastianbergmann/phpunit/issues/5316): `MockBuilder::enableArgumentCloning()` and `MockBuilder::disableArgumentCloning()`
 * [#5321](https://github.com/sebastianbergmann/phpunit/issues/5321): `MockBuilder::addMethods()`
+* [#5473](https://github.com/sebastianbergmann/phpunit/issues/5473): `assertStringNotMatchesFormat()` and `assertStringNotMatchesFormatFile()`
 * [#5978](https://github.com/sebastianbergmann/phpunit/issues/5978): Support for PHP 8.2
 
 [12.0.0]: https://github.com/sebastianbergmann/phpunit/compare/11.5...main
diff --git a/DEPRECATIONS.md b/DEPRECATIONS.md
@@ -6,13 +6,6 @@ This functionality is currently [hard-deprecated](https://phpunit.de/backward-co
 
 ### Writing Tests
 
-#### Assertions, Constraints, and Expectations
-
-| Issue                                                             | Description                                    | Since  | Replacement |
-|-------------------------------------------------------------------|------------------------------------------------|--------|-------------|
-| [#5472](https://github.com/sebastianbergmann/phpunit/issues/5472) | `TestCase::assertStringNotMatchesFormat()`     | 10.4.0 |             |
-| [#5472](https://github.com/sebastianbergmann/phpunit/issues/5472) | `TestCase::assertStringNotMatchesFormatFile()` | 10.4.0 |             |
-
 #### Test Double API
 
 | Issue                                                             | Description                                                                    | Since  | Replacement                                                                             |

diff --git a/src/Framework/Assert.php b/src/Framework/Assert.php
@@ -19,7 +19,6 @@
 use ArrayAccess;
 use Countable;
 use Generator;
-use PHPUnit\Event;
 use PHPUnit\Framework\Constraint\ArrayHasKey;
 use PHPUnit\Framework\Constraint\Callback;
 use PHPUnit\Framework\Constraint\Constraint;
@@ -1747,29 +1746,6 @@ final public static function assertStringMatchesFormat(string $format, string $s
         self::assertThat($string, new StringMatchesFormatDescription($format), $message);
     }
 
-    /**
-     * Asserts that a string does not match a given format string.
-     *
-     * @throws ExpectationFailedException
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5472
-     */
-    final public static function assertStringNotMatchesFormat(string $format, string $string, string $message = ''): void
-    {
-        Event\Facade::emitter()->testTriggeredPhpunitDeprecation(
-            null,
-            'assertStringNotMatchesFormat() is deprecated and will be removed in PHPUnit 12 without replacement.',
-        );
-
-        self::assertThat(
-            $string,
-            new LogicalNot(
-                new StringMatchesFormatDescription($format),
-            ),
-            $message,
-        );
-    }
-
     /**
      * Asserts that a string matches a given format file.
      *
@@ -1792,37 +1768,6 @@ final public static function assertStringMatchesFormatFile(string $formatFile, s
         );
     }
 
-    /**
-     * Asserts that a string does not match a given format string.
-     *
-     * @throws ExpectationFailedException
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5472
-     */
-    final public static function assertStringNotMatchesFormatFile(string $formatFile, string $string, string $message = ''): void
-    {
-        Event\Facade::emitter()->testTriggeredPhpunitDeprecation(
-            null,
-            'assertStringNotMatchesFormatFile() is deprecated and will be removed in PHPUnit 12 without replacement.',
-        );
-
-        self::assertFileExists($formatFile, $message);
-
-        $formatDescription = file_get_contents($formatFile);
-
-        self::assertIsString($formatDescription);
-
-        self::assertThat(
-            $string,
-            new LogicalNot(
-                new StringMatchesFormatDescription(
-                    $formatDescription,
-                ),
-            ),
-            $message,
-        );
-    }
-
     /**
      * Asserts that a string starts with a given prefix.
      *

diff --git a/src/Framework/Assert/Functions.php b/src/Framework/Assert/Functions.php
@@ -1977,24 +1977,6 @@ function assertStringMatchesFormat(string $format, string $string, string $messa
     }
 }
 
-if (!function_exists('PHPUnit\Framework\assertStringNotMatchesFormat')) {
-    /**
-     * Asserts that a string does not match a given format string.
-     *
-     * @throws ExpectationFailedException
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5472
-     *
-     * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
-     *
-     * @see Assert::assertStringNotMatchesFormat
-     */
-    function assertStringNotMatchesFormat(string $format, string $string, string $message = ''): void
-    {
-        Assert::assertStringNotMatchesFormat(...func_get_args());
-    }
-}
-
 if (!function_exists('PHPUnit\Framework\assertStringMatchesFormatFile')) {
     /**
      * Asserts that a string matches a given format file.
@@ -2011,24 +1993,6 @@ function assertStringMatchesFormatFile(string $formatFile, string $string, strin
     }
 }
 
-if (!function_exists('PHPUnit\Framework\assertStringNotMatchesFormatFile')) {
-    /**
-     * Asserts that a string does not match a given format string.
-     *
-     * @throws ExpectationFailedException
-     *
-     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5472
-     *
-     * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
-     *
-     * @see Assert::assertStringNotMatchesFormatFile
-     */
-    function assertStringNotMatchesFormatFile(string $formatFile, string $string, string $message = ''): void
-    {
-        Assert::assertStringNotMatchesFormatFile(...func_get_args());
-    }
-}
-
 if (!function_exists('PHPUnit\Framework\assertStringStartsWith')) {
     /**
      * Asserts that a string starts with a given prefix.

diff --git a/tests/end-to-end/event/_files/DeprecatedAssertionTest.php b/tests/end-to-end/event/_files/DeprecatedAssertionTest.php
diff --git a/tests/end-to-end/event/deprecated-assertion.phpt b/tests/end-to-end/event/deprecated-assertion.phpt
diff --git a/tests/unit/Framework/Assert/assertStringNotMatchesFormatFileTest.php b/tests/unit/Framework/Assert/assertStringNotMatchesFormatFileTest.php
diff --git a/tests/unit/Framework/Assert/assertStringNotMatchesFormatTest.php b/tests/unit/Framework/Assert/assertStringNotMatchesFormatTest.php