From b015d058e929910fc4ad9289a12ce7314122a860 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 28 Jan 2021 11:48:29 +0100
Subject: update to 4.4.19 drop dependency on ocramius/proxy-manager add
 dependency on friendsofphp/proxy-manager-lts raise dependency on
 doctrine_annotations_min_ver 1.10.4 raise dependency on doctrine/orm 2.6.3
 raise dependency on twig/twig 1.43 sources from git snapshot

---
 composer.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 55f83ce..c228650 100644
--- a/composer.json
+++ b/composer.json
@@ -18,9 +18,10 @@
     "require": {
         "php": ">=7.1.3",
         "ext-xml": "*",
+        "friendsofphp/proxy-manager-lts": "^1.0.2",
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "^1.3|^2",
-        "twig/twig": "^1.41|^2.10|^3.0",
+        "twig/twig": "^1.43|^2.13|^3.0.4",
         "psr/cache": "~1.0",
         "psr/container": "^1.0",
         "psr/link": "^1.0",
@@ -101,24 +102,23 @@
     "require-dev": {
         "cache/integration-tests": "dev-master",
         "composer/package-versions-deprecated": "^1.8",
-        "doctrine/annotations": "~1.0",
+        "doctrine/annotations": "^1.10.4",
         "doctrine/cache": "~1.6",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "^1.1",
-        "doctrine/dbal": "~2.4|^3.0",
-        "doctrine/orm": "~2.4,>=2.4.5",
+        "doctrine/dbal": "^2.6|^3.0",
+        "doctrine/orm": "^2.6.3",
         "doctrine/doctrine-bundle": "^1.5|^2.0",
-        "guzzlehttp/promises": "^1.3.1",
+        "guzzlehttp/promises": "^1.4",
         "masterminds/html5": "^2.6",
         "monolog/monolog": "^1.25.1",
         "nyholm/psr7": "^1.0",
-        "ocramius/proxy-manager": "^2.1",
         "paragonie/sodium_compat": "^1.8",
         "php-http/httplug": "^1.0|^2.0",
         "predis/predis": "~1.1",
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0",
-        "egulias/email-validator": "~1.2,>=1.2.8|~2.0",
+        "egulias/email-validator": "^2.1.10",
         "symfony/phpunit-bridge": "^5.2",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
@@ -129,8 +129,8 @@
     "conflict": {
         "masterminds/html5": "<2.6",
         "monolog/monolog": ">=2",
-        "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
-        "phpdocumentor/type-resolver": "<0.3.0",
+        "phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",
+        "phpdocumentor/type-resolver": "<0.3.0|1.3.*",
         "ocramius/proxy-manager": "<2.1",
         "phpunit/phpunit": "<5.4.3"
     },
-- 
cgit