8000 Merge branch '2.8' into 3.4 · symfony/symfony@9586c43 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9586c43

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.4
* 2.8: revert #27545 Update Finder.php Fix security-core cross-dependencies, fixes #27507 Pass previous exception to FatalErrorException
2 parents 0a24242 + 637963d commit 9586c43

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
@@ -18,9 +18,9 @@
1818
*/
1919
class FatalErrorException extends \ErrorException
2020
{
21-
public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null)
21+
public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null, $previous = null)
2222
{
23-
parent::__construct($message, $code, $severity, $filename, $lineno);
23+
parent::__construct($message, $code, $severity, $filename, $lineno, $previous);
2424

2525
if (null !== $trace) {
2626
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()
< 432B /td>
3033
);
3134
$this->setTrace($previous->getTrace());

0 commit comments

Comments
 (0)
0