minor #28114 [travis] merge "same Symfony version" jobs in one (nicolas-grekas)

This PR was merged into the 2.8 branch. Discussion ---------- [travis] merge "same Symfony version" jobs in one | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Allowing to consume fewer jobs and save the 1 to 2 minutes bootstrap time of workers. Commits ------- 9857ca07aa [travis] merge "same Symfony version" jobs in one
2026-03-25 01:32:09 +01:00 · 2018-08-03 13:27:18 +02:00
14 changed files with 230 additions and 362 deletions
--- a/Debug.php
+++ b/Debug.php
@@ -45,7 +45,7 @@ class Debug
        if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
            ini_set('display_errors', 0);
            ExceptionHandler::register();
-        } elseif ($displayErrors && (!filter_var(ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN) || ini_get('error_log'))) {
+        } elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
            // CLI - display errors only if they're not already logged to STDERR
            ini_set('display_errors', 1);
        }
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -128,6 +128,8 @@ class DebugClassLoader
     *
     * @param string $class The name of the class
     *
+     * @return bool|null True, if loaded
+     *
     * @throws \RuntimeException
     */
    public function loadClass($class)
@@ -181,223 +183,196 @@ class DebugClassLoader
                throw new \RuntimeException(sprintf('Case mismatch between loaded and declared class names: "%s" vs "%s".', $class, $name));
            }

