fix tests

xabbuh · xabbuh · commit 682855fa7d9e · 2019-04-08T17:40:01.000+02:00
* use legacy group when using the deprecated `hinclude_default_template`
  templating config option
* conflict with DependencyInjection 4.2 in the HttpKernel component to
  be able to rely on five values being retrieved from the values of the
  `BoundArgument` class
* let the TwigBundle conflict with versions of FrameworkBundle that do
  not ship the `url_helper` service
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -160,6 +160,7 @@ public function testEsiDisabled()
     }
 
     /**
+     * @group legacy
      * @expectedException \LogicException
      */
     public function testAmbiguousWhenBothTemplatingAndFragments()
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -35,14 +35,14 @@
         "symfony/templating": "~3.4|~4.0",
         "symfony/translation": "^4.2",
         "symfony/yaml": "~3.4|~4.0",
-        "symfony/framework-bundle": "~4.1",
+        "symfony/framework-bundle": "~4.3",
         "symfony/web-link": "~3.4|~4.0",
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.0"
     },
     "conflict": {
         "symfony/dependency-injection": "<4.1",
-        "symfony/framework-bundle": "<4.1",
+        "symfony/framework-bundle": "<4.3",
         "symfony/translation": "<4.2"
     },
     "autoload": {
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -30,7 +30,7 @@
         "symfony/config": "~3.4|~4.0",
         "symfony/console": "~3.4|~4.0",
         "symfony/css-selector": "~3.4|~4.0",
-        "symfony/dependency-injection": "^4.2",
+        "symfony/dependency-injection": "^4.3",
         "symfony/dom-crawler": "~3.4|~4.0",
         "symfony/expression-language": "~3.4|~4.0",
         "symfony/finder": "~3.4|~4.0",
@@ -49,7 +49,7 @@
     "conflict": {
         "symfony/browser-kit": "<4.3",
         "symfony/config": "<3.4",
-        "symfony/dependency-injection": "<4.2",
+        "symfony/dependency-injection": "<4.3",
         "symfony/translation": "<4.2",
         "symfony/var-dumper": "<4.1.1",
         "twig/twig": "<1.34|<2.4,>=2"

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ public function testEsiDisabled()`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`/**`
	`163`	`+ * @group legacy`
`163`	`164`	`* @expectedException \LogicException`
`164`	`165`	`*/`
`165`	`166`	`public function testAmbiguousWhenBothTemplatingAndFragments()`