summaryrefslogtreecommitdiffstats
path: root/src/Symfony/Bridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/Symfony/Bridge')
-rw-r--r--src/Symfony/Bridge/Doctrine/composer.json1
-rw-r--r--src/Symfony/Bridge/ProxyManager/composer.json1
-rw-r--r--src/Symfony/Bridge/Twig/composer.json7
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 420535b..1aa2315 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -22,6 +22,7 @@
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
+ "doctrine/annotations": "~1.7",
"symfony/stopwatch": "~2.8|~3.0|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/form": "^3.3.10|~4.0",
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
index 7e34cd9..4adc5c0 100644
--- a/src/Symfony/Bridge/ProxyManager/composer.json
+++ b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -25,6 +25,7 @@
},
"autoload": {
"psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" },
+ "classmap": [ "Legacy/ProxiedMethodReturnExpression.php" ],
"exclude-from-classmap": [
"/Tests/"
]
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 071b25b..f4fb1c9 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -17,13 +17,14 @@
],
"require": {
"php": "^5.5.9|>=7.0.8",
- "twig/twig": "^1.40|^2.9"
+ "twig/twig": "^1.41|^2.10"
},
"require-dev": {
+ "fig/link-util": "^1.0",
"symfony/asset": "~2.8|~3.0|~4.0",
"symfony/dependency-injection": "~2.8|~3.0|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0",
- "symfony/form": "^3.4.23|^4.2.4",
+ "symfony/form": "^3.4.31|^4.3.4",
"symfony/http-foundation": "^3.3.11|~4.0",
"symfony/http-kernel": "~3.2|~4.0",
"symfony/polyfill-intl-icu": "~1.0",
@@ -41,7 +42,7 @@
"symfony/workflow": "~3.3|~4.0"
},
"conflict": {
- "symfony/form": "<3.4.13|>=4.0,<4.0.13|>=4.1,<4.1.2",
+ "symfony/form": "<3.4.31|>=4.0,<4.3.4",
"symfony/console": "<3.4"
},
"suggest": {