summaryrefslogtreecommitdiffstats
path: root/src/Symfony/Bundle/FrameworkBundle
diff options
context:
space:
mode:
Diffstat (limited to 'src/Symfony/Bundle/FrameworkBundle')
-rw-r--r--src/Symfony/Bundle/FrameworkBundle/composer.json15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 7929ccb..72baafd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -1,7 +1,7 @@
{
"name": "symfony/framework-bundle",
"type": "symfony-bundle",
- "description": "Symfony FrameworkBundle",
+ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework",
"keywords": [],
"homepage": "https://symfony.com",
"license": "MIT",
@@ -27,11 +27,12 @@
"symfony/polyfill-mbstring": "~1.0",
"symfony/filesystem": "^3.4|^4.0|^5.0",
"symfony/finder": "^3.4|^4.0|^5.0",
- "symfony/routing": "^4.4|^5.0"
+ "symfony/routing": "^4.4.12|^5.1.4"
},
"require-dev": {
- "doctrine/annotations": "~1.7",
+ "doctrine/annotations": "^1.10.4",
"doctrine/cache": "~1.0",
+ "doctrine/persistence": "^1.3|^2.0",
"paragonie/sodium_compat": "^1.8",
"symfony/asset": "^3.4|^4.0|^5.0",
"symfony/browser-kit": "^4.3|^5.0",
@@ -60,13 +61,13 @@
"symfony/yaml": "^3.4|^4.0|^5.0",
"symfony/property-info": "^3.4|^4.0|^5.0",
"symfony/web-link": "^4.4|^5.0",
- "phpdocumentor/reflection-docblock": "^3.0|^4.0",
- "twig/twig": "^1.41|^2.10|^3.0"
+ "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+ "twig/twig": "^1.43|^2.13|^3.0.4"
},
"conflict": {
"doctrine/persistence": "<1.3",
- "phpdocumentor/reflection-docblock": "<3.0",
- "phpdocumentor/type-resolver": "<0.2.1",
+ "phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",
+ "phpdocumentor/type-resolver": "<0.3.0|1.3.*",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
"symfony/asset": "<3.4",
"symfony/browser-kit": "<4.3",