Merge branch '3.0' into 3.1

fabpot · fabpot · commit 7bb15c20c10c · 2016-07-30T03:24:41.000-04:00
* 3.0:
  Minor fixes
  [Console] Overcomplete argument exception message tweak.
  fixed bad auto merge
  Console table cleanup
  undefined offset fix (#19406)
  [EventDispatcher] Removed unused variable
diff --git a/Tests/DebugClassLoaderTest.php b/Tests/DebugClassLoaderTest.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Debug\DebugClassLoader;
 use Symfony\Component\Debug\ErrorHandler;
-use Symfony\Component\Debug\Exception\ContextErrorException;
 
 class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Debug\DebugClassLoader;`
`15`	`15`	`use Symfony\Component\Debug\ErrorHandler;`
`16`		`-use Symfony\Component\Debug\Exception\ContextErrorException;`
`17`	`16`
`18`	`17`	`class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase`
`19`	`18`	`{`