minor #47100 [Debug][ErrorHandler] fix operator precedence (guilliamxavier)

nicolas-grekas · nicolas-grekas · commit 9fb7f20f141d · 2022-07-28T18:29:56.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Debug][ErrorHandler] fix operator precedence | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #10921 (comment) | License | MIT But I'm struggling to come up with a *failing* test scenario :/ if the bug is only causing evaluating the condition as truthy instead of false when `$prev` is already equal to `$this->thrownErrors | $this->loggedErrors`, I guess it will just re-register the same, without real visible effect? Commits ------- 7f68914 [Debug][ErrorHandler] fix operator precedence
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -354,7 +354,7 @@ public function screamAt($levels, $replace = false)
      */
     private function reRegister(int $prev)
     {
-        if ($prev !== $this->thrownErrors | $this->loggedErrors) {
+        if ($prev !== ($this->thrownErrors | $this->loggedErrors)) {
             $handler = set_error_handler('is_int');
             $handler = \is_array($handler) ? $handler[0] : null;
             restore_error_handler();
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -374,7 +374,7 @@ public function screamAt(int $levels, bool $replace = false): int
      */
     private function reRegister(int $prev): void
     {
-        if ($prev !== $this->thrownErrors | $this->loggedErrors) {
+        if ($prev !== ($this->thrownErrors | $this->loggedErrors)) {
             $handler = set_error_handler('is_int');
             $handler = \is_array($handler) ? $handler[0] : null;
             restore_error_handler();

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ public function screamAt($levels, $replace = false)`
`354`	`354`	`*/`
`355`	`355`	`private function reRegister(int $prev)`
`356`	`356`	`{`
`357`		`- if ($prev !== $this->thrownErrors \| $this->loggedErrors) {`
	`357`	`+ if ($prev !== ($this->thrownErrors \| $this->loggedErrors)) {`
`358`	`358`	`$handler = set_error_handler('is_int');`
`359`	`359`	`$handler = \is_array($handler) ? $handler[0] : null;`
`360`	`360`	`restore_error_handler();`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ public function screamAt(int $levels, bool $replace = false): int`
`374`	`374`	`*/`
`375`	`375`	`private function reRegister(int $prev): void`
`376`	`376`	`{`
`377`		`- if ($prev !== $this->thrownErrors \| $this->loggedErrors) {`
	`377`	`+ if ($prev !== ($this->thrownErrors \| $this->loggedErrors)) {`
`378`	`378`	`$handler = set_error_handler('is_int');`
`379`	`379`	`$handler = \is_array($handler) ? $handler[0] : null;`
`380`	`380`	`restore_error_handler();`