symfony
diff --git a/‎src/Symfony/Component/Debug/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Debug/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Debug/ErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/ErrorHandler.php
+1-6Lines changed: 1 addition & 6 deletions b/‎src/Symfony/Component/Debug/ErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/ErrorHandler.php
+1-6Lines changed: 1 addition & 6 deletions
diff --git a/‎src/Symfony/Component/Debug/Exception/ContextErrorException.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Exception/ContextErrorException.php
-40Lines changed: 0 additions & 40 deletions b/‎src/Symfony/Component/Debug/Exception/ContextErrorException.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Exception/ContextErrorException.php
-40Lines changed: 0 additions & 40 deletions
diff --git a/‎src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
-32Lines changed: 0 additions & 32 deletions b/‎src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
-32Lines changed: 0 additions & 32 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+2-3Lines changed: 2 additions & 3 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+2-3Lines changed: 2 additions & 3 deletions
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
 * removed the symfony_debug extension
+* removed `ContextErrorException`
 
 3.4.0
 -----
 
@@ -13,7 +13,6 @@
 
 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;
@@ -415,11 +414,7 @@ public function handleError($type, $message, $file, $line)
                 return;
             }
         } else {
-            if ($scope) {
-                $errorAsException = new ContextErrorException($logMessage, 0, $type, $file, $line, $context);
-            } else {
-                $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
-            }
+            $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
 
             // Clean the trace by removing function arguments and the first frames added by the error handler itself.
             if ($throw || $this->tracedErrors & $type) {
 
@@ -59,38 +59,6 @@ public function testIdempotence()
         $this->fail('DebugClassLoader did not register');
     }
 
-    public function testStacking()
-    {
-        // the ContextErrorException must not be loaded to test the workaround
-        // for https://bugs.php.net/65322.
-        if (class_exists('Symfony\Component\Debug\Exception\ContextErrorException', false)) {
-            $this->markTestSkipped('The ContextErrorException class is already loaded.');
-        }
-
-        ErrorHandler::register();
-
-        try {
-            // Trigger autoloading + E_STRICT at compile time
-            // which in turn triggers $errorHandler->handle()
-            // that again triggers autoloading for ContextErrorException.
-            // Error stacking works around the bug above and everything is fine.
-
-            eval('
-                namespace '.__NAMESPACE__.';
-                class ChildTestingStacking extends TestingStacking { function foo($bar) {} }
-            ');
-            $this->fail('ContextErrorException expected');
-        } catch (\ErrorException $exception) {
-            // if an exception is thrown, the test passed
-            $this->assertStringStartsWith(__FILE__, $exception->getFile());
-            $this->assertRegExp('/^Warning: Declaration/', $exception->getMessage());
-            $this->assertEquals(E_WARNING, $exception->getSeverity());
-        } finally {
-            restore_error_handler();
-            restore_exception_handler();
-        }
-    }
-
     /**
      * @expectedException \RuntimeException
      */
 
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
-use Symfony\Component\Debug\Exception\ContextErrorException;
 use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
@@ -213,13 +212,13 @@ public function save()
     {
         // Register custom error handler to catch a possible failure warning during session write
         set_error_handler(function ($errno, $errstr, $errfile, $errline, $errcontext) {
-            throw new ContextErrorException($errstr, $errno, E_WARNING, $errfile, $errline, $errcontext);
+            throw new \ErrorException($errstr, $errno, E_WARNING, $errfile, $errline, $errcontext);
         }, E_WARNING);
 
         try {
             session_write_close();
             restore_error_handler();
-        } catch (ContextErrorException $e) {
+        } catch (\ErrorException $e) {
             // The default PHP error message is not very helpful, as it does not give any information on the current save handler.
             // Therefore, we catch this error and trigger a warning with a better error message
             $handler = $this->getSaveHandler();