[PhpUnitBridge] fixes

nicolas-grekas · nicolas-grekas · commit b11585e31f8d · 2019-04-12T15:46:34.000+02:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -227,8 +227,10 @@ private function getConfiguration()
             return $this->configuration = Configuration::inWeakMode();
         }
         if (self::MODE_WEAK_VENDORS === $mode) {
-            echo sprintf('Setting SYMFONY_DEPRECATIONS_HELPER to "%s" is deprecated in favor of "max[self]=0"', $mode).PHP_EOL;
-            exit(1);
+            ++$this->deprecations['remaining selfCount'];
+            $msg = sprintf('Setting SYMFONY_DEPRECATIONS_HELPER to "%s" is deprecated in favor of "max[self]=0"', $mode);
+            $ref = &$this->deprecations['remaining self'][$msg]['count'];
+            ++$ref;
         }
         if (isset($mode[0]) && '/' === $mode[0]) {
             return $this->configuration = Configuration::fromRegex($mode);
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
@@ -16,8 +16,6 @@
  */
 class Configuration
 {
-    const GROUPS = ['total', 'indirect', 'direct', 'self'];
-
     /**
      * @var int[]
      */
@@ -46,9 +44,11 @@ class Configuration
      */
     private function __construct(array $thresholds = [], $regex = '', $verboseOutput = true)
     {
+        $groups = ['total', 'indirect', 'direct', 'self'];
+
         foreach ($thresholds as $group => $threshold) {
-            if (!\in_array($group, self::GROUPS, true)) {
-                throw new \InvalidArgumentException(sprintf('Unrecognized threshold "%s", expected one of "%s"', $group, implode('", "', self::GROUPS)));
+            if (!\in_array($group, $groups, true)) {
+                throw new \InvalidArgumentException(sprintf('Unrecognized threshold "%s", expected one of "%s"', $group, implode('", "', $groups)));
             }
             if (!is_numeric($threshold)) {
                 throw new \InvalidArgumentException(sprintf('Threshold for group "%s" has invalid value "%s"', $group, $threshold));
@@ -66,7 +66,7 @@ private function __construct(array $thresholds = [], $regex = '', $verboseOutput
                 'self' => $this->thresholds['indirect'],
             ];
         }
-        foreach (self::GROUPS as $group) {
+        foreach ($groups as $group) {
             if (!isset($this->thresholds[$group])) {
                 $this->thresholds[$group] = 999999;
             }

Original file line number	Diff line number	Diff line change
`@@ -227,8 +227,10 @@ private function getConfiguration()`
`227`	`227`	`return $this->configuration = Configuration::inWeakMode();`
`228`	`228`	`}`
`229`	`229`	`if (self::MODE_WEAK_VENDORS === $mode) {`
`230`		`- echo sprintf('Setting SYMFONY_DEPRECATIONS_HELPER to "%s" is deprecated in favor of "max[self]=0"', $mode).PHP_EOL;`
`231`		`- exit(1);`
	`230`	`+ ++$this->deprecations['remaining selfCount'];`
	`231`	`+ $msg = sprintf('Setting SYMFONY_DEPRECATIONS_HELPER to "%s" is deprecated in favor of "max[self]=0"', $mode);`
	`232`	`+ $ref = &$this->deprecations['remaining self'][$msg]['count'];`
	`233`	`+ ++$ref;`
`232`	`234`	`}`
`233`	`235`	`if (isset($mode[0]) && '/' === $mode[0]) {`
`234`	`236`	`return $this->configuration = Configuration::fromRegex($mode);`