update to 2.14.0

allow doctrine/collections v2
allow doctrine/event-manager v2
allow doctrine/lexer v2
raise dependency on symfony/console 4.2

2 files changed, 46 insertions, 23 deletions

diff --git a/composer.json b/composer.json
index 110b47f..a1538a6 100644
--- a/composer.json
+++ b/composer.json
@@ -24,22 +24,22 @@
         "composer-runtime-api": "^2",
         "ext-ctype": "*",
         "doctrine/cache": "^1.12.1 || ^2.1.1",
-        "doctrine/collections": "^1.5",
+        "doctrine/collections": "^1.5 || ^2.0",
         "doctrine/common": "^3.0.3",
         "doctrine/dbal": "^2.13.1 || ^3.2",
         "doctrine/deprecations": "^0.5.3 || ^1",
-        "doctrine/event-manager": "^1.1",
+        "doctrine/event-manager": "^1.2 || ^2",
         "doctrine/inflector": "^1.4 || ^2.0",
         "doctrine/instantiator": "^1.3",
-        "doctrine/lexer": "^1.2.3",
+        "doctrine/lexer": "^1.2.3 || ^2",
         "doctrine/persistence": "^2.4 || ^3",
         "psr/cache": "^1 || ^2 || ^3",
-        "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0",
+        "symfony/console": "^4.2 || ^5.0 || ^6.0",
         "symfony/polyfill-php72": "^1.23",
         "symfony/polyfill-php80": "^1.16"
     },
     "require-dev": {
-        "doctrine/annotations": "^1.13",
+        "doctrine/annotations": "^1.13 || ^2",
         "doctrine/coding-standard": "^9.0.2 || ^11.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
         "phpstan/phpstan": "~1.4.10 || 1.9.4",
@@ -47,11 +47,12 @@
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.1",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
+        "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
         "vimeo/psalm": "4.30.0 || 5.3.0"
     },
     "conflict": {
-        "doctrine/annotations": "<1.13 || >= 2.0"
+        "doctrine/annotations": "<1.13 || >= 3.0"
     },
     "suggest": {
         "ext-dom": "Provides support for XSD validation for XML mapping files",
diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec
index bbcb6ea..a10d4da 100644
--- a/php-doctrine-orm.spec
+++ b/php-doctrine-orm.spec
@@ -13,8 +13,8 @@
 
 %global github_owner     doctrine
 %global github_name      orm
-%global github_version   2.13.5
-%global github_commit    099e51d8990c586778c564a9ed1eaa6401f2bc83
+%global github_version   2.14.0
+%global github_commit    f82485e651763fbd1b34879726f4d3b91c358bd9
 
 %global composer_vendor  doctrine
 %global composer_project orm
@@ -27,9 +27,9 @@
 # "doctrine/cache": "^1.12.1 || ^2.1.1"
 %global cache_min_ver 1.12.1
 %global cache_max_ver 3
-# "doctrine/collections": "^1.5"
+# "doctrine/collections": "^1.5 || ^2.0"
 %global collections_min_ver 1.5
-%global collections_max_ver 2
+%global collections_max_ver 3
 # "doctrine/common": "^3.0.3"
 %global common_min_ver 3.0.3
 %global common_max_ver 4
@@ -45,18 +45,19 @@
 # "doctrine/instantiator": "^1.3"
 %global instantiator_min_ver 1.3
 %global instantiator_max_ver 2
-# "doctrine/lexer": "^1.2.3"
+# "doctrine/lexer": "^1.2.3 || ^2"
 %global lexer_min_ver 1.2.3
-%global lexer_max_ver 2
+%global lexer_max_ver 3
 # "doctrine/persistence": "^2.4 || ^3"
 %global persistence_min_ver 2.4
 %global persistence_max_ver 4
-# "doctrine/event-manager": "^1.1"
-%global event_min_ver 1.1
-%global event_max_ver 2
-# "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0"
+# "doctrine/event-manager": "^1.2 || ^2.0"
+%global event_min_ver 1.2
+%global event_max_ver 3
+# "symfony/console": "^4.2 || ^5.0 || ^6.0"
 # "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0"
-%global symfony_min_ver 3.4
+# "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2",
+%global symfony_min_ver 4.4
 %global symfony_max_ver 7
 # "symfony/cache": "^4.4 || ^5.4 || ^6.0",
 %global sym_cache_min_ver 4.4
@@ -115,12 +116,13 @@ BuildRequires: (php-composer(doctrine/event-manager) >= %{event_min_ver}
 BuildRequires: (php-composer(doctrine/lexer)         >= %{lexer_min_ver}        with php-composer(doctrine/lexer)         < %{lexer_max_ver})
 BuildRequires: (php-composer(doctrine/persistence)   >= %{persistence_min_ver}  with php-composer(doctrine/persistence)   < %{persistence_max_ver})
 BuildRequires: (php-composer(symfony/console)        >= %{symfony_min_ver}      with php-composer(symfony/console)        < %{symfony_max_ver})
+BuildRequires: (php-composer(symfony/var-exporter)   >= %{symfony_min_ver}      with php-composer(symfony/var-exporter)   < %{symfony_max_ver})
 BuildRequires: (php-composer(symfony/yaml)           >= %{symfony_min_ver}      with php-composer(symfony/yaml)           < %{symfony_max_ver})
 BuildRequires: (php-composer(symfony/cache)          >= %{sym_cache_min_ver}    with php-composer(symfony/cache)          < %{sym_cache_max_ver})
 BuildRequires: (php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver}     with php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver})
 BuildRequires: (php-composer(psr/cache)              >= %{psr_cache_min_ver}    with php-composer(psr/cache)              < %{psr_cache_max_ver})
 BuildRequires: (php-composer(psr/log)                >= %{psr_log_min_ver}      with php-composer(psr/log)                < %{psr_log_max_ver})
