bug #45921 [PhpUnitBridge] Fix ignoreFile comments (mondrake)

nicolas-grekas · nicolas-grekas · commit f97db87d0608 · 2022-04-03T10:46:12.000+02:00
This PR was squashed before being merged into the 6.1 branch. Discussion ---------- [PhpUnitBridge] Fix ignoreFile comments | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #45918 | License | MIT Commits ------- 72c0846 [PhpUnitBridge] Fix ignoreFile comments
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
@@ -125,7 +125,7 @@ private function __construct(array $thresholds = [], $regex = '', $verboseOutput
             });
             try {
                 foreach (file($ignoreFile) as $line => $pattern) {
-                    if ('#' !== trim($line)[0] ?? '#') {
+                    if ('#' !== (trim($pattern)[0] ?? '#')) {
                         preg_match($pattern, '');
                         $this->ignoreDeprecationPatterns[] = $pattern;
                     }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ignore.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ignore.phpt
@@ -4,6 +4,9 @@ Test DeprecationErrorHandler with an ignoreFile
 <?php
 $filename = tempnam(sys_get_temp_dir(), 'sf-');
 $ignorePatterns = [
+  '# A comment line and, below, an empty comment line and an empty line that should be interpreted as a comment.',
+  '#',
+  '',
   '/^ignored .* deprecation/',
 ];
 file_put_contents($filename, implode("\n", $ignorePatterns));

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ private function __construct(array $thresholds = [], $regex = '', $verboseOutput`
`125`	`125`	`});`
`126`	`126`	`try {`
`127`	`127`	`foreach (file($ignoreFile) as $line => $pattern) {`
`128`		`- if ('#' !== trim($line)[0] ?? '#') {`
	`128`	`+ if ('#' !== (trim($pattern)[0] ?? '#')) {`
`129`	`129`	`preg_match($pattern, '');`
`130`	`130`	`$this->ignoreDeprecationPatterns[] = $pattern;`
`131`	`131`	`}`