bug #27237 [Debug] Fix populating error_get_last() for handled silent errors (nicolas-grekas)

fabpot · fabpot · commit 30ffb61b1f8d · 2018-05-14T08:44:24.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [Debug] Fix populating error_get_last() for handled silent errors | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - When a userland error handler doesn't return `false`, `error_get_last()` is not updated, so we cannot see the real last error, but the previous one. See https://3v4l.org/Smmt7 Commits ------- d7e612d [Debug] Fix populating error_get_last() for handled silent errors
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -377,13 +377,15 @@ private function reRegister($prev)
      */
     public function handleError($type, $message, $file, $line)
     {
-        $level = error_reporting() | E_RECOVERABLE_ERROR | E_USER_ERROR | E_DEPRECATED | E_USER_DEPRECATED;
+        $level = error_reporting();
+        $silenced = 0 === ($level & $type);
+        $level |= E_RECOVERABLE_ERROR | E_USER_ERROR | E_DEPRECATED | E_USER_DEPRECATED;
         $log = $this->loggedErrors & $type;
         $throw = $this->thrownErrors & $type & $level;
         $type &= $level | $this->screamedErrors;
 
         if (!$type || (!$log && !$throw)) {
-            return $type && $log;
+            return !$silenced && $type && $log;
         }
         $scope = $this->scopedErrors & $type;
 
@@ -479,7 +481,7 @@ public function handleError($type, $message, $file, $line)
             }
         }
 
-        return $type && $log;
+        return !$silenced && $type && $log;
     }
 
     /**
diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -64,6 +64,30 @@ public function testRegister()
         }
     }
 
+    public function testErrorGetLast()
+    {
+        $handler = ErrorHandler::register();
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $handler->setDefaultLogger($logger);
+        $handler->screamAt(E_ALL);
+
+        try {
+            @trigger_error('Hello', E_USER_WARNING);
+            $expected = array(
+                'type' => E_USER_WARNING,
+                'message' => 'Hello',
+                'file' => __FILE__,
+                'line' => __LINE__ - 5,
+            );
+            $this->assertSame($expected, error_get_last());
+        } catch (\Exception $e) {
+            restore_error_handler();
+            restore_exception_handler();
+
+            throw $e;
+        }
+    }
+
     public function testNotice()
     {
         ErrorHandler::register();

Original file line number	Diff line number	Diff line change
`@@ -377,13 +377,15 @@ private function reRegister($prev)`
`377`	`377`	`*/`
`378`	`378`	`public function handleError($type, $message, $file, $line)`
`379`	`379`	`{`
`380`		`- $level = error_reporting() \| E_RECOVERABLE_ERROR \| E_USER_ERROR \| E_DEPRECATED \| E_USER_DEPRECATED;`
	`380`	`+ $level = error_reporting();`
	`381`	`+ $silenced = 0 === ($level & $type);`
	`382`	`+ $level \|= E_RECOVERABLE_ERROR \| E_USER_ERROR \| E_DEPRECATED \| E_USER_DEPRECATED;`
`381`	`383`	`$log = $this->loggedErrors & $type;`
`382`	`384`	`$throw = $this->thrownErrors & $type & $level;`
`383`	`385`	`$type &= $level \| $this->screamedErrors;`
`384`	`386`
`385`	`387`	`if (!$type \|\| (!$log && !$throw)) {`
`386`		`- return $type && $log;`
	`388`	`+ return !$silenced && $type && $log;`
`387`	`389`	`}`
`388`	`390`	`$scope = $this->scopedErrors & $type;`
`389`	`391`
`@@ -479,7 +481,7 @@ public function handleError($type, $message, $file, $line)`
`479`	`481`	`}`
`480`	`482`	`}`
`481`	`483`
`482`		`- return $type && $log;`
	`484`	`+ return !$silenced && $type && $log;`
`483`	`485`	`}`
`484`	`486`
`485`	`487`	`/**`