Merge branch '3.4' into 4.0

* 3.4: revert #27545 Update Finder.php [FrameworkBundle] remove dead code in CachePoolClearerPass Fix security-core cross-dependencies, fixes #27507 Pass previous exception to FatalErrorException
Merge branch '2.8' into 3.4
2026-03-25 09:42:20 +01:00 · 2018-06-08 11:39:19 +02:00 · 2018-06-08 11:38:38 +02:00 · 2018-06-06 10:34:52 +02:00 · 2018-05-16 16:03:39 +02:00 · 2018-05-16 14:49:49 +02:00
4 changed files with 11 additions and 2 deletions
--- a/Exception/ClassNotFoundException.php
+++ b/Exception/ClassNotFoundException.php
@@ -26,6 +26,9 @@ class ClassNotFoundException extends FatalErrorException
            $previous->getSeverity(),
            $previous->getFile(),
            $previous->getLine(),
+            null,
+            true,
+            null,
            $previous->getPrevious()
        );
        $this->setTrace($previous->getTrace());
--- a/Exception/FatalErrorException.php
+++ b/Exception/FatalErrorException.php
@@ -18,9 +18,9 @@ namespace Symfony\Component\Debug\Exception;
 */
 class FatalErrorException extends \ErrorException
 {
-    public function __construct(string $message, int $code, int $severity, string $filename, int $lineno, int $traceOffset = null, bool $traceArgs = true, array $trace = null)
+    public function __construct(string $message, int $code, int $severity, string $filename, int $lineno, int $traceOffset = null, bool $traceArgs = true, array $trace = null, \Throwable $previous = null)
    {
-        parent::__construct($message, $code, $severity, $filename, $lineno);
+        parent::__construct($message, $code, $severity, $filename, $lineno, $previous);

        if (null !== $trace) {
            if (!$traceArgs) {
--- a/Exception/UndefinedFunctionException.php
+++ b/Exception/UndefinedFunctionException.php
@@ -26,6 +26,9 @@ class UndefinedFunctionException extends FatalErrorException
            $previous->getSeverity(),
            $previous->getFile(),
            $previous->getLine(),
+            null,
+            true,
+            null,
            $previous->getPrevious()
        );
        $this->setTrace($previous->getTrace());
--- a/Exception/UndefinedMethodException.php
+++ b/Exception/UndefinedMethodException.php
@@ -26,6 +26,9 @@ class UndefinedMethodException extends FatalErrorException
            $previous->getSeverity(),
            $previous->getFile(),
            $previous->getLine(),
+            null,
+            true,
+            null,
            $previous->getPrevious()
        );
        $this->setTrace($previous->getTrace());
Author	SHA1	Message	Date
Nicolas Grekas	ef0abb7ca3	Merge branch '3.4' into 4.0 * 3.4: revert #27545 Update Finder.php [FrameworkBundle] remove dead code in CachePoolClearerPass Fix security-core cross-dependencies, fixes #27507 Pass previous exception to FatalErrorException	2018-06-08 11:39:19 +02:00
Nicolas Grekas	a7e8068943	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	2018-06-08 11:38:38 +02:00
Pascal Montoya	5d48e9c0f8	Pass previous exception to FatalErrorException	2018-06-06 10:34:52 +02:00
Nicolas Grekas	b28fd73fef	bug #27281 [HttpKernel] Fix dealing with self/parent in ArgumentMetadataFactory (fabpot) This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] Fix dealing with self/parent in ArgumentMetadataFactory \| Q \| A \| ------------- \| --- \| Branch? \| 3.4 \| Bug fix? \| yes \| New feature? \| no \| BC breaks? \| no \| Deprecations? \| no \| Tests pass? \| yes \| Fixed tickets \| - \| License \| MIT \| Doc PR \| - Applies CS fixes that where merged on 4.0 to 3.4, embeds a fix in ArgumentMetadataFactory, which couldn't deal with self/parent type hints. Commits ------- ba5cb1a245 fixed CS	2018-05-16 16:03:39 +02:00
Fabien Potencier	c7d48cc12e	fixed CS	2018-05-16 14:49:49 +02:00