-            $deprecations = $this->checkAnnotations($refl, $name);
-
-            foreach ($deprecations as $message) {
-                @trigger_error($message, E_USER_DEPRECATED);
-            }
-        }
-
-        if (!$file) {
-            return;
-        }
-
-        if (!$exists) {
-            if (false !== strpos($class, '/')) {
-                throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
-            }
-
-            throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
-        }
-
-        if (self::$caseCheck && $message = $this->checkCase($refl, $file, $class)) {
-            throw new \RuntimeException(sprintf('Case mismatch between class and real file names: "%s" vs "%s" in "%s".', $message[0], $message[1], $message[2]));
-        }
-    }
-
-    public function checkAnnotations(\ReflectionClass $refl, $class)
-    {
-        $deprecations = array();
-
-        // Don't trigger deprecations for classes in the same vendor
-        if (2 > $len = 1 + (\strpos($class, '\\') ?: \strpos($class, '_'))) {
-            $len = 0;
-            $ns = '';
-        } else {
-            $ns = \substr($class, 0, $len);
-        }
-
-        // Detect annotations on the class
-        if (false !== $doc = $refl->getDocComment()) {
-            foreach (array('final', 'deprecated', 'internal') as $annotation) {
-                if (false !== \strpos($doc, $annotation) && preg_match('#\n \* @'.$annotation.'(?:( .+?)\.?)?\r?\n \*(?: @|/$)#s', $doc, $notice)) {
-                    self::${$annotation}[$class] = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
-                }
-            }
-        }
-
-        $parent = \get_parent_class($class);
-        $parentAndOwnInterfaces = $this->getOwnInterfaces($class, $parent);
-        if ($parent) {
-            $parentAndOwnInterfaces[$parent] = $parent;
-
-            if (!isset(self::$checkedClasses[$parent])) {
-                $this->checkClass($parent);
-            }
-
-            if (isset(self::$final[$parent])) {
-                $deprecations[] = sprintf('The "%s" class is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $parent, self::$final[$parent], $class);
-            }
-        }
-
-        // Detect if the parent is annotated
-        foreach ($parentAndOwnInterfaces + \class_uses($class, false) as $use) {
-            if (!isset(self::$checkedClasses[$use])) {
-                $this->checkClass($use);
-            }
-            if (isset(self::$deprecated[$use]) && \strncmp($ns, $use, $len)) {
-                $type = class_exists($class, false) ? 'class' : (interface_exists($class, false) ? 'interface' : 'trait');
-                $verb = class_exists($use, false) || interface_exists($class, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');
-
-                $deprecations[] = sprintf('The "%s" %s %s "%s" that is deprecated%s.', $class, $type, $verb, $use, self::$deprecated[$use]);
-            }
-            if (isset(self::$internal[$use]) && \strncmp($ns, $use, $len)) {
-                $deprecations[] = sprintf('The "%s" %s is considered internal%s. It may change without further notice. You should not use it from "%s".', $use, class_exists($use, false) ? 'class' : (interface_exists($use, false) ? 'interface' : 'trait'), self::$internal[$use], $class);
-            }
-        }
-
-        if (\trait_exists($class)) {
-            return $deprecations;
-        }
-
-        // Inherit @final and @internal annotations for methods
-        self::$finalMethods[$class] = array();
-        self::$internalMethods[$class] = array();
-        foreach ($parentAndOwnInterfaces as $use) {
-            foreach (array('finalMethods', 'internalMethods') as $property) {
-                if (isset(self::${$property}[$use])) {
-                    self::${$property}[$class] = self::${$property}[$class] ? self::${$property}[$use] + self::${$property}[$class] : self::${$property}[$use];
-                }
-            }
-        }
-
-        foreach ($refl->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $method) {
-            if ($method->class !== $class) {
-                continue;
-            }
-
-            if ($parent && isset(self::$finalMethods[$parent][$method->name])) {
-                list($declaringClass, $message) = self::$finalMethods[$parent][$method->name];
-                $deprecations[] = sprintf('The "%s::%s()" method is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $declaringClass, $method->name, $message, $class);
-            }
-
-            if (isset(self::$internalMethods[$class][$method->name])) {
-                list($declaringClass, $message) = self::$internalMethods[$class][$method->name];
-                if (\strncmp($ns, $declaringClass, $len)) {
-                    $deprecations[] = sprintf('The "%s::%s()" method is considered internal%s. It may change without further notice. You should not extend it from "%s".', $declaringClass, $method->name, $message, $class);
-                }
-            }
-
-            // Detect method annotations
-            if (false === $doc = $method->getDocComment()) {
-                continue;
-            }
-
-            foreach (array('final', 'internal') as $annotation) {
-                if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) {
-                    $message = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
-                    self::${$annotation.'Methods'}[$class][$method->name] = array($class, $message);
-                }
-            }
-        }
-
-        return $deprecations;
-    }
-
-    public function checkCase(\ReflectionClass $refl, $file, $class)
-    {
-        $real = explode('\\', $class.strrchr($file, '.'));
-        $tail = explode(\DIRECTORY_SEPARATOR, str_replace('/', \DIRECTORY_SEPARATOR, $file));
-
-        $i = \count($tail) - 1;
-        $j = \count($real) - 1;
-
-        while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
-            --$i;
-            --$j;
-        }
-
-        array_splice($tail, 0, $i + 1);
-
-        if (!$tail) {
-            return;
-        }
-
-        $tail = \DIRECTORY_SEPARATOR.implode(\DIRECTORY_SEPARATOR, $tail);
-        $tailLen = \strlen($tail);
-        $real = $refl->getFileName();
-
-        if (2 === self::$caseCheck) {
-            $real = $this->darwinRealpath($real);
-        }
-
-        if (0 === substr_compare($real, $tail, -$tailLen, $tailLen, true)
-            && 0 !== substr_compare($real, $tail, -$tailLen, $tailLen, false)
-        ) {
-            return array(substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1));
-        }
-    }
-
-    /**
-     * `realpath` on MacOSX doesn't normalize the case of characters.
-     */
-    private function darwinRealpath($real)
-    {
-        $i = 1 + strrpos($real, '/');
-        $file = substr($real, $i);
-        $real = substr($real, 0, $i);
-
-        if (isset(self::$darwinCache[$real])) {
-            $kDir = $real;
-        } else {
-            $kDir = strtolower($real);
-
-            if (isset(self::$darwinCache[$kDir])) {
-                $real = self::$darwinCache[$kDir][0];
+            // Don't trigger deprecations for classes in the same vendor
+            if (2 > $len = 1 + (\strpos($name, '\\') ?: \strpos($name, '_'))) {
+                $len = 0;
+                $ns = '';
            } else {
-                $dir = getcwd();
-                chdir($real);
-                $real = getcwd().'/';
-                chdir($dir);
-
-                $dir = $real;
-                $k = $kDir;
-                $i = \strlen($dir) - 1;
-                while (!isset(self::$darwinCache[$k])) {
-                    self::$darwinCache[$k] = array($dir, array());
-                    self::$darwinCache[$dir] = &self::$darwinCache[$k];
-
-                    while ('/' !== $dir[--$i]) {
-                    }
-                    $k = substr($k, 0, ++$i);
-                    $dir = substr($dir, 0, $i--);
-                }
+                $ns = \substr($name, 0, $len);
            }
-        }

-        $dirFiles = self::$darwinCache[$kDir][1];
-
-        if (isset($dirFiles[$file])) {
-            return $real .= $dirFiles[$file];
-        }
-
-        $kFile = strtolower($file);
-
-        if (!isset($dirFiles[$kFile])) {
-            foreach (scandir($real, 2) as $f) {
-                if ('.' !== $f[0]) {
-                    $dirFiles[$f] = $f;
-                    if ($f === $file) {
-                        $kFile = $k = $file;
-                    } elseif ($f !== $k = strtolower($f)) {
-                        $dirFiles[$k] = $f;
+            // Detect annotations on the class
+            if (false !== $doc = $refl->getDocComment()) {
+                foreach (array('final', 'deprecated', 'internal') as $annotation) {
+                    if (false !== \strpos($doc, $annotation) && preg_match('#\n \* @'.$annotation.'(?:( .+?)\.?)?\r?\n \*(?: @|/$)#s', $doc, $notice)) {
+                        self::${$annotation}[$name] = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
+                    }
+                }
+            }
+
+            $parentAndTraits = \class_uses($name, false);
+            if ($parent = \get_parent_class($class)) {
+                $parentAndTraits[] = $parent;
+
+                if (!isset(self::$checkedClasses[$parent])) {
+                    $this->checkClass($parent);
+                }
+
+                if (isset(self::$final[$parent])) {
+                    @trigger_error(sprintf('The "%s" class is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $parent, self::$final[$parent], $name), E_USER_DEPRECATED);
+                }
+            }
+
+            // Detect if the parent is annotated
+            foreach ($parentAndTraits + $this->getOwnInterfaces($name, $parent) as $use) {
+                if (!isset(self::$checkedClasses[$use])) {
+                    $this->checkClass($use);
+                }
+                if (isset(self::$deprecated[$use]) && \strncmp($ns, $use, $len)) {
+                    $type = class_exists($name, false) ? 'class' : (interface_exists($name, false) ? 'interface' : 'trait');
+                    $verb = class_exists($use, false) || interface_exists($name, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');
+
+                    @trigger_error(sprintf('The "%s" %s %s "%s" that is deprecated%s.', $name, $type, $verb, $use, self::$deprecated[$use]), E_USER_DEPRECATED);
+                }
+                if (isset(self::$internal[$use]) && \strncmp($ns, $use, $len)) {
+                    @trigger_error(sprintf('The "%s" %s is considered internal%s. It may change without further notice. You should not use it from "%s".', $use, class_exists($use, false) ? 'class' : (interface_exists($use, false) ? 'interface' : 'trait'), self::$internal[$use], $name), E_USER_DEPRECATED);
+                }
+            }
+
+            // Inherit @final and @internal annotations for methods
+            self::$finalMethods[$name] = array();
+            self::$internalMethods[$name] = array();
+            foreach ($parentAndTraits as $use) {
+                foreach (array('finalMethods', 'internalMethods') as $property) {
+                    if (isset(self::${$property}[$use])) {
+                        self::${$property}[$name] = self::${$property}[$name] ? self::${$property}[$use] + self::${$property}[$name] : self::${$property}[$use];
+                    }
+                }
+            }
+
+            $isClass = \class_exists($name, false);
+            foreach ($refl->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $method) {
+                if ($method->class !== $name) {
+                    continue;
+                }
+
+                // Method from a trait
+                if ($method->getFilename() !== $refl->getFileName()) {
+                    continue;
+                }
+
+                if ($isClass && $parent && isset(self::$finalMethods[$parent][$method->name])) {
+                    list($declaringClass, $message) = self::$finalMethods[$parent][$method->name];
+                    @trigger_error(sprintf('The "%s::%s()" method is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $declaringClass, $method->name, $message, $name), E_USER_DEPRECATED);
+                }
+
+                foreach ($parentAndTraits as $use) {
+                    if (isset(self::$internalMethods[$use][$method->name])) {
+                        list($declaringClass, $message) = self::$internalMethods[$use][$method->name];
+                        if (\strncmp($ns, $declaringClass, $len)) {
+                            @trigger_error(sprintf('The "%s::%s()" method is considered internal%s. It may change without further notice. You should not extend it from "%s".', $declaringClass, $method->name, $message, $name), E_USER_DEPRECATED);
+                        }
+                    }
+                }
+
+                // Detect method annotations
+                if (false === $doc = $method->getDocComment()) {
+                    continue;
+                }
+
+                foreach (array('final', 'internal') as $annotation) {
+                    if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) {
+                        $message = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
+                        self::${$annotation.'Methods'}[$name][$method->name] = array($name, $message);
                    }
                }
            }
-            self::$darwinCache[$kDir][1] = $dirFiles;
        }

-        return $real .= $dirFiles[$kFile];
+        if ($file) {
+            if (!$exists) {
+                if (false !== strpos($class, '/')) {
+                    throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
+                }
+
+                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
+            }
+            if (self::$caseCheck) {
+                $real = explode('\\', $class.strrchr($file, '.'));
+                $tail = explode(\DIRECTORY_SEPARATOR, str_replace('/', \DIRECTORY_SEPARATOR, $file));
+
+                $i = \count($tail) - 1;
+                $j = \count($real) - 1;
+
+                while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
+                    --$i;
+                    --$j;
+                }
+
+                array_splice($tail, 0, $i + 1);
+            }
+            if (self::$caseCheck && $tail) {
+                $tail = \DIRECTORY_SEPARATOR.implode(\DIRECTORY_SEPARATOR, $tail);
+                $tailLen = \strlen($tail);
+                $real = $refl->getFileName();
+
+                if (2 === self::$caseCheck) {
+                    // realpath() on MacOSX doesn't normalize the case of characters
+
+                    $i = 1 + strrpos($real, '/');
+                    $file = substr($real, $i);
+                    $real = substr($real, 0, $i);
+
+                    if (isset(self::$darwinCache[$real])) {
+                        $kDir = $real;
+                    } else {
+                        $kDir = strtolower($real);
+
+                        if (isset(self::$darwinCache[$kDir])) {
+                            $real = self::$darwinCache[$kDir][0];
+                        } else {
+                            $dir = getcwd();
+                            chdir($real);
+                            $real = getcwd().'/';
+                            chdir($dir);
+
+                            $dir = $real;
+                            $k = $kDir;
+                            $i = \strlen($dir) - 1;
+                            while (!isset(self::$darwinCache[$k])) {
+                                self::$darwinCache[$k] = array($dir, array());
+                                self::$darwinCache[$dir] = &self::$darwinCache[$k];
+
+                                while ('/' !== $dir[--$i]) {
+                                }
+                                $k = substr($k, 0, ++$i);
+                                $dir = substr($dir, 0, $i--);
+                            }
+                        }
+                    }
+
+                    $dirFiles = self::$darwinCache[$kDir][1];
+
+                    if (isset($dirFiles[$file])) {
+                        $kFile = $file;
+                    } else {
+                        $kFile = strtolower($file);
+
+                        if (!isset($dirFiles[$kFile])) {
+                            foreach (scandir($real, 2) as $f) {
+                                if ('.' !== $f[0]) {
+                                    $dirFiles[$f] = $f;
+                                    if ($f === $file) {
+                                        $kFile = $k = $file;
+                                    } elseif ($f !== $k = strtolower($f)) {
+                                        $dirFiles[$k] = $f;
+                                    }
+                                }
+                            }
+                            self::$darwinCache[$kDir][1] = $dirFiles;
+                        }
+                    }
+
+                    $real .= $dirFiles[$kFile];
+                }
+
+                if (0 === substr_compare($real, $tail, -$tailLen, $tailLen, true)
+                  && 0 !== substr_compare($real, $tail, -$tailLen, $tailLen, false)
+                ) {
+                    throw new \RuntimeException(sprintf('Case mismatch between class and real file names: "%s" vs "%s" in "%s".', substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1)));
+                }
+            }
+        }
    }

    /**
--- a/Exception/FatalThrowableError.php
+++ b/Exception/FatalThrowableError.php
@@ -18,22 +18,21 @@ namespace Symfony\Component\Debug\Exception;
 */
 class FatalThrowableError extends FatalErrorException
 {
-    private $originalClassName;
-
    public function __construct(\Throwable $e)
    {
-        $this->originalClassName = \get_class($e);
-
        if ($e instanceof \ParseError) {
+            $message = 'Parse error: '.$e->getMessage();
            $severity = E_PARSE;
        } elseif ($e instanceof \TypeError) {
+            $message = 'Type error: '.$e->getMessage();
            $severity = E_RECOVERABLE_ERROR;
        } else {
+            $message = $e->getMessage();
            $severity = E_ERROR;
        }

        \ErrorException::__construct(
-            $e->getMessage(),
+            $message,
            $e->getCode(),
            $severity,
            $e->getFile(),
@@ -43,9 +42,4 @@ class FatalThrowableError extends FatalErrorException

        $this->setTrace($e->getTrace());
    }
-
-    public function getOriginalClassName(): string
-    {
-        return $this->originalClassName;
-    }
 }
--- a/Exception/FlattenException.php
+++ b/Exception/FlattenException.php
@@ -15,7 +15,7 @@ use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;

 /**
- * FlattenException wraps a PHP Error or Exception to be able to serialize it.
+ * FlattenException wraps a PHP Exception to be able to serialize it.
 *
 * Basically, this class removes all objects from the trace.
 *
@@ -34,11 +34,6 @@ class FlattenException
    private $line;

    public static function create(\Exception $exception, $statusCode = null, array $headers = array())
-    {
-        return static::createFromThrowable($exception, $statusCode, $headers);
-    }
-
-    public static function createFromThrowable(\Throwable $exception, ?int $statusCode = null, array $headers = array()): self
    {
        $e = new static();
        $e->setMessage($exception->getMessage());
@@ -57,15 +52,17 @@ class FlattenException

        $e->setStatusCode($statusCode);
        $e->setHeaders($headers);
-        $e->setTraceFromThrowable($exception);
-        $e->setClass($exception instanceof FatalThrowableError ? $exception->getOriginalClassName() : \get_class($exception));
+        $e->setTraceFromException($exception);
+        $e->setClass(\get_class($exception));
        $e->setFile($exception->getFile());
        $e->setLine($exception->getLine());

        $previous = $exception->getPrevious();

-        if ($previous instanceof \Throwable) {
-            $e->setPrevious(static::createFromThrowable($previous));
+        if ($previous instanceof \Exception) {
+            $e->setPrevious(static::create($previous));
+        } elseif ($previous instanceof \Throwable) {
+            $e->setPrevious(static::create(new FatalThrowableError($previous)));
        }

        return $e;
@@ -181,19 +178,9 @@ class FlattenException
        return $this->trace;
    }

-    /**
-     * @deprecated since 4.1, use {@see setTraceFromThrowable()} instead.
-     */
    public function setTraceFromException(\Exception $exception)
    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use "setTraceFromThrowable()" instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->setTraceFromThrowable($exception);
-    }
-
-    public function setTraceFromThrowable(\Throwable $throwable): void
-    {
-        $this->setTrace($throwable->getTrace(), $throwable->getFile(), $throwable->getLine());
+        $this->setTrace($exception->getTrace(), $exception->getFile(), $exception->getLine());
    }

    public function setTrace($trace, $file, $line)
--- a/Tests/DebugClassLoaderTest.php
+++ b/Tests/DebugClassLoaderTest.php
@@ -220,21 +220,24 @@ class DebugClassLoaderTest extends TestCase

    public function testExtendedFinalMethod()
    {
-        $deprecations = array();
-        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
-        $e = error_reporting(E_USER_DEPRECATED);
+        set_error_handler(function () { return false; });
+        $e = error_reporting(0);
+        trigger_error('', E_USER_NOTICE);

        class_exists(__NAMESPACE__.'\\Fixtures\\ExtendedFinalMethod', true);

        error_reporting($e);
        restore_error_handler();

+        $lastError = error_get_last();
+        unset($lastError['file'], $lastError['line']);
+
        $xError = array(
-            'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
-            'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod2()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
+            'type' => E_USER_DEPRECATED,
+            'message' => 'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
        );

-        $this->assertSame($xError, $deprecations);
+        $this->assertSame($xError, $lastError);
    }

    public function testExtendedDeprecatedMethodDoesntTriggerAnyNotice()
@@ -266,26 +269,12 @@ class DebugClassLoaderTest extends TestCase
        restore_error_handler();

        $this->assertSame($deprecations, array(
-            'The "Symfony\Component\Debug\Tests\Fixtures\InternalInterface" interface is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass" class is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalInterface" interface is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
            'The "Symfony\Component\Debug\Tests\Fixtures\InternalTrait" trait is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
-            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass::internalMethod()" method is considered internal. It may change without further notice. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalTrait2::internalMethod()" method is considered internal. It may change without further notice. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
        ));
    }
-
-    public function testUseTraitWithInternalMethod()
-    {
-        $deprecations = array();
-        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
-        $e = error_reporting(E_USER_DEPRECATED);
-
-        class_exists('Test\\'.__NAMESPACE__.'\\UseTraitWithInternalMethod', true);
-
-        error_reporting($e);
-        restore_error_handler();
-
-        $this->assertSame(array(), $deprecations);
-    }
 }

 class ClassLoader
@@ -339,8 +328,6 @@ class ClassLoader
            }');
        } elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternalsParent' === $class) {
            eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternalsParent extends \\'.__NAMESPACE__.'\Fixtures\InternalClass implements \\'.__NAMESPACE__.'\Fixtures\InternalInterface { }');
-        } elseif ('Test\\'.__NAMESPACE__.'\UseTraitWithInternalMethod' === $class) {
-            eval('namespace Test\\'.__NAMESPACE__.'; class UseTraitWithInternalMethod { use \\'.__NAMESPACE__.'\Fixtures\TraitWithInternalMethod; }');
        }
    }
 }
--- a/Tests/Exception/FlattenExceptionTest.php
+++ b/Tests/Exception/FlattenExceptionTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Debug\Tests\Exception;

 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -40,12 +39,6 @@ class FlattenExceptionTest extends TestCase
        $flattened = FlattenException::create(new \RuntimeException());
        $this->assertEquals('500', $flattened->getStatusCode());

-        $flattened = FlattenException::createFromThrowable(new \DivisionByZeroError(), 403);
-        $this->assertEquals('403', $flattened->getStatusCode());
-
-        $flattened = FlattenException::createFromThrowable(new \DivisionByZeroError());
-        $this->assertEquals('500', $flattened->getStatusCode());
-
        $flattened = FlattenException::create(new NotFoundHttpException());
        $this->assertEquals('404', $flattened->getStatusCode());

@@ -118,10 +111,10 @@ class FlattenExceptionTest extends TestCase
    /**
     * @dataProvider flattenDataProvider
     */
-    public function testFlattenHttpException(\Throwable $exception)
+    public function testFlattenHttpException(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
-        $flattened2 = FlattenException::createFromThrowable($exception);
+        $flattened = FlattenException::create($exception);
+        $flattened2 = FlattenException::create($exception);

        $flattened->setPrevious($flattened2);

@@ -130,33 +123,13 @@ class FlattenExceptionTest extends TestCase
        $this->assertInstanceOf($flattened->getClass(), $exception, 'The class is set to the class of the original exception');
    }

-    public function testWrappedThrowable()
-    {
-        $exception = new FatalThrowableError(new \DivisionByZeroError('Ouch', 42));
-        $flattened = FlattenException::create($exception);
-
-        $this->assertSame('Ouch', $flattened->getMessage(), 'The message is copied from the original error.');
-        $this->assertSame(42, $flattened->getCode(), 'The code is copied from the original error.');
-        $this->assertSame('DivisionByZeroError', $flattened->getClass(), 'The class is set to the class of the original error');
-    }
-
-    public function testThrowable()
-    {
-        $error = new \DivisionByZeroError('Ouch', 42);
-        $flattened = FlattenException::createFromThrowable($error);
-
-        $this->assertSame('Ouch', $flattened->getMessage(), 'The message is copied from the original error.');
-        $this->assertSame(42, $flattened->getCode(), 'The code is copied from the original error.');
-        $this->assertSame('DivisionByZeroError', $flattened->getClass(), 'The class is set to the class of the original error');
-    }
-
    /**
     * @dataProvider flattenDataProvider
     */
-    public function testPrevious(\Throwable $exception)
+    public function testPrevious(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
-        $flattened2 = FlattenException::createFromThrowable($exception);
+        $flattened = FlattenException::create($exception);
+        $flattened2 = FlattenException::create($exception);

        $flattened->setPrevious($flattened2);

@@ -171,41 +144,41 @@ class FlattenExceptionTest extends TestCase

        $flattened = FlattenException::create($exception)->getPrevious();

-        $this->assertEquals($flattened->getMessage(), 'Oh noes!', 'The message is copied from the original exception.');
+        $this->assertEquals($flattened->getMessage(), 'Parse error: Oh noes!', 'The message is copied from the original exception.');
        $this->assertEquals($flattened->getCode(), 42, 'The code is copied from the original exception.');
-        $this->assertEquals($flattened->getClass(), 'ParseError', 'The class is set to the class of the original exception');
+        $this->assertEquals($flattened->getClass(), 'Symfony\Component\Debug\Exception\FatalThrowableError', 'The class is set to the class of the original exception');
    }

    /**
     * @dataProvider flattenDataProvider
     */
-    public function testLine(\Throwable $exception)
+    public function testLine(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
+        $flattened = FlattenException::create($exception);
        $this->assertSame($exception->getLine(), $flattened->getLine());
    }

    /**
     * @dataProvider flattenDataProvider
     */
-    public function testFile(\Throwable $exception)
+    public function testFile(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
+        $flattened = FlattenException::create($exception);
        $this->assertSame($exception->getFile(), $flattened->getFile());
    }

    /**
     * @dataProvider flattenDataProvider
     */
-    public function testToArray(\Throwable $exception, string $expectedClass)
+    public function testToArray(\Exception $exception)
    {
-        $flattened = FlattenException::createFromThrowable($exception);
+        $flattened = FlattenException::create($exception);
        $flattened->setTrace(array(), 'foo.php', 123);

        $this->assertEquals(array(
            array(
                'message' => 'test',
-                'class' => $expectedClass,
+                'class' => 'Exception',
                'trace' => array(array(
                    'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '', 'file' => 'foo.php', 'line' => 123,
                    'args' => array(),
@@ -214,24 +187,10 @@ class FlattenExceptionTest extends TestCase
        ), $flattened->toArray());
    }

-    public function testCreate()
-    {
-        $exception = new NotFoundHttpException(
-            'test',
-            new \RuntimeException('previous', 123)
-        );
-
-        $this->assertSame(
-            FlattenException::createFromThrowable($exception)->toArray(),
-            FlattenException::create($exception)->toArray()
-        );
-    }
-
    public function flattenDataProvider()
    {
        return array(
-            array(new \Exception('test', 123), 'Exception'),
-            array(new \Error('test', 123), 'Error'),
+            array(new \Exception('test', 123)),
        );
    }

--- a/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ b/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -64,10 +64,10 @@ class UndefinedMethodFatalErrorHandlerTest extends TestCase
            ),
            array(
                array(
-                    'type' => 1,
-                    'message' => 'Call to undefined method class@anonymous::test()',
-                    'file' => '/home/possum/work/symfony/test.php',
-                    'line' => 11,
+                  'type' => 1,
+                  'message' => 'Call to undefined method class@anonymous::test()',
+                  'file' => '/home/possum/work/symfony/test.php',
+                  'line' => 11,
                ),
                'Attempted to call an undefined method named "test" of class "class@anonymous".',
            ),
--- a/Tests/Fixtures/ExtendedFinalMethod.php
+++ b/Tests/Fixtures/ExtendedFinalMethod.php
@@ -4,8 +4,6 @@ namespace Symfony\Component\Debug\Tests\Fixtures;

 class ExtendedFinalMethod extends FinalMethod
 {
-    use FinalMethod2Trait;
-
    /**
     * {@inheritdoc}
     */
--- a/Tests/Fixtures/FinalMethod.php
+++ b/Tests/Fixtures/FinalMethod.php
@@ -11,13 +11,6 @@ class FinalMethod
    {
    }

-    /**
-     * @final
-     */
-    public function finalMethod2()
-    {
-    }
-
    public function anotherMethod()
    {
    }
--- a/Tests/Fixtures/FinalMethod2Trait.php
+++ b/Tests/Fixtures/FinalMethod2Trait.php
@@ -1,10 +0,0 @@
-<?php
-
-namespace Symfony\Component\Debug\Tests\Fixtures;
-
-trait FinalMethod2Trait
-{
-    public function finalMethod2()
-    {
-    }
-}
--- a/Tests/Fixtures/TraitWithInternalMethod.php
+++ b/Tests/Fixtures/TraitWithInternalMethod.php
@@ -1,13 +0,0 @@
-<?php
-
-namespace Symfony\Component\Debug\Tests\Fixtures;
-
-trait TraitWithInternalMethod
-{
-    /**
-     * @internal
-     */
-    public function foo()
-    {
-    }
-}
--- a/Tests/phpt/debug_class_loader.phpt
+++ b/Tests/phpt/debug_class_loader.phpt
@@ -24,4 +24,3 @@ class_exists(ExtendedFinalMethod::class);
 ?>
 --EXPECTF--
 The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
-The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod2()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
--- a/Tests/phpt/decorate_exception_hander.phpt
+++ b/Tests/phpt/decorate_exception_hander.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test catching fatal errors when handlers are nested
--INI--
-display_errors=0
 --FILE--
 <?php

@@ -26,6 +24,7 @@ if (true) {

 ?>
 --EXPECTF--
+Fatal error: Class 'Symfony\Component\Debug\missing' not found in %s on line %d
 object(Symfony\Component\Debug\Exception\ClassNotFoundException)#%d (8) {
  ["message":protected]=>
  string(131) "Attempted to load class "missing" from namespace "Symfony\Component\Debug".
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "4.1-dev"
+            "dev-master": "4.0-dev"
        }
    }
 }