Merge branch '2.8' into 3.0

* 2.8: Minor fixes [Console] Overcomplete argument exception message tweak. fixed bad auto merge Console table cleanup undefined offset fix (#19406) [EventDispatcher] Removed unused variable
Merge branch '2.7' into 2.8
2026-03-25 01:32:09 +01:00 · 2016-07-30 03:22:48 -04:00 · 2016-07-30 03:20:35 -04:00 · 2016-07-30 03:17:26 -04:00
2 changed files with 1 additions and 2 deletions
--- a/Tests/DebugClassLoaderTest.php
+++ b/Tests/DebugClassLoaderTest.php
@@ -13,7 +13,6 @@ namespace Symfony\Component\Debug\Tests;

 use Symfony\Component\Debug\DebugClassLoader;
 use Symfony\Component\Debug\ErrorHandler;
-use Symfony\Component\Debug\Exception\ContextErrorException;

 class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "3.1-dev"
+            "dev-master": "3.0-dev"
        }
    }
 }