Merge branch '2.3' into 2.5

nicolas-grekas · nicolas-grekas · commit f53fc2b68d33 · 2015-01-03T16:23:51.000+01:00
* 2.3:
  [2.3] Remove useless tests skips
  [2.3] Cleanup deprecations

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/Debug/Tests/MockExceptionHandler.php
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
	src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
	src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
	src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
	src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
	src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
	src/Symfony/Component/Security/composer.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,7 @@ CHANGELOG
 
  * [BC BREAK] renamed `Symfony\Component\HttpKernel\EventListener\DeprecationLoggerListener` to `Symfony\Component\HttpKernel\EventListener\ErrorsLoggerListener` and changed its constructor
  * deprecated `Symfony\Component\HttpKernel\Debug\ErrorHandler`, `Symfony\Component\HttpKernel\Debug\ExceptionHandler`,
-   `Symfony\Component\HttpKernel\Exception\FatalErrorException`, and `Symfony\Component\HttpKernel\Exception\FlattenException`
+   `Symfony\Component\HttpKernel\Exception\FatalErrorException` and `Symfony\Component\HttpKernel\Exception\FlattenException`
  * deprecated `Symfony\Component\HttpKernel\Kernel::init()``
  * added the possibility to specify an id an extra attributes to hinclude tags
  * added the collect of data if a controller is a Closure in the Request collector
diff --git a/DataCollector/ExceptionDataCollector.php b/DataCollector/ExceptionDataCollector.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\DataCollector;
 
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\FlattenException;
 
 /**
  * ExceptionDataCollector.
diff --git a/EventListener/ExceptionListener.php b/EventListener/ExceptionListener.php
@@ -12,12 +12,12 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Exception\FlattenException;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/Exception/FatalErrorException.php b/Exception/FatalErrorException.php
@@ -11,15 +11,11 @@
 
 namespace Symfony\Component\HttpKernel\Exception;
 
-use Symfony\Component\Debug\Exception\FatalErrorException as DebugFatalErrorException;
-
 /**
  * Fatal Error Exception.
  *
  * @author Konstanton Myakshin <koc-dp@yandex.ru>
  *
  * @deprecated Deprecated in 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
  */
-class FatalErrorException extends DebugFatalErrorException
-{
-}
+class_exists('Symfony\Component\Debug\Exception\FatalErrorException');
diff --git a/Exception/FlattenException.php b/Exception/FlattenException.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\Exception;
 
-use Symfony\Component\Debug\Exception\FlattenException as DebugFlattenException;
-
 /**
  * FlattenException wraps a PHP Exception to be able to serialize it.
  *
@@ -22,6 +20,4 @@
  *
  * @deprecated Deprecated in 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
  */
-class FlattenException extends DebugFlattenException
-{
-}
+class_exists('Symfony\Component\Debug\Exception\FlattenException');
diff --git a/Tests/DataCollector/ConfigDataCollectorTest.php b/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -69,10 +69,6 @@ public function registerBundles()
     {
     }
 
-    public function init()
-    {
-    }
-
     public function getBundles()
     {
         return array();
diff --git a/Tests/DataCollector/ExceptionDataCollectorTest.php b/Tests/DataCollector/ExceptionDataCollectorTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector;
-use Symfony\Component\HttpKernel\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/Tests/DataCollector/LoggerDataCollectorTest.php b/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
+use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector;
-use Symfony\Component\HttpKernel\Debug\ErrorHandler;
 
 class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Tests/EventListener/LocaleListenerTest.php b/Tests/EventListener/LocaleListenerTest.php
@@ -67,10 +67,6 @@ public function testLocaleSetForRoutingContext()
 
     public function testRouterResetWithParentRequestOnKernelFinishRequest()
     {
-        if (!class_exists('Symfony\Component\Routing\Router')) {
-            $this->markTestSkipped('The "Routing" component is not available');
-        }
-
         // the request context is updated
         $context = $this->getMock('Symfony\Component\Routing\RequestContext');
         $context->expects($this->once())->method('setParameter')->with('_locale', 'es');
diff --git a/Tests/KernelTest.php b/Tests/KernelTest.php
@@ -194,11 +194,6 @@ public function testHandleBootsTheKernel()
 
     public function testStripComments()
     {
-        if (!function_exists('token_get_all')) {
-            $this->markTestSkipped('The function token_get_all() is not available.');
-
-            return;
-        }
         $source = <<<'EOF'
 <?php
 
diff --git a/Tests/Profiler/ProfilerTest.php b/Tests/Profiler/ProfilerTest.php
@@ -60,10 +60,6 @@ public function testFindWorksWithInvalidDates()
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         if (!class_exists('SQLite3') && (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers()))) {
             $this->markTestSkipped('This test requires SQLite support in your environment');
         }
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "php": ">=5.3.3",
         "symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2",
         "symfony/http-foundation": "~2.5",
-        "symfony/debug": "~2.5",
+        "symfony/debug": "~2.5.9|~2.6,>=2.6.2",
         "psr/log": "~1.0"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpKernel\Exception;`
`13`	`13`
`14`		`-use Symfony\Component\Debug\Exception\FlattenException as DebugFlattenException;`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* FlattenException wraps a PHP Exception to be able to serialize it.`
`18`	`16`	`*`
`@@ -22,6 +20,4 @@`
`22`	`20`	`*`
`23`	`21`	`* @deprecated Deprecated in 2.3, to be removed in 3.0. Use the same class from the Debug component instead.`
`24`	`22`	`*/`
`25`		`-class FlattenException extends DebugFlattenException`
`26`		`-{`
`27`		`-}`
	`23`	`+class_exists('Symfony\Component\Debug\Exception\FlattenException');`
Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,6 @@ public function registerBundles()`
`69`	`69`	`{`
`70`	`70`	`}`
`71`	`71`
`72`		`- public function init()`
`73`		`- {`
`74`		`- }`
`75`		`-`
`76`	`72`	`public function getBundles()`
`77`	`73`	`{`
`78`	`74`	`return array();`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpKernel\Tests\DataCollector;`
`13`	`13`
	`14`	`+use Symfony\Component\Debug\ErrorHandler;`
`14`	`15`	`use Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector;`
`15`		`-use Symfony\Component\HttpKernel\Debug\ErrorHandler;`
`16`	`16`
`17`	`17`	`class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase`
`18`	`18`	`{`