update to 2.12.0

raise dependency on doctrine/persistence 2.4 and allow 3
raise dependency on doctrine/lexer 1.2.3

1 files changed, 31 insertions, 10 deletions

diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec
index 1d42b2d..3f71ae6 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.11.3
-%global github_commit    4af1aa317713d5f3dbc57b22237d1acb8477079c
+%global github_version   2.12.0
+%global github_commit    d5503644314ed825fe4b276a588458a033fa3e7c
 
 %global composer_vendor  doctrine
 %global composer_project orm
@@ -45,12 +45,12 @@
 # "doctrine/instantiator": "^1.3"
 %global instantiator_min_ver 1.3
 %global instantiator_max_ver 2
-# "doctrine/lexer": "^1.0"
-%global lexer_min_ver 1.0
+# "doctrine/lexer": "^1.2.3"
+%global lexer_min_ver 1.2.3
 %global lexer_max_ver 2
-# "doctrine/persistence": "^2.2"
-%global persistence_min_ver 2.2
-%global persistence_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
@@ -62,12 +62,15 @@
 %global sym_cache_min_ver 4.4
 %global sym_cache_max_ver 7
 # "symfony/polyfill-php72": "^1.23",
-# "symfony/polyfill-php80": "^1.15"
+# "symfony/polyfill-php80": "^1.16"
 %global sym_poly_min_ver 1.23
 %global sym_poly_max_ver 2
 # "psr/cache": "^1 || ^2 || ^3",
 %global psr_cache_min_ver 1
 %global psr_cache_max_ver 4
+# "psr/log": "^1 || ^2 || ^3",
+%global psr_log_min_ver 1
+%global psr_log_max_ver 4
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
@@ -116,7 +119,8 @@ BuildRequires: (php-composer(symfony/yaml)           >= %{symfony_min_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})
-# remirepo:32
+BuildRequires: (php-composer(psr/log)                >= %{psr_log_min_ver}      with php-composer(psr/log)                < %{psr_log_max_ver})
+# remirepo:34
 %else
 BuildRequires: php-doctrine-annotations >= %{annotations_min_ver}
 BuildRequires: php-composer(doctrine/cache) <  %{cache_max_ver}
@@ -148,6 +152,8 @@ BuildRequires: php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver}
 BuildRequires: php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver}
 BuildRequires: php-composer(psr/cache) < %{psr_cache_max_ver}
 BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver}
+BuildRequires: php-composer(psr/log) <  %{psr_log_max_ver}
+BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
 %endif
 %global phpunit %{_bindir}/phpunit9
 BuildRequires: phpunit9 >= 9.4
@@ -290,7 +296,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\ORM\\', __DIR__);
 
 \Fedora\Autoloader\Dependencies::required([
-    '%{phpdir}/Doctrine/Persistence2/autoload.php',
+    [
+        '%{phpdir}/Doctrine/Persistence3/autoload.php',
+        '%{phpdir}/Doctrine/Persistence2/autoload.php',
+    ],
     '%{phpdir}/Doctrine/Common/Annotations/autoload.php',
     '%{phpdir}/Doctrine/Common3/autoload.php',
     [
@@ -361,6 +370,10 @@ cat > bootstrap.php <<'BOOTSTRAP'
 require_once '%{buildroot}%{phpdir}/Doctrine/ORM/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
     [
+        '%{phpdir}/Psr/Log3/autoload.php',
+        '%{phpdir}/Psr/Log2/autoload.php',
+        '%{phpdir}/Psr/Log/autoload.php',
+    ], [
         '%{phpdir}/Symfony6/Component/Cache/autoload.php',
         '%{phpdir}/Symfony5/Component/Cache/autoload.php',
         '%{phpdir}/Symfony4/Component/Cache/autoload.php',
@@ -371,6 +384,9 @@ require_once '%{buildroot}%{phpdir}/Doctrine/ORM/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Performance\\', __DIR__.'/tests/Doctrine/Performance');
 BOOTSTRAP
 
+# test failing only in mock
+rm tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php
+
 : Upstream tests
 RETURN_CODE=0
 for CMDARG in "php %{phpunit}" php74 php80 php81; do
@@ -400,6 +416,11 @@ exit $RETURN_CODE
 
 
 %changelog
+* Wed Apr 20 2022 Remi Collet <remi@remirepo.net> - 2.12.0-1
+- update to 2.12.0
+- raise dependency on doctrine/persistence 2.4 and allow 3
+- raise dependency on doctrine/lexer 1.2.3
+
 * Wed Apr 20 2022 Remi Collet <remi@remirepo.net> - 2.11.3-1
 - update to 2.11.3