summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-04-25 11:25:16 +0200
committerRemi Collet <remi@php.net>2022-04-25 11:25:16 +0200
commitca295797f4ed0a99ce270a0301565734ef54c508 (patch)
tree0a38134bed55ee2a7242cf0527e0d37d63a56e49
parent7438ebe9252e5483b312a8b5eb3822741128136c (diff)
update to 2.6.3HEADmaster
allow doctrine/persistence v3
-rw-r--r--composer.json2
-rw-r--r--php-doctrine-doctrine-bundle2.spec16
2 files changed, 12 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index d2cf2aa..7855f1c 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
"doctrine/annotations": "^1",
"doctrine/cache": "^1.11 || ^2.0",
"doctrine/dbal": "^2.13.1|^3.3.2",
- "doctrine/persistence": "^2.2",
+ "doctrine/persistence": "^2.2|^3",
"doctrine/sql-formatter": "^1.0.1",
"symfony/cache": "^4.3.3|^5.0|^6.0",
"symfony/config": "^4.4.3|^5.0|^6.0",
diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec
index 8209b34..71395d9 100644
--- a/php-doctrine-doctrine-bundle2.spec
+++ b/php-doctrine-doctrine-bundle2.spec
@@ -13,8 +13,8 @@
%global github_owner doctrine
%global github_name DoctrineBundle
-%global github_version 2.6.2
-%global github_commit 53cf797feda995299629bed081ffb51776f36e9f
+%global github_version 2.6.3
+%global github_commit 527970d22b8ca6472ebd88d7c42e512550bd874e
%global major 2
%global composer_vendor doctrine
@@ -34,9 +34,9 @@
# "doctrine/dbal": "^2.13.1|^3.3.2"
%global dbal_min_ver 2.13.1
%global dbal_max_ver 4
-# "doctrine/persistence": "^2.2",
+# "doctrine/persistence": "^2.2|^3",
%global persistence_min_ver 2.2
-%global persistence_max_ver 3
+%global persistence_max_ver 4
# "doctrine/orm": "~2.10 || ^3.0"
%global orm_min_ver 2.10
%global orm_max_ver 4
@@ -284,8 +284,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
], [
'%{phpdir}/Doctrine/DBAL3/autoload.php',
'%{phpdir}/Doctrine/DBAL/autoload.php',
+ ], [
+ '%{phpdir}/Doctrine/Persistence3/autoload.php',
+ '%{phpdir}/Doctrine/Persistence2/autoload.php',
],
- '%{phpdir}/Doctrine/Persistence2/autoload.php',
'%{phpdir}/Doctrine/SqlFormatter/autoload.php',
[
'%{phpdir}/Symfony/Contracts3/autoload.php',
@@ -386,6 +388,10 @@ exit $RETURN_CODE
%changelog
+* Mon Apr 25 2022 Remi Collet <remi@remirepo.net> - 2.6.3-1
+- update to 2.6.3
+- allow doctrine/persistence v3
+
* Mon Apr 11 2022 Remi Collet <remi@remirepo.net> - 2.6.2-1
- update to 2.6.2