diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
-------

682855fa7d fix tests
This commit is contained in:
Fabien Potencier 2019-04-08 18:11:07 +02:00
parent 4e1244ecdb 682855fa7d
commit d935f40ed0
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View File

@ -160,6 +160,7 @@ abstract class FrameworkExtensionTest extends TestCase
} }
/** /**
* @group legacy
* @expectedException \LogicException * @expectedException \LogicException
*/ */
public function testAmbiguousWhenBothTemplatingAndFragments() public function testAmbiguousWhenBothTemplatingAndFragments()

4
src/Symfony/Bundle/TwigBundle/composer.json
View File

@ -35,14 +35,14 @@
"symfony/templating": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0",
"symfony/translation": "^4.2", "symfony/translation": "^4.2",
"symfony/yaml": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0",
"symfony/framework-bundle": "~4.1", "symfony/framework-bundle": "~4.3",
"symfony/web-link": "~3.4|~4.0", "symfony/web-link": "~3.4|~4.0",
"doctrine/annotations": "~1.0", "doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0" "doctrine/cache": "~1.0"
}, },
"conflict": { "conflict": {
"symfony/dependency-injection": "<4.1", "symfony/dependency-injection": "<4.1",
"symfony/framework-bundle": "<4.1", "symfony/framework-bundle": "<4.3",
"symfony/translation": "<4.2" "symfony/translation": "<4.2"
}, },
"autoload": { "autoload": {

4
src/Symfony/Component/HttpKernel/composer.json
View File

@ -30,7 +30,7 @@
"symfony/config": "~3.4|~4.0", "symfony/config": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0", "symfony/console": "~3.4|~4.0",
"symfony/css-selector": "~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/dom-crawler": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0",
"symfony/finder": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0",
@ -49,7 +49,7 @@
"conflict": { "conflict": {
"symfony/browser-kit": "<4.3", "symfony/browser-kit": "<4.3",
"symfony/config": "<3.4", "symfony/config": "<3.4",
"symfony/dependency-injection": "<4.2", "symfony/dependency-injection": "<4.3",
"symfony/translation": "<4.2", "symfony/translation": "<4.2",
"symfony/var-dumper": "<4.1.1", "symfony/var-dumper": "<4.1.1",
"twig/twig": "<1.34|<2.4,>=2" "twig/twig": "<1.34|<2.4,>=2"