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:24:48 +02:00
29 changed files with 120 additions and 408 deletions
--- a/BufferingLogger.php
+++ b/BufferingLogger.php
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Debug;
-
-use Psr\Log\AbstractLogger;
-
-/**
- * A buffering logger that stacks logs for later.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class BufferingLogger extends AbstractLogger
-{
-    private $logs = array();
-
-    public function log($level, $message, array $context = array())
-    {
-        $this->logs[] = array($level, $message, $context);
-    }
-
-    public function cleanLogs()
-    {
-        $logs = $this->logs;
-        $this->logs = array();
-
-        return $logs;
-    }
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,6 @@
 CHANGELOG
 =========

-2.8.0
-----
-
-* added BufferingLogger for errors that happen before a proper logger is configured
-* allow throwing from `__toString()` with `return trigger_error($e, E_USER_ERROR);`
-* deprecate ExceptionHandler::createResponse
-
 2.7.0
 -----

--- a/Debug.php
+++ b/Debug.php
@@ -23,7 +23,10 @@ class Debug
    /**
     * Enables the debug tools.
     *
-     * This method registers an error handler, an exception handler and a special class loader.
+     * This method registers an error handler and an exception handler.
+     *
+     * If the Symfony ClassLoader component is available, a special
+     * class loader is also registered.
     *
     * @param int  $errorReportingLevel The level of error reporting you want
     * @param bool $displayErrors       Whether to display errors (for development) or just log them (for production)
@@ -42,17 +45,16 @@ class Debug
            error_reporting(-1);
        }

-        if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
+        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);
        }
-        if ($displayErrors) {
-            ErrorHandler::register(new ErrorHandler(new BufferingLogger()));
-        } else {
-            ErrorHandler::register()->throwAt(0, true);
+        $handler = ErrorHandler::register();
+        if (!$displayErrors) {
+            $handler->throwAt(0, true);
        }

        DebugClassLoader::enable();
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -38,7 +38,7 @@ class DebugClassLoader
     */
    public function __construct($classLoader)
    {
-        $this->wasFinder = \is_object($classLoader) && method_exists($classLoader, 'findFile');
+        $this->wasFinder = is_object($classLoader) && method_exists($classLoader, 'findFile');

        if ($this->wasFinder) {
            @trigger_error('The '.__METHOD__.' method will no longer support receiving an object into its $classLoader argument in 3.0.', E_USER_DEPRECATED);
@@ -46,12 +46,12 @@ class DebugClassLoader
            $this->isFinder = true;
        } else {
            $this->classLoader = $classLoader;
-            $this->isFinder = \is_array($classLoader) && method_exists($classLoader[0], 'findFile');
+            $this->isFinder = is_array($classLoader) && method_exists($classLoader[0], 'findFile');
        }

        if (!isset(self::$caseCheck)) {
-            $file = file_exists(__FILE__) ? __FILE__ : rtrim(realpath('.'), \DIRECTORY_SEPARATOR);
-            $i = strrpos($file, \DIRECTORY_SEPARATOR);
+            $file = file_exists(__FILE__) ? __FILE__ : rtrim(realpath('.'), DIRECTORY_SEPARATOR);
+            $i = strrpos($file, DIRECTORY_SEPARATOR);
            $dir = substr($file, 0, 1 + $i);
            $file = substr($file, 1 + $i);
            $test = strtoupper($file) === $file ? strtolower($file) : strtoupper($file);
@@ -60,7 +60,7 @@ class DebugClassLoader
            if (false === $test || false === $i) {
                // filesystem is case sensitive
                self::$caseCheck = 0;
-            } elseif (substr($test, -\strlen($file)) === $file) {
+            } elseif (substr($test, -strlen($file)) === $file) {
                // filesystem is case insensitive and realpath() normalizes the case of characters
                self::$caseCheck = 1;
            } elseif (false !== stripos(PHP_OS, 'darwin')) {
@@ -92,7 +92,7 @@ class DebugClassLoader
        class_exists('Symfony\Component\Debug\ErrorHandler');
        class_exists('Psr\Log\LogLevel');

-        if (!\is_array($functions = spl_autoload_functions())) {
+        if (!is_array($functions = spl_autoload_functions())) {
            return;
        }

@@ -101,7 +101,7 @@ class DebugClassLoader
        }

        foreach ($functions as $function) {
-            if (!\is_array($function) || !$function[0] instanceof self) {
+            if (!is_array($function) || !$function[0] instanceof self) {
                $function = array(new static($function), 'loadClass');
            }

@@ -114,7 +114,7 @@ class DebugClassLoader
     */
    public static function disable()
    {
-        if (!\is_array($functions = spl_autoload_functions())) {
+        if (!is_array($functions = spl_autoload_functions())) {
            return;
        }

@@ -123,7 +123,7 @@ class DebugClassLoader
        }

        foreach ($functions as $function) {
-            if (\is_array($function) && $function[0] instanceof self) {
+            if (is_array($function) && $function[0] instanceof self) {
                $function = $function[0]->getClassLoader();
            }

@@ -169,7 +169,7 @@ class DebugClassLoader
                    require $file;
                }
            } else {
-                \call_user_func($this->classLoader, $class);
+                call_user_func($this->classLoader, $class);
                $file = false;
            }
        } catch (\Exception $e) {
@@ -184,7 +184,7 @@ class DebugClassLoader

        ErrorHandler::unstackErrors();

-        $exists = class_exists($class, false) || interface_exists($class, false) || (\function_exists('trait_exists') && trait_exists($class, false));
+        $exists = class_exists($class, false) || interface_exists($class, false) || (function_exists('trait_exists') && trait_exists($class, false));

        if ($class && '\\' === $class[0]) {
            $class = substr($class, 1);
@@ -198,7 +198,7 @@ class DebugClassLoader
                throw new \RuntimeException(sprintf('Case mismatch between loaded and declared class names: %s vs %s', $class, $name));
            }

-            if (\in_array(strtolower($refl->getShortName()), self::$php7Reserved)) {
+            if (in_array(strtolower($refl->getShortName()), self::$php7Reserved)) {
                @trigger_error(sprintf('%s uses a reserved class name (%s) that will break on PHP 7 and higher', $name, $refl->getShortName()), E_USER_DEPRECATED);
            } elseif (preg_match('#\n \* @deprecated (.*?)\r?\n \*(?: @|/$)#s', $refl->getDocComment(), $notice)) {
                self::$deprecated[$name] = preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]);
@@ -216,26 +216,9 @@ class DebugClassLoader
                        @trigger_error(sprintf('The %s class extends %s that is deprecated %s', $name, $parent, self::$deprecated[$parent]), E_USER_DEPRECATED);
                    }

-                    $parentInterfaces = array();
-                    $deprecatedInterfaces = array();
-                    if ($parent) {
-                        foreach (class_implements($parent) as $interface) {
-                            $parentInterfaces[$interface] = 1;
-                        }
-                    }
-
-                    foreach ($refl->getInterfaceNames() as $interface) {
-                        if (isset(self::$deprecated[$interface]) && strncmp($ns, $interface, $len)) {
-                            $deprecatedInterfaces[] = $interface;
-                        }
-                        foreach (class_implements($interface) as $interface) {
-                            $parentInterfaces[$interface] = 1;
-                        }
-                    }
-
-                    foreach ($deprecatedInterfaces as $interface) {
-                        if (!isset($parentInterfaces[$interface])) {
-                            @trigger_error(sprintf('The %s %s %s that is deprecated %s', $name, $refl->isInterface() ? 'interface extends' : 'class implements', $interface, self::$deprecated[$interface]), E_USER_DEPRECATED);
+                    foreach (class_implements($class) as $interface) {
+                        if (isset(self::$deprecated[$interface]) && strncmp($ns, $interface, $len) && !is_subclass_of($parent, $interface)) {
+                            @trigger_error(sprintf('The %s %s %s that is deprecated %s', $name, interface_exists($class) ? 'interface extends' : 'class implements', $interface, self::$deprecated[$interface]), E_USER_DEPRECATED);
                        }
                    }
                }
@@ -252,10 +235,10 @@ class DebugClassLoader
            }
            if (self::$caseCheck) {
                $real = explode('\\', $class.strrchr($file, '.'));
-                $tail = explode(\DIRECTORY_SEPARATOR, str_replace('/', \DIRECTORY_SEPARATOR, $file));
+                $tail = explode(DIRECTORY_SEPARATOR, str_replace('/', DIRECTORY_SEPARATOR, $file));

-                $i = \count($tail) - 1;
-                $j = \count($real) - 1;
+                $i = count($tail) - 1;
+                $j = count($real) - 1;

                while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
                    --$i;
@@ -265,8 +248,8 @@ class DebugClassLoader
                array_splice($tail, 0, $i + 1);
            }
            if (self::$caseCheck && $tail) {
-                $tail = \DIRECTORY_SEPARATOR.implode(\DIRECTORY_SEPARATOR, $tail);
-                $tailLen = \strlen($tail);
+                $tail = DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $tail);
+                $tailLen = strlen($tail);
                $real = $refl->getFileName();

                if (2 === self::$caseCheck) {
@@ -291,7 +274,7 @@ class DebugClassLoader

                            $dir = $real;
                            $k = $kDir;
-                            $i = \strlen($dir) - 1;
+                            $i = strlen($dir) - 1;
                            while (!isset(self::$darwinCache[$k])) {
                                self::$darwinCache[$k] = array($dir, array());
                                self::$darwinCache[$dir] = &self::$darwinCache[$k];
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -11,16 +11,16 @@

 namespace Symfony\Component\Debug;

-use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Debug\Exception\ContextErrorException;
 use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
-use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
-use Symfony\Component\Debug\FatalErrorHandler\FatalErrorHandlerInterface;
 use Symfony\Component\Debug\FatalErrorHandler\UndefinedFunctionFatalErrorHandler;
 use Symfony\Component\Debug\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
+use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
+use Symfony\Component\Debug\FatalErrorHandler\FatalErrorHandlerInterface;

 /**
 * A generic ErrorHandler for the PHP engine.
@@ -97,12 +97,10 @@ class ErrorHandler
    private $isRecursive = 0;
    private $isRoot = false;
    private $exceptionHandler;
-    private $bootstrappingLogger;

    private static $reservedMemory;
    private static $stackedErrors = array();
    private static $stackedErrorLevels = array();
-    private static $toStringException = null;
    private static $exitCode = 0;

    /**
@@ -115,7 +113,7 @@ class ErrorHandler
    /**
     * Registers the error handler.
     *
-     * @param self|int|null $handler The handler to register, or @deprecated (since version 2.6, to be removed in 3.0) bit field of thrown levels
+     * @param self|null|int $handler The handler to register, or @deprecated (since version 2.6, to be removed in 3.0) bit field of thrown levels
     * @param bool          $replace Whether to replace or not any existing handler
     *
     * @return self The registered error handler
@@ -145,17 +143,17 @@ class ErrorHandler
            $handler->isRoot = true;
        }

-        if ($handlerIsNew && \is_array($prev) && $prev[0] instanceof self) {
+        if ($handlerIsNew && is_array($prev) && $prev[0] instanceof self) {
            $handler = $prev[0];
            $replace = false;
        }
        if (!$replace && $prev) {
            restore_error_handler();
-            $handlerIsRegistered = \is_array($prev) && $handler === $prev[0];
+            $handlerIsRegistered = is_array($prev) && $handler === $prev[0];
        } else {
            $handlerIsRegistered = true;
        }
-        if (\is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] instanceof self) {
+        if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] instanceof self) {
            restore_exception_handler();
            if (!$handlerIsRegistered) {
                $handler = $prev[0];
@@ -174,14 +172,6 @@ class ErrorHandler
        return $handler;
    }

-    public function __construct(BufferingLogger $bootstrappingLogger = null)
-    {
-        if ($bootstrappingLogger) {
-            $this->bootstrappingLogger = $bootstrappingLogger;
-            $this->setDefaultLogger($bootstrappingLogger);
-        }
-    }
-
    /**
     * Sets a logger to non assigned errors levels.
     *
@@ -193,9 +183,9 @@ class ErrorHandler
    {
        $loggers = array();

-        if (\is_array($levels)) {
+        if (is_array($levels)) {
            foreach ($levels as $type => $logLevel) {
-                if (empty($this->loggers[$type][0]) || $replace || $this->loggers[$type][0] === $this->bootstrappingLogger) {
+                if (empty($this->loggers[$type][0]) || $replace) {
                    $loggers[$type] = array($logger, $logLevel);
                }
            }
@@ -204,7 +194,7 @@ class ErrorHandler
                $levels = E_ALL | E_STRICT;
            }
            foreach ($this->loggers as $type => $log) {
-                if (($type & $levels) && (empty($log[0]) || $replace || $log[0] === $this->bootstrappingLogger)) {
+                if (($type & $levels) && (empty($log[0]) || $replace)) {
                    $log[0] = $logger;
                    $loggers[$type] = $log;
                }
@@ -227,13 +217,12 @@ class ErrorHandler
    {
        $prevLogged = $this->loggedErrors;
        $prev = $this->loggers;
-        $flush = array();

        foreach ($loggers as $type => $log) {
            if (!isset($prev[$type])) {
                throw new \InvalidArgumentException('Unknown error type: '.$type);
            }
-            if (!\is_array($log)) {
+            if (!is_array($log)) {
                $log = array($log);
            } elseif (!array_key_exists(0, $log)) {
                throw new \InvalidArgumentException('No logger provided');
@@ -246,24 +235,9 @@ class ErrorHandler
                throw new \InvalidArgumentException('Invalid logger provided');
            }
            $this->loggers[$type] = $log + $prev[$type];
-
-            if ($this->bootstrappingLogger && $prev[$type][0] === $this->bootstrappingLogger) {
-                $flush[$type] = $type;
-            }
        }
        $this->reRegister($prevLogged | $this->thrownErrors);

-        if ($flush) {
-            foreach ($this->bootstrappingLogger->cleanLogs() as $log) {
-                $type = $log[2]['type'];
-                if (!isset($flush[$type])) {
-                    $this->bootstrappingLogger->log($log[0], $log[1], $log[2]);
-                } elseif ($this->loggers[$type][0]) {
-                    $this->loggers[$type][0]->log($this->loggers[$type][1], $log[1], $log[2]);
-                }
-            }
-        }
-
        return $prev;
    }

@@ -278,7 +252,7 @@ class ErrorHandler
     */
    public function setExceptionHandler($handler)
    {
-        if (null !== $handler && !\is_callable($handler)) {
+        if (null !== $handler && !is_callable($handler)) {
            throw new \LogicException('The exception handler must be a valid PHP callable.');
        }
        $prev = $this->exceptionHandler;
@@ -374,7 +348,7 @@ class ErrorHandler
    {
        if ($prev !== $this->thrownErrors | $this->loggedErrors) {
            $handler = set_error_handler('var_dump');
-            $handler = \is_array($handler) ? $handler[0] : null;
+            $handler = is_array($handler) ? $handler[0] : null;
            restore_error_handler();
            if ($handler === $this) {
                restore_error_handler();
@@ -415,7 +389,7 @@ class ErrorHandler
        }
        $scope = $this->scopedErrors & $type;

-        if (4 < $numArgs = \func_num_args()) {
+        if (4 < $numArgs = func_num_args()) {
            $context = $scope ? (func_get_arg(4) ?: array()) : array();
            $backtrace = 5 < $numArgs ? func_get_arg(5) : null; // defined on HHVM
        } else {
@@ -439,10 +413,7 @@ class ErrorHandler
        }

        if ($throw) {
-            if (null !== self::$toStringException) {
-                $throw = self::$toStringException;
-                self::$toStringException = null;
-            } elseif ($scope && class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
+            if ($scope && class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
                // Checking for class existence is a work around for https://bugs.php.net/42098
                $throw = new ContextErrorException($this->levels[$type].': '.$message, 0, $type, $file, $line, $context);
            } else {
@@ -457,47 +428,6 @@ class ErrorHandler
                $throw->errorHandlerCanary = new ErrorHandlerCanary();
            }

-            if (E_USER_ERROR & $type) {
-                $backtrace = $backtrace ?: $throw->getTrace();
-
-                for ($i = 1; isset($backtrace[$i]); ++$i) {
-                    if (isset($backtrace[$i]['function'], $backtrace[$i]['type'], $backtrace[$i - 1]['function'])
-                        && '__toString' === $backtrace[$i]['function']
-                        && '->' === $backtrace[$i]['type']
-                        && !isset($backtrace[$i - 1]['class'])
-                        && ('trigger_error' === $backtrace[$i - 1]['function'] || 'user_error' === $backtrace[$i - 1]['function'])
-                    ) {
-                        // Here, we know trigger_error() has been called from __toString().
-                        // HHVM is fine with throwing from __toString() but PHP triggers a fatal error instead.
-                        // A small convention allows working around the limitation:
-                        // given a caught $e exception in __toString(), quitting the method with
-                        // `return trigger_error($e, E_USER_ERROR);` allows this error handler
-                        // to make $e get through the __toString() barrier.
-
-                        foreach ($context as $e) {
-                            if (($e instanceof \Exception || $e instanceof \Throwable) && $e->__toString() === $message) {
-                                if (1 === $i) {
-                                    // On HHVM
-                                    $throw = $e;
-                                    break;
-                                }
-                                self::$toStringException = $e;
-
-                                return true;
-                            }
-                        }
-
-                        if (1 < $i) {
-                            // On PHP (not on HHVM), display the original error message instead of the default one.
-                            $this->handleException($throw);
-
-                            // Stop the process by giving back the error to the native handler.
-                            return false;
-                        }
-                    }
-                }
-            }
-
            throw $throw;
        }

@@ -651,7 +581,7 @@ class ErrorHandler
        $previousHandler = null;
        $sameHandlerLimit = 10;

-        while (!\is_array($handler) || !$handler[0] instanceof self) {
+        while (!is_array($handler) || !$handler[0] instanceof self) {
            $handler = set_exception_handler('var_dump');
            restore_exception_handler();

@@ -826,7 +756,7 @@ class ErrorHandler
        @trigger_error('The '.__METHOD__.' static method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the setLoggers() or setDefaultLogger() methods instead.', E_USER_DEPRECATED);

        $handler = set_error_handler('var_dump');
-        $handler = \is_array($handler) ? $handler[0] : null;
+        $handler = is_array($handler) ? $handler[0] : null;
        restore_error_handler();
        if (!$handler instanceof self) {
            return;
--- a/Exception/ClassNotFoundException.php
+++ b/Exception/ClassNotFoundException.php
@@ -26,9 +26,6 @@ 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
@@ -35,9 +35,9 @@ use Symfony\Component\HttpKernel\Exception\FatalErrorException as LegacyFatalErr
 */
 class FatalErrorException extends LegacyFatalErrorException
 {
-    public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null, $previous = null)
+    public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null)
    {
-        parent::__construct($message, $code, $severity, $filename, $lineno, $previous);
+        parent::__construct($message, $code, $severity, $filename, $lineno);

        if (null !== $trace) {
            if (!$traceArgs) {
@@ -48,7 +48,7 @@ class FatalErrorException extends LegacyFatalErrorException

            $this->setTrace($trace);
        } elseif (null !== $traceOffset) {
-            if (\function_exists('xdebug_get_function_stack')) {
+            if (function_exists('xdebug_get_function_stack')) {
                $trace = xdebug_get_function_stack();
                if (0 < $traceOffset) {
                    array_splice($trace, -$traceOffset);
@@ -77,7 +77,7 @@ class FatalErrorException extends LegacyFatalErrorException

                unset($frame);
                $trace = array_reverse($trace);
-            } elseif (\function_exists('symfony_debug_backtrace')) {
+            } elseif (function_exists('symfony_debug_backtrace')) {
                $trace = symfony_debug_backtrace();
                if (0 < $traceOffset) {
                    array_splice($trace, 0, $traceOffset);
--- a/Exception/FlattenException.php
+++ b/Exception/FlattenException.php
@@ -29,10 +29,10 @@ class FlattenException
    public static function __callStatic($method, $args)
    {
        if (!method_exists('Symfony\Component\Debug\Exception\FlattenException', $method)) {
-            throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', \get_called_class(), $method));
+            throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', get_called_class(), $method));
        }

-        return \call_user_func_array(array('Symfony\Component\Debug\Exception\FlattenException', $method), $args);
+        return call_user_func_array(array('Symfony\Component\Debug\Exception\FlattenException', $method), $args);
    }

    public function __call($method, $args)
@@ -42,10 +42,10 @@ class FlattenException
        }

        if (!method_exists($this->handler, $method)) {
-            throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', \get_class($this), $method));
+            throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', get_class($this), $method));
        }

-        return \call_user_func_array(array($this->handler, $method), $args);
+        return call_user_func_array(array($this->handler, $method), $args);
    }
 }

@@ -91,7 +91,7 @@ class FlattenException extends LegacyFlattenException
        $e->setStatusCode($statusCode);
        $e->setHeaders($headers);
        $e->setTraceFromException($exception);
-        $e->setClass(\get_class($exception));
+        $e->setClass(get_class($exception));
        $e->setFile($exception->getFile());
        $e->setLine($exception->getLine());

@@ -266,9 +266,9 @@ class FlattenException extends LegacyFlattenException
            if ($value instanceof \__PHP_Incomplete_Class) {
                // is_object() returns false on PHP<=7.1
                $result[$key] = array('incomplete-object', $this->getClassNameFromIncomplete($value));
-            } elseif (\is_object($value)) {
-                $result[$key] = array('object', \get_class($value));
-            } elseif (\is_array($value)) {
+            } elseif (is_object($value)) {
+                $result[$key] = array('object', get_class($value));
+            } elseif (is_array($value)) {
                if ($level > 10) {
                    $result[$key] = array('array', '*DEEP NESTED ARRAY*');
                } else {
@@ -276,9 +276,9 @@ class FlattenException extends LegacyFlattenException
                }
            } elseif (null === $value) {
                $result[$key] = array('null', null);
-            } elseif (\is_bool($value)) {
+            } elseif (is_bool($value)) {
                $result[$key] = array('boolean', $value);
-            } elseif (\is_resource($value)) {
+            } elseif (is_resource($value)) {
                $result[$key] = array('resource', get_resource_type($value));
            } else {
                $result[$key] = array('string', (string) $value);
--- a/Exception/UndefinedFunctionException.php
+++ b/Exception/UndefinedFunctionException.php
@@ -26,9 +26,6 @@ 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,9 +26,6 @@ class UndefinedMethodException extends FatalErrorException
            $previous->getSeverity(),
            $previous->getFile(),
            $previous->getLine(),
-            null,
-            true,
-            null,
            $previous->getPrevious()
        );
        $this->setTrace($previous->getTrace());
--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -11,9 +11,9 @@

 namespace Symfony\Component\Debug;

+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
-use Symfony\Component\HttpFoundation\Response;

 /**
 * ExceptionHandler converts an exception to a Response object.
@@ -39,8 +39,6 @@ class ExceptionHandler
    public function __construct($debug = true, $charset = null, $fileLinkFormat = null)
    {
        if (false !== strpos($charset, '%')) {
-            @trigger_error('Providing $fileLinkFormat as second argument to '.__METHOD__.' is deprecated since Symfony 2.8 and will be unsupported in 3.0. Please provide it as third argument, after $charset.', E_USER_DEPRECATED);
-
            // Swap $charset and $fileLinkFormat for BC reasons
            $pivot = $fileLinkFormat;
            $fileLinkFormat = $charset;
@@ -65,7 +63,7 @@ class ExceptionHandler
        $handler = new static($debug, $charset, $fileLinkFormat);

        $prev = set_exception_handler(array($handler, 'handle'));
-        if (\is_array($prev) && $prev[0] instanceof ErrorHandler) {
+        if (is_array($prev) && $prev[0] instanceof ErrorHandler) {
            restore_exception_handler();
            $prev[0]->setExceptionHandler(array($handler, 'handle'));
        }
@@ -82,7 +80,7 @@ class ExceptionHandler
     */
    public function setHandler($handler)
    {
-        if (null !== $handler && !\is_callable($handler)) {
+        if (null !== $handler && !is_callable($handler)) {
            throw new \LogicException('The exception handler must be a valid PHP callable.');
        }
        $old = $this->handler;
@@ -137,7 +135,7 @@ class ExceptionHandler
        $this->caughtBuffer = null;

        try {
-            \call_user_func($this->handler, $exception);
+            call_user_func($this->handler, $exception);
            $this->caughtLength = $caughtLength;
        } catch (\Exception $e) {
            if (!$caughtLength) {
@@ -157,14 +155,13 @@ class ExceptionHandler
    private function failSafeHandle(\Exception $exception)
    {
        if (class_exists('Symfony\Component\HttpFoundation\Response', false)
-            && __CLASS__ !== \get_class($this)
+            && __CLASS__ !== get_class($this)
            && ($reflector = new \ReflectionMethod($this, 'createResponse'))
            && __CLASS__ !== $reflector->class
        ) {
            $response = $this->createResponse($exception);
            $response->sendHeaders();
            $response->sendContent();
-            @trigger_error(sprintf("The %s::createResponse method is deprecated since Symfony 2.8 and won't be called anymore when handling an exception in 3.0.", $reflector->class), E_USER_DEPRECATED);

            return;
        }
@@ -178,7 +175,7 @@ class ExceptionHandler
     * This method uses plain PHP functions like header() and echo to output
     * the response.
     *
-     * @param \Exception|FlattenException $exception An \Exception or FlattenException instance
+     * @param \Exception|FlattenException $exception An \Exception instance
     */
    public function sendPhpResponse($exception)
    {
@@ -200,37 +197,17 @@ class ExceptionHandler
    /**
     * Creates the error Response associated with the given Exception.
     *
-     * @param \Exception|FlattenException $exception An \Exception or FlattenException instance
+     * @param \Exception|FlattenException $exception An \Exception instance
     *
     * @return Response A Response instance
-     *
-     * @deprecated since 2.8, to be removed in 3.0.
     */
    public function createResponse($exception)
    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
-
        if (!$exception instanceof FlattenException) {
            $exception = FlattenException::create($exception);
        }

-        return Response::create($this->getHtml($exception), $exception->getStatusCode(), $exception->getHeaders())->setCharset($this->charset);
-    }
-
-    /**
-     * Gets the full HTML content associated with the given exception.
-     *
-     * @param \Exception|FlattenException $exception An \Exception or FlattenException instance
-     *
-     * @return string The HTML content as a string
-     */
-    public function getHtml($exception)
-    {
-        if (!$exception instanceof FlattenException) {
-            $exception = FlattenException::create($exception);
-        }
-
-        return $this->decorate($this->getContent($exception), $this->getStylesheet($exception));
+        return Response::create($this->decorate($this->getContent($exception), $this->getStylesheet($exception)), $exception->getStatusCode(), $exception->getHeaders())->setCharset($this->charset);
    }

    /**
@@ -251,7 +228,7 @@ class ExceptionHandler
        $content = '';
        if ($this->debug) {
            try {
-                $count = \count($exception->getAllPrevious());
+                $count = count($exception->getAllPrevious());
                $total = $count + 1;
                foreach ($exception->toArray() as $position => $e) {
                    $ind = $count - $position + 1;
@@ -284,7 +261,7 @@ EOF
            } catch (\Exception $e) {
                // something nasty happened and we cannot throw an exception anymore
                if ($this->debug) {
-                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', \get_class($e), $this->escapeHtml($e->getMessage()));
+                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $this->escapeHtml($e->getMessage()));
                } else {
                    $title = 'Whoops, looks like something went wrong.';
                }
@@ -423,7 +400,7 @@ EOF;
            if ('object' === $item[0]) {
                $formattedValue = sprintf('<em>object</em>(%s)', $this->formatClass($item[1]));
            } elseif ('array' === $item[0]) {
-                $formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
+                $formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
            } elseif ('string' === $item[0]) {
                $formattedValue = sprintf("'%s'", $this->escapeHtml($item[1]));
            } elseif ('null' === $item[0]) {
@@ -436,7 +413,7 @@ EOF;
                $formattedValue = str_replace("\n", '', var_export($this->escapeHtml((string) $item[1]), true));
            }

-            $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", $this->escapeHtml($key), $formattedValue);
+            $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $this->escapeHtml($key), $formattedValue);
        }

        return implode(', ', $result);
--- a/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+++ b/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -11,12 +11,12 @@

 namespace Symfony\Component\Debug\FatalErrorHandler;

+use Symfony\Component\Debug\Exception\ClassNotFoundException;
+use Symfony\Component\Debug\Exception\FatalErrorException;
+use Symfony\Component\Debug\DebugClassLoader;
 use Composer\Autoload\ClassLoader as ComposerClassLoader;
 use Symfony\Component\ClassLoader\ClassLoader as SymfonyClassLoader;
 use Symfony\Component\ClassLoader\UniversalClassLoader as SymfonyUniversalClassLoader;
-use Symfony\Component\Debug\DebugClassLoader;
-use Symfony\Component\Debug\Exception\ClassNotFoundException;
-use Symfony\Component\Debug\Exception\FatalErrorException;

 /**
 * ErrorHandler for classes that do not exist.
@@ -30,9 +30,9 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
     */
    public function handleError(array $error, FatalErrorException $exception)
    {
-        $messageLen = \strlen($error['message']);
+        $messageLen = strlen($error['message']);
        $notFoundSuffix = '\' not found';
-        $notFoundSuffixLen = \strlen($notFoundSuffix);
+        $notFoundSuffixLen = strlen($notFoundSuffix);
        if ($notFoundSuffixLen > $messageLen) {
            return;
        }
@@ -43,7 +43,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface

        foreach (array('class', 'interface', 'trait') as $typeName) {
            $prefix = ucfirst($typeName).' \'';
-            $prefixLen = \strlen($prefix);
+            $prefixLen = strlen($prefix);
            if (0 !== strpos($error['message'], $prefix)) {
                continue;
            }
@@ -86,7 +86,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
     */
    private function getClassCandidates($class)
    {
-        if (!\is_array($functions = spl_autoload_functions())) {
+        if (!is_array($functions = spl_autoload_functions())) {
            return array();
        }

@@ -94,7 +94,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
        $classes = array();

        foreach ($functions as $function) {
-            if (!\is_array($function)) {
+            if (!is_array($function)) {
                continue;
            }
            // get class loaders wrapped by DebugClassLoader
@@ -102,11 +102,11 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
                $function = $function[0]->getClassLoader();

                // @deprecated since version 2.5. Returning an object from DebugClassLoader::getClassLoader() is deprecated.
-                if (\is_object($function)) {
+                if (is_object($function)) {
                    $function = array($function);
                }

-                if (!\is_array($function)) {
+                if (!is_array($function)) {
                    continue;
                }
            }
@@ -139,7 +139,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
     */
    private function findClassInPath($path, $class, $prefix)
    {
-        if (!$path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.\dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path)) {
+        if (!$path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path)) {
            return array();
        }

@@ -165,7 +165,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
    {
        $candidates = array(
            // namespaced class
-            $namespacedClass = str_replace(array($path.\DIRECTORY_SEPARATOR, '.php', '/'), array('', '', '\\'), $file),
+            $namespacedClass = str_replace(array($path.DIRECTORY_SEPARATOR, '.php', '/'), array('', '', '\\'), $file),
            // namespaced class (with target dir)
            $prefix.$namespacedClass,
            // namespaced class (with target dir and separator)
@@ -207,6 +207,6 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
     */
    private function classExists($class)
    {
-        return class_exists($class, false) || interface_exists($class, false) || (\function_exists('trait_exists') && trait_exists($class, false));
+        return class_exists($class, false) || interface_exists($class, false) || (function_exists('trait_exists') && trait_exists($class, false));
    }
 }
--- a/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
+++ b/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
@@ -11,8 +11,8 @@

 namespace Symfony\Component\Debug\FatalErrorHandler;

-use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\Debug\Exception\UndefinedFunctionException;
+use Symfony\Component\Debug\Exception\FatalErrorException;

 /**
 * ErrorHandler for undefined functions.
@@ -26,9 +26,9 @@ class UndefinedFunctionFatalErrorHandler implements FatalErrorHandlerInterface
     */
    public function handleError(array $error, FatalErrorException $exception)
    {
-        $messageLen = \strlen($error['message']);
+        $messageLen = strlen($error['message']);
        $notFoundSuffix = '()';
-        $notFoundSuffixLen = \strlen($notFoundSuffix);
+        $notFoundSuffixLen = strlen($notFoundSuffix);
        if ($notFoundSuffixLen > $messageLen) {
            return;
        }
@@ -38,7 +38,7 @@ class UndefinedFunctionFatalErrorHandler implements FatalErrorHandlerInterface
        }

        $prefix = 'Call to undefined function ';
-        $prefixLen = \strlen($prefix);
+        $prefixLen = strlen($prefix);
        if (0 !== strpos($error['message'], $prefix)) {
            return;
        }
--- a/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
+++ b/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -44,7 +44,7 @@ class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface
        $candidates = array();
        foreach ($methods as $definedMethodName) {
            $lev = levenshtein($methodName, $definedMethodName);
-            if ($lev <= \strlen($methodName) / 3 || false !== strpos($definedMethodName, $methodName)) {
+            if ($lev <= strlen($methodName) / 3 || false !== strpos($definedMethodName, $methodName)) {
                $candidates[] = $definedMethodName;
            }
        }
--- a/Resources/ext/tests/003.phpt
+++ b/Resources/ext/tests/003.phpt
@@ -45,7 +45,7 @@ function foo()
 $handler = ErrorHandler::register();
 $handler->setExceptionHandler('print_r');

-if (\function_exists('xdebug_disable')) {
+if (function_exists('xdebug_disable')) {
    xdebug_disable();
 }

--- a/Tests/DebugClassLoaderTest.php
+++ b/Tests/DebugClassLoaderTest.php
@@ -222,28 +222,6 @@ class DebugClassLoaderTest extends TestCase
        );
    }

-    public function testInterfaceExtendsDeprecatedInterface()
-    {
-        set_error_handler(function () { return false; });
-        $e = error_reporting(0);
-        trigger_error('', E_USER_NOTICE);
-
-        class_exists('Test\\'.__NAMESPACE__.'\\NonDeprecatedInterfaceClass', true);
-
-        error_reporting($e);
-        restore_error_handler();
-
-        $lastError = error_get_last();
-        unset($lastError['file'], $lastError['line']);
-
-        $xError = array(
-            'type' => E_USER_NOTICE,
-            'message' => '',
-        );
-
-        $this->assertSame($xError, $lastError);
-    }
-
    public function testDeprecatedSuperInSameNamespace()
    {
        set_error_handler(function () { return false; });
@@ -330,8 +308,6 @@ class ClassLoader
            eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedParentClass extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
        } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedInterfaceClass' === $class) {
            eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\DeprecatedInterface {}');
-        } elseif ('Test\\'.__NAMESPACE__.'\NonDeprecatedInterfaceClass' === $class) {
-            eval('namespace Test\\'.__NAMESPACE__.'; class NonDeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\NonDeprecatedInterface {}');
        } elseif ('Test\\'.__NAMESPACE__.'\Float' === $class) {
            eval('namespace Test\\'.__NAMESPACE__.'; class Float {}');
        }
--- a/Tests/ErrorHandlerTest.php
+++ b/Tests/ErrorHandlerTest.php
@@ -13,7 +13,6 @@ namespace Symfony\Component\Debug\Tests;

 use PHPUnit\Framework\TestCase;
 use Psr\Log\LogLevel;
-use Symfony\Component\Debug\BufferingLogger;
 use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\Debug\Exception\ContextErrorException;

@@ -296,33 +295,6 @@ class ErrorHandlerTest extends TestCase
        }
    }

-    public function testHandleUserError()
-    {
-        try {
-            $handler = ErrorHandler::register();
-            $handler->throwAt(0, true);
-
-            $e = null;
-            $x = new \Exception('Foo');
-
-            try {
-                $f = new Fixtures\ToStringThrower($x);
-                $f .= ''; // Trigger $f->__toString()
-            } catch (\Exception $e) {
-            }
-
-            $this->assertSame($x, $e);
-
-            restore_error_handler();
-            restore_exception_handler();
-        } catch (\Exception $e) {
-            restore_error_handler();
-            restore_exception_handler();
-
-            throw $e;
-        }
-    }
-
    public function testHandleDeprecation()
    {
        $that = $this;
@@ -430,49 +402,6 @@ class ErrorHandlerTest extends TestCase
        }
    }

-    public function testBootstrappingLogger()
-    {
-        $bootLogger = new BufferingLogger();
-        $handler = new ErrorHandler($bootLogger);
-
-        $loggers = array(
-            E_DEPRECATED => array($bootLogger, LogLevel::INFO),
-            E_USER_DEPRECATED => array($bootLogger, LogLevel::INFO),
-            E_NOTICE => array($bootLogger, LogLevel::WARNING),
-            E_USER_NOTICE => array($bootLogger, LogLevel::WARNING),
-            E_STRICT => array($bootLogger, LogLevel::WARNING),
-            E_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_USER_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_COMPILE_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_CORE_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_USER_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_RECOVERABLE_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_COMPILE_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_PARSE => array($bootLogger, LogLevel::CRITICAL),
-            E_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_CORE_ERROR => array($bootLogger, LogLevel::CRITICAL),
-        );
-
-        $this->assertSame($loggers, $handler->setLoggers(array()));
-
-        $handler->handleError(E_DEPRECATED, 'Foo message', __FILE__, 123, array());
-        $expectedLog = array(LogLevel::INFO, 'Foo message', array('type' => E_DEPRECATED, 'file' => __FILE__, 'line' => 123, 'level' => error_reporting()));
-
-        $logs = $bootLogger->cleanLogs();
-        unset($logs[0][2]['stack']);
-
-        $this->assertSame(array($expectedLog), $logs);
-
-        $bootLogger->log($expectedLog[0], $expectedLog[1], $expectedLog[2]);
-
-        $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
-        $mockLogger->expects($this->once())
-            ->method('log')
-            ->with(LogLevel::WARNING, 'Foo message', $expectedLog[2]);
-
-        $handler->setLoggers(array(E_DEPRECATED => array($mockLogger, LogLevel::WARNING)));
-    }
-
    /**
     * @group no-hhvm
     */
@@ -526,7 +455,7 @@ class ErrorHandlerTest extends TestCase

        $handler = new ErrorHandler();
        $handler->setExceptionHandler(function () use (&$args) {
-            $args = \func_get_args();
+            $args = func_get_args();
        });

        $handler->handleException($exception);
@@ -571,7 +500,7 @@ class ErrorHandlerTest extends TestCase
                'backtrace' => array(456),
            );

-            \call_user_func_array(array($handler, 'handleError'), $error);
+            call_user_func_array(array($handler, 'handleError'), $error);
            $handler->handleFatalError($error);

            restore_error_handler();
--- a/Tests/Exception/FlattenExceptionTest.php
+++ b/Tests/Exception/FlattenExceptionTest.php
@@ -13,19 +13,19 @@ namespace Symfony\Component\Debug\Tests\Exception;

 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Debug\Exception\FlattenException;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\GoneHttpException;
 use Symfony\Component\HttpKernel\Exception\LengthRequiredHttpException;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\PreconditionFailedHttpException;
 use Symfony\Component\HttpKernel\Exception\PreconditionRequiredHttpException;
 use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
-use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
 use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException;

 class FlattenExceptionTest extends TestCase
--- a/Tests/ExceptionHandlerTest.php
+++ b/Tests/ExceptionHandlerTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\Debug\Tests;

 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Debug\Exception\OutOfMemoryException;
 use Symfony\Component\Debug\ExceptionHandler;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\Debug\Exception\OutOfMemoryException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;

 require_once __DIR__.'/HeaderMock.php';

--- a/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
+++ b/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -11,20 +11,20 @@

 namespace Symfony\Component\Debug\Tests\FatalErrorHandler;

-use Composer\Autoload\ClassLoader as ComposerClassLoader;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassLoader as SymfonyClassLoader;
 use Symfony\Component\ClassLoader\UniversalClassLoader as SymfonyUniversalClassLoader;
-use Symfony\Component\Debug\DebugClassLoader;
 use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
+use Symfony\Component\Debug\DebugClassLoader;
+use Composer\Autoload\ClassLoader as ComposerClassLoader;

 class ClassNotFoundFatalErrorHandlerTest extends TestCase
 {
    public static function setUpBeforeClass()
    {
        foreach (spl_autoload_functions() as $function) {
-            if (!\is_array($function)) {
+            if (!is_array($function)) {
                continue;
            }

@@ -34,7 +34,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
            }

            if ($function[0] instanceof ComposerClassLoader) {
-                $function[0]->add('Symfony_Component_Debug_Tests_Fixtures', \dirname(\dirname(\dirname(\dirname(\dirname(__DIR__))))));
+                $function[0]->add('Symfony_Component_Debug_Tests_Fixtures', dirname(dirname(dirname(dirname(dirname(__DIR__))))));
                break;
            }
        }
--- 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/NonDeprecatedInterface.php
+++ b/Tests/Fixtures/NonDeprecatedInterface.php
@@ -1,7 +0,0 @@
-<?php
-
-namespace Symfony\Component\Debug\Tests\Fixtures;
-
-interface NonDeprecatedInterface extends DeprecatedInterface
-{
-}
--- a/Tests/Fixtures/ToStringThrower.php
+++ b/Tests/Fixtures/ToStringThrower.php
@@ -1,24 +0,0 @@
-<?php
-
-namespace Symfony\Component\Debug\Tests\Fixtures;
-
-class ToStringThrower
-{
-    private $exception;
-
-    public function __construct(\Exception $e)
-    {
-        $this->exception = $e;
-    }
-
-    public function __toString()
-    {
-        try {
-            throw $this->exception;
-        } catch (\Exception $e) {
-            // Using user_error() here is on purpose so we do not forget
-            // that this alias also should work alongside with trigger_error().
-            return user_error($e, E_USER_ERROR);
-        }
-    }
-}
--- a/Tests/HeaderMock.php
+++ b/Tests/HeaderMock.php
@@ -27,12 +27,12 @@ function testHeader()
 {
    static $headers = array();

-    if (!$h = \func_get_args()) {
+    if (!$h = func_get_args()) {
        $h = $headers;
        $headers = array();

        return $h;
    }

-    $headers[] = \func_get_args();
+    $headers[] = func_get_args();
 }
--- 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

@@ -9,7 +7,7 @@ namespace Symfony\Component\Debug;

 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
-    $vendor = \dirname($vendor);
+    $vendor = dirname($vendor);
 }
 require $vendor.'/vendor/autoload.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/Tests/phpt/exception_rethrown.phpt
+++ b/Tests/phpt/exception_rethrown.phpt
@@ -7,7 +7,7 @@ namespace Symfony\Component\Debug;

 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
-    $vendor = \dirname($vendor);
+    $vendor = dirname($vendor);
 }
 require $vendor.'/vendor/autoload.php';

--- a/Tests/phpt/fatal_with_nested_handlers.phpt
+++ b/Tests/phpt/fatal_with_nested_handlers.phpt
@@ -7,7 +7,7 @@ namespace Symfony\Component\Debug;

 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
-    $vendor = \dirname($vendor);
+    $vendor = dirname($vendor);
 }
 require $vendor.'/vendor/autoload.php';

@@ -35,7 +35,7 @@ array(1) {
  [0]=>
  string(37) "Error and exception handlers do match"
 }
-object(Symfony\Component\Debug\Exception\FatalErrorException)#%d (%d) {
+object(Symfony\Component\Debug\Exception\FatalErrorException)#%d (8) {
  ["message":protected]=>
  string(199) "Error: Class Symfony\Component\Debug\Broken contains 2 abstract methods and must therefore be declared abstract or implement the remaining methods (Serializable::serialize, Serializable::unserialize)"
 %a
--- a/composer.json
+++ b/composer.json
@@ -23,8 +23,8 @@
        "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
    },
    "require-dev": {
-        "symfony/class-loader": "~2.2|~3.0.0",
-        "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
+        "symfony/class-loader": "~2.2",
+        "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2"
    },
    "autoload": {
        "psr-4": { "Symfony\\Component\\Debug\\": "" },
@@ -35,7 +35,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "2.8-dev"
+            "dev-master": "2.7-dev"
        }
    }
 }
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"