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

minor #33390 [FrameworkBundle][TwigBundle] conflict with HttpKernel 5 (xabbuh)

Browse Source 
This PR was merged into the 4.4 branch.

Discussion
----------

[FrameworkBundle][TwigBundle] conflict with HttpKernel 5

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | replaces #33356
| License       | MIT
| Doc PR        |

Commits
-------

7d94b7c086 conflict with HttpKernel 5
This commit is contained in:
Nicolas Grekas 2019-08-30 14:22:42 +02:00
commit 15bbfc36e4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -23,7 +23,7 @@
"symfony/dependency-injection": "^4.4|^5.0",
"symfony/error-renderer": "^4.4|^5.0",
"symfony/http-foundation": "^4.3|^5.0",
"symfony/http-kernel": "^4.4|^5.0",
"symfony/http-kernel": "^4.4",
"symfony/polyfill-mbstring": "~1.0",
"symfony/filesystem": "^3.4|^4.0|^5.0",
"symfony/finder": "^3.4|^4.0|^5.0",

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

@ -20,7 +20,7 @@
"symfony/error-renderer": "^4.4|^5.0",
"symfony/twig-bridge": "^4.4|^5.0",
"symfony/http-foundation": "^4.3|^5.0",
"symfony/http-kernel": "^4.4|^5.0",
"symfony/http-kernel": "^4.4",
"symfony/polyfill-ctype": "~1.8",
"twig/twig": "~1.41|~2.10"
},