From 243966ba67caaeb492e4a372b1e60b9a62b955e6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 5 Nov 2019 09:28:58 +0100
Subject: - update to 3.4.31 - raise dependency on twig 1.41 - raise dependency
 on egulias/email-validator 2.1.10 - raise dependency on doctrine/annotations
 1.7

* Sat Sep 14 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.4.30-2
- Update autoloader generator to include self PSR-0, PSR-4, files, and classmap
---
 src/Symfony/Bridge/Doctrine/composer.json     | 1 +
 src/Symfony/Bridge/ProxyManager/composer.json | 1 +
 src/Symfony/Bridge/Twig/composer.json         | 7 ++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/Symfony/Bridge')

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": {
-- 
cgit