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 17:52:07 +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 · 2016-07-26 10:03:56 +02:00 · 2016-07-26 10:02:44 +02:00
3 changed files with 2 additions and 3 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/Tests/MockExceptionHandler.php
+++ b/Tests/MockExceptionHandler.php
@@ -13,7 +13,7 @@ namespace Symfony\Component\Debug\Tests;

 use Symfony\Component\Debug\ExceptionHandler;

-class MockExceptionHandler extends Exceptionhandler
+class MockExceptionHandler extends ExceptionHandler
 {
    public $e;

--- 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"
        }
    }
 }
Author	SHA1	Message	Date
Fabien Potencier	697c527acd	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	2016-07-30 03:22:48 -04:00
Fabien Potencier	f7c5256f43	Merge branch '2.7' into 2.8 * 2.7: Minor fixes [Console] Overcomplete argument exception message tweak.	2016-07-30 03:20:35 -04:00
Vyacheslav Pavlov	31106b58d5	Minor fixes	2016-07-30 03:17:26 -04:00
Nicolas Grekas	134a136d9a	Merge branch '2.8' into 3.0 * 2.8: [Console] Application update PHPDoc of add and register methods [Config] Extra tests for Config component Fixed bugs in names of classes and methods. [DoctrineBridge] Fixed php doc [FrameworkBundle] Fixed parameters number mismatch declaration [BrowserKit] Added test for followRedirect method (POST method) Fix the money form type render with Bootstrap3 [BrowserKit] Uppercase the "GET" method in redirects [DomCrawler] Inherit the namespace cache in subcrawlers [WebProfilerBundle] Fixed JSDoc parameter definition [HttpFoundation] HttpCache refresh stale responses containing an ETag Conflicts: src/Symfony/Component/Finder/Tests/Shell/CommandTest.php	2016-07-26 10:03:56 +02:00
Nicolas Grekas	bec6ab977e	Merge branch '2.7' into 2.8 * 2.7: [Console] Application update PHPDoc of add and register methods [Config] Extra tests for Config component Fixed bugs in names of classes and methods. [DoctrineBridge] Fixed php doc [FrameworkBundle] Fixed parameters number mismatch declaration [BrowserKit] Added test for followRedirect method (POST method) Fix the money form type render with Bootstrap3 [BrowserKit] Uppercase the "GET" method in redirects [WebProfilerBundle] Fixed JSDoc parameter definition [HttpFoundation] HttpCache refresh stale responses containing an ETag Conflicts: src/Symfony/Component/BrowserKit/Tests/ClientTest.php src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php	2016-07-26 10:02:44 +02:00
Vyacheslav Pavlov	13ebf897a8	Fixed bugs in names of classes and methods.	2016-07-26 06:40:54 +02:00