8000 bug #27514 [Debug] Pass previous exception to FatalErrorException (pm… · symfony/symfony@ae30a80 · GitHub
[go: up one dir, main page]
Skip to content

Commit ae30a80

Browse files
fabpotfabpot
committed
bug #27514 [Debug] Pass previous exception to FatalErrorException (pmontoya)
This PR was merged into the 2.8 branch. Discussion ---------- [Debug] Pass previous exception to FatalErrorException | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #27483 | License | MIT Add a previous parameter to FatalErrorException. Call \ErrorException with this parameter. Update parent::__constructor for inherited classes with default parameters and the new one Commits ------- 7f9780b Pass previous exception to FatalErrorException
2 parents 7d2d60f + 7f9780b commit ae30a80

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

‎src/Symfony/Component/Debug/Exception/ClassNotFoundException.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public function __construct($message, \ErrorException $previous)
2626
$previous->getSeverity(),
2727
$previous->getFile(),
2828
$previous->getLine(),
29+
null,
30+
true,
31+
null,
2932
$previous->getPrevious()
3033
);
3134
$this->setTrace($previous->getTrace());

‎src/Symfony/Component/Debug/Exception/FatalErrorException.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ class FatalErrorException extends \ErrorException
3535
*/
3636
class FatalErrorException extends LegacyFatalErrorException
3737
{
38-
public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null)
38+
public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null, $previous = null)
3939
{
40-
parent::__construct($message, $code, $severity, $filename, $lineno);
40+
parent::__construct($message, $code, $severity, $filename, $lineno, $previous);
4141

4242
if (null !== $trace) {
4343
if (!$traceArgs) {

‎src/Symfony/Component/Debug/Exception/UndefinedFunctionException.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public function __construct($message, \ErrorException $previous)
2626
$previous->getSeverity(),
2727
$previous->getFile(),
2828
$previous->getLine(),
29+
null,
30+
true,
31+
null,
2932
$previous->getPrevious()
3033
);
3134
$this->setTrace($previous->getTrace());

‎src/Symfony/Component/Debug/Exception/UndefinedMethodException.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public function __construct($message, \ErrorException $previous)
2626
$previous->getSeverity(),
2727
$previous->getFile(),
2828
$previous->getLine(),
29+
null,
30+
true,
31+
null,
2932
$previous->getPrevious()
3033
);
3134
$this->setTrace($previous->getTrace());

0 commit comments

Comments
 (0)
0