Skip to content

Commit 287a33e

Browse files
Merge branch '2.7' into 2.8
* 2.7: [HttpKernel] Fix lowest dep [Security] fix check for empty usernames [Form] updated exception message of ButtonBuilder::setRequestHandler() [travis] Fix deps=high jobs Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7 [Serializer] Simplify AbstractNormalizer::prepareForDenormalization() [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content [DependencyInjection] Remove unused code in XmlFileLoader [HttpFoundation] Behaviour change in PHP7 for substr bumped Symfony version to 2.3.32 updated VERSION for 2.3.31 update CONTRIBUTORS for 2.3.31 updated CHANGELOG for 2.3.31 Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpKernel/composer.json
2 parents 1552141 + 55d4199 commit 287a33e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"require": {
1919
"php": ">=5.3.9",
2020
"symfony/asset": "~2.7|~3.0.0",
21-
"symfony/dependency-injection" : "~2.8",
22-
"symfony/config" : "~2.4",
21+
"symfony/dependency-injection": "~2.8",
22+
"symfony/config": "~2.4",
2323
"symfony/event-dispatcher": "~2.8|~3.0.0",
2424
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
2525
"symfony/http-kernel": "~2.7|~3.0.0",

0 commit comments

Comments
 (0)