-# remirepo:34
+# remirepo:36
 %else
 BuildRequires: php-doctrine-annotations >= %{annotations_min_ver}
 BuildRequires: php-composer(doctrine/cache) <  %{cache_max_ver}
@@ -144,6 +146,8 @@ BuildRequires: php-composer(doctrine/persistence)  < %{persistence_max_ver}
 BuildRequires: php-composer(doctrine/persistence)  >= %{persistence_min_ver}
 BuildRequires: php-composer(symfony/console) <  %{symfony_max_ver}
 BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver}
+BuildRequires: php-composer(symfony/var-exporter) <  %{symfony_max_ver}
+BuildRequires: php-composer(symfony/var-exporter) >= %{symfony_min_ver}
 BuildRequires: php-composer(symfony/yaml) <  %{symfony_max_ver}
 BuildRequires: php-composer(symfony/yaml) >= %{symfony_min_ver}
 BuildRequires: php-composer(symfony/cache) <  %{sym_cache_max_ver}
@@ -300,8 +304,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\ORM\\', __DIR__);
 
 \Fedora\Autoloader\Dependencies::required([
-    '%{phpdir}/Doctrine/Common/Lexer/autoload.php',
     [
+        '%{phpdir}/Doctrine/Common/Lexer2/autoload.php',
+        '%{phpdir}/Doctrine/Common/Lexer/autoload.php',
+    ], [
         '%{phpdir}/Doctrine/Persistence3/autoload.php',
         '%{phpdir}/Doctrine/Persistence2/autoload.php',
     ],
@@ -310,15 +316,18 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
     [
         '%{phpdir}/Doctrine/Common/Cache2/autoload.php',
         '%{phpdir}/Doctrine/Common/Cache/autoload.php',
+    ], [
+        '%{phpdir}/Doctrine/Common/Collections2/autoload.php',
+        '%{phpdir}/Doctrine/Common/Collections/autoload.php',
     ],
-    '%{phpdir}/Doctrine/Common/Collections/autoload.php',
     '%{phpdir}/Doctrine/Deprecations/autoload.php',
     [
         '%{phpdir}/Doctrine/Inflector2/autoload.php',
         '%{phpdir}/Doctrine/Common/Inflector/autoload.php',
-    ],
-    '%{phpdir}/Doctrine/Common/EventManager/autoload.php',
-    [
+    ], [
+        '%{phpdir}/Doctrine/EventManager2/autoload.php',
+        '%{phpdir}/Doctrine/Common/EventManager/autoload.php',
+    ], [
         '%{phpdir}/Doctrine/DBAL3/autoload.php',
         '%{phpdir}/Doctrine/DBAL/autoload.php',
     ],
@@ -338,11 +347,17 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Dependencies::optional([
   [
+    '%{phpdir}/Symfony6/Component/VarExporter/autoload.php',
+    '%{phpdir}/Symfony5/Component/VarExporter/autoload.php',
+    '%{phpdir}/Symfony4/Component/VarExporter/autoload.php',
+    '%{phpdir}/Symfony3/Component/VarExporter/autoload.php',
+  ], [
     '%{phpdir}/Symfony6/Component/Yaml/autoload.php',
     '%{phpdir}/Symfony5/Component/Yaml/autoload.php',
     '%{phpdir}/Symfony4/Component/Yaml/autoload.php',
     '%{phpdir}/Symfony3/Component/Yaml/autoload.php',
   ],
+
 ]);
 AUTOLOAD
 
@@ -420,6 +435,13 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 2.14.0-1
+- update to 2.14.0
+- allow doctrine/collections v2
+- allow doctrine/event-manager v2
+- allow doctrine/lexer v2
+- raise dependency on symfony/console 4.2
+
 * Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 2.13.5-1
 - update to 2.13.5