summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json8
1 files changed, 2 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 97e4c5e..80d2c4d 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": ">=5.3.9",
"doctrine/common": "~2.4",
- "twig/twig": "~1.23|~2.0",
+ "twig/twig": "~1.26|~2.0",
"psr/log": "~1.0",
"symfony/security-acl": "~2.7|~3.0.0",
"symfony/polyfill-apcu": "~1.1",
@@ -85,6 +85,7 @@
"doctrine/doctrine-bundle": "~1.2",
"monolog/monolog": "~1.11",
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
+ "symfony/phpunit-bridge": "~3.2",
"egulias/email-validator": "~1.2,>=1.2.1",
"phpdocumentor/reflection": "^1.0.7"
},
@@ -108,11 +109,6 @@
"**/Tests/"
]
},
- "autoload-dev": {
- "psr-4": {
- "Symfony\\Bridge\\PhpUnit\\": "src/Symfony/Bridge/PhpUnit/"
- }
- },
"minimum-stability": "dev",
"extra": {
"branch-alias": {