Merge branch '3.2'

nicolas-grekas · nicolas-grekas · commit 36aedd8b2c94 · 2017-01-06T18:58:22.000+01:00
* 3.2:
  [Bridge/PhpUnit] Relax expectedDeprecation for forward compat
  [FrameworkBundle] Remove Response* from classes to compile
  [Workflow] Removed twig from composer.json (dev section, not used)
diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -192,8 +192,8 @@ public function endTest(\PHPUnit_Framework_Test $test, $time)
 
             if (!in_array($test->getStatus(), array(\PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED, \PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE, \PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE, \PHPUnit_Runner_BaseTestRunner::STATUS_ERROR), true)) {
                 try {
-                    $prefix = "@expectedDeprecation:\n  ";
-                    $test->assertStringMatchesFormat($prefix.implode("\n  ", $this->expectedDeprecations), $prefix.implode("\n  ", $this->gatheredDeprecations));
+                    $prefix = "@expectedDeprecation:\n";
+                    $test->assertStringMatchesFormat($prefix.'%A  '.implode("\n%A  ", $this->expectedDeprecations)."\n%A", $prefix.'  '.implode("\n  ", $this->gatheredDeprecations)."\n");
                 } catch (\PHPUnit_Framework_AssertionFailedError $e) {
                     $test->getTestResultObject()->addFailure($test, $e, $time);
                 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -224,9 +224,6 @@ public function load(array $configs, ContainerBuilder $container)
                 'Symfony\\Component\\EventDispatcher\\Event',
                 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher',
 
-                'Symfony\\Component\\HttpFoundation\\Response',
-                'Symfony\\Component\\HttpFoundation\\ResponseHeaderBag',
-
                 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener',
                 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener',
                 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle',
diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json
@@ -25,8 +25,7 @@
     },
     "require-dev": {
         "psr/log": "~1.0",
-        "symfony/event-dispatcher": "~2.1|~3.0",
-        "twig/twig": "~1.14"
+        "symfony/event-dispatcher": "~2.1|~3.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Workflow\\": "" }
