Skip to content

Commit b782cf9

Browse files
feature symfony#16937 [PhpUnitBridge] Replace "weak-verbose" by "deprecations upper bound" mode (nicolas-grekas)
This PR was merged into the 2.8 branch. Discussion ---------- [PhpUnitBridge] Replace "weak-verbose" by "deprecations upper bound" mode | Q | A | ------------- | --- | Bug fix? | yes | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#16789, symfony#14475 | License | MIT | Doc PR | - This is a "new feature" that replaces a "new feature" not yet released but merged into 2.8.1. See symfony#16789. It is way more flexible to be able to specify the upper bound of remaining deprecation notices that you allow in your test suite. This allows lowering this number while deprecations are removed, step after step. ping @wouterj @Tobion @craue @fabpot @stof Commits ------- 58cd3ee [PhpUnitBridge] Replace "weak-verbose" by "deprecations upper bound" mode
2 parents 829c011 + 58cd3ee commit b782cf9

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,29 @@
1919
class DeprecationErrorHandler
2020
{
2121
const MODE_WEAK = 'weak';
22-
const MODE_WEAK_VERBOSE = 'weak-verbose';
2322

2423
private static $isRegistered = false;
2524

26-
public static function register($mode = false)
25+
/**
26+
* Registers and configures the deprecation handler.
27+
*
28+
* The following reporting modes are supported:
29+
* - use "weak" to hide the deprecation report but keep a global count;
30+
* - use "/some-regexp/" to stop the test suite whenever a deprecation
31+
* message matches the given regular expression;
32+
* - use a number to define the upper bound of allowed deprecations,
33+
* making the test suite fail whenever more notices are trigerred.
34+
*
35+
* @param int|string|false $mode The reporting mode. Defaults to not allowing any deprecations.
36+
*/
37+
public static function register($mode = 0)
2738
{
2839
if (self::$isRegistered) {
2940
return;
3041
}
42+
if (self::MODE_WEAK !== $mode && (!isset($mode[0]) || '/' !== $mode[0])) {
43+
$mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;
44+
}
3145
$deprecations = array(
3246
'unsilencedCount' => 0,
3347
'remainingCount' => 0,
@@ -147,7 +161,7 @@ public static function register($mode = false)
147161
if (!empty($notices)) {
148162
echo "\n";
149163
}
150-
if (DeprecationErrorHandler::MODE_WEAK !== $mode && DeprecationErrorHandler::MODE_WEAK_VERBOSE !== $mode && ($deprecations['unsilenced'] || $deprecations['remaining'] || $deprecations['other'])) {
164+
if (DeprecationErrorHandler::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount']) {
151165
exit(1);
152166
}
153167
});

src/Symfony/Bridge/PhpUnit/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ It comes with the following features:
1212
* display the stack trace of a deprecation on-demand.
1313

1414
By default any non-legacy-tagged or any non-@-silenced deprecation notices will
15-
make tests fail.
16-
This can be changed by setting the `SYMFONY_DEPRECATIONS_HELPER` environment
17-
variable to `weak` or `weak-verbose`. This will make the bridge ignore
18-
deprecation notices and is useful to projects that must use deprecated interfaces
19-
for backward compatibility reasons.
15+
make tests fail. This can be changed by setting the `SYMFONY_DEPRECATIONS_HELPER`
16+
environment variable to the maximum number of deprecations that are allowed to be
17+
triggered before making the test suite fail. Alternatively, setting it to `weak`
18+
will make the bridge ignore any deprecation notices and is useful to projects
19+
that must use deprecated interfaces for backward compatibility reasons.
2020

2121
A summary of deprecation notices is displayed at the end of the test suite:
2222

0 commit comments

Comments
 (0)