summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2014-12-16 21:28:59 +0100
committerNicolas Grekas <nicolas.grekas@gmail.com>2014-12-16 21:28:59 +0100
commit6ae95fecd877a2e92dd42654d03245ecf3cfe7c4 (patch)
treefd711a4679b506673a1b6dde5c862e9264c8568b /Core
parent853b14753e0fffa101897454de95d912202c5604 (diff)
parent2059726995834fd81e780b80991efcfe7c27ef1f (diff)
downloadsymfony-security-6ae95fecd877a2e92dd42654d03245ecf3cfe7c4.zip
symfony-security-6ae95fecd877a2e92dd42654d03245ecf3cfe7c4.tar.gz
symfony-security-6ae95fecd877a2e92dd42654d03245ecf3cfe7c4.tar.bz2
Merge branch '2.7'
* 2.7: [2.6] Test lowest versions of dependencies Test lowest versions of dependencies Fix placeholder date format Test components using their lowest possible deps
Diffstat (limited to 'Core')
-rw-r--r--Core/composer.json5
1 files changed, 3 insertions, 2 deletions
diff --git a/Core/composer.json b/Core/composer.json
index f27b2c7..58d30bc 100644
--- a/Core/composer.json
+++ b/Core/composer.json
@@ -20,9 +20,10 @@
},
"require-dev": {
"symfony/event-dispatcher": "~2.1",
- "symfony/expression-language": "~2.4",
+ "symfony/expression-language": "~2.6",
"symfony/http-foundation": "~2.4",
- "symfony/validator": "~2.5",
+ "symfony/translation": "~2.0,>=2.0.5",
+ "symfony/validator": "~2.5,>=2.5.5",
"psr/log": "~1.0",
"ircmaxell/password-compat": "1.0.*"
},