8000 minor #31013 fix tests (xabbuh) · symfony/symfony@d935f40 · GitHub
[go: up one dir, main page]
Skip to content

Commit d935f40

Browse files
fabpotfabpot
committed
minor #31013 fix tests (xabbuh)
This PR was merged into the 4.3-dev branch. Discussion ---------- fix tests | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | * 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 Commits ------- 682855f fix tests
2 parents 4e1244e + 682855f commit d935f40

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ public function testEsiDisabled()
160160
}
161161

162162
/**
163+
* @group legacy
163164
* @expectedException \LogicException
164165
*/
165166
public function testAmbiguousWhenBothTemplatingAndFragments()

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
"symfony/templating": "~3.4|~4.0",
3636
"symfony/translation": "^4.2",
3737
"symfony/yaml": "~3.4|~4.0",
38-
"symfony/framework-bundle": "~4.1",
38+
"symfony/framework-bundle": "~4.3",
3939
"symfony/web-link": "~3.4|~4.0",
4040
"doctrine/annotations": "~1.0",
4141
"doctrine/cache": "~1.0"
4242
},
4343
"conflict": {
4444
"symfony/dependency-injection": "<4.1",
45-
"symfony/framework-bundle": "<4.1",
45+
"symfony/framework-bundle": "<4.3",
4646
"symfony/translation": "<4.2"
4747
},
4848
"autoload": {

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"symfony/config": "~3.4|~4.0",
3131
"symfony/console": "~3.4|~4.0",
3232
"symfony/css-selector": "~3.4|~4.0",
33-
"symfony/dependency-injection": "^4.2",
33+
"symfony/dependency-injection": "^4.3",
3434
"symfony/dom-crawler": "~3.4|~4.0",
3535
"symfony/expression-language": "~3.4|~4.0",
3636
"symfony/finder": "~3.4|~4.0",
@@ -49,7 +49,7 @@
4949
"conflict": {
5050
"symfony/browser-kit": "<4.3",
5151
"symfony/config": "<3.4",
52-
"symfony/dependency-injection": "<4.2",
52+
"symfony/dependency-injection": "<4.3",
5353
"symfony/translation": "<4.2",
5454
"symfony/var-dumper": "<4.1.1",
5555
"twig/twig": "<1.34|<2.4,>=2"

0 commit comments

Comments
 (0)
0