Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a240440

Browse filesBrowse files
committed
Merge branch '6.4' into 7.0
* 6.4: [PhpUnitBridge] Fix error handler triggered outside of tests
2 parents 7068601 + cf4ef92 commit a240440
Copy full SHA for a240440

File tree

Expand file treeCollapse file tree

1 file changed

+11
-7
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+11
-7
lines changed

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+11-7Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -367,22 +367,26 @@ private static function getPhpUnitErrorHandler(): callable
367367

368368
if ('PHPUnit\Util\ErrorHandler::handleError' === $eh) {
369369
return $eh;
370-
} elseif (ErrorHandler::class === $eh) {
371-
return function (int $errorNumber, string $errorString, string $errorFile, int $errorLine) {
372-
ErrorHandler::instance()($errorNumber, $errorString, $errorFile, $errorLine);
373-
374-
return true;
375-
};
376370
}
377371

378372
foreach (debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
379-
if (isset($frame['object']) && $frame['object'] instanceof TestResult) {
373+
if (!isset($frame['object'])) {
374+
continue;
375+
}
376+
377+
if ($frame['object'] instanceof TestResult) {
380378
return new $eh(
381379
$frame['object']->getConvertDeprecationsToExceptions(),
382380
$frame['object']->getConvertErrorsToExceptions(),
383381
$frame['object']->getConvertNoticesToExceptions(),
384382
$frame['object']->getConvertWarningsToExceptions()
385383
);
384+
} elseif (ErrorHandler::class === $eh && $frame['object'] instanceof TestCase) {
385+
return function (int $errorNumber, string $errorString, string $errorFile, int $errorLine) {
386+
ErrorHandler::instance()($errorNumber, $errorString, $errorFile, $errorLine);
387+
388+
return true;
389+
};
386390
}
387391
}
388392

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.