From 097ada69a899d90a90916adc22f6970ba0b5f76a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 2 Dec 2021 09:27:34 +0100
Subject: update to 2.5.2
allow symfony/contracts 3
---
composer.json | 2 +-
php-doctrine-doctrine-bundle2.spec | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/composer.json b/composer.json
index b5db700..c584b48 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/doctrine-bridge": "^4.4.22|^5.2.7|^6.0",
"symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0|^6.0",
- "symfony/service-contracts": "^1.1.1|^2.0"
+ "symfony/service-contracts": "^1.1.1|^2.0|^3"
},
"require-dev": {
"doctrine/coding-standard": "^9.0",
diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec
index 0608f59..7588cd0 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.5.1
-%global github_commit 511d22bf801fc094bdce9c7b3a238d0d1e8d9512
+%global github_version 2.5.2
+%global github_commit 5b77477ba2981a00b423d1bb17084b87eb57a4a5
%global major 2
%global composer_vendor doctrine
@@ -55,10 +55,10 @@
%global symfony_min_ver 4.3.7
%global symfony_max_ver 6
%global symfony_br_ver %{symfony_min_ver}
-# "symfony/service-contracts": "^1.1.1|^2.0",
+# "symfony/service-contracts": "^1.1.1|^2.0|^3",
# "symfony/deprecation-contracts": "^2.1|^3",
%global contracts_min_ver 2.1
-%global contracts_max_ver 3
+%global contracts_max_ver 4
# "twig/twig": "^1.34|^2.12|^3.0"
%global twig_min_ver 1.34
%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
@@ -279,8 +279,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
],
'%{phpdir}/Doctrine/Persistence2/autoload.php',
'%{phpdir}/Doctrine/SqlFormatter/autoload.php',
- '%{phpdir}/Symfony/Contracts2/autoload.php',
[
+ '%{phpdir}/Symfony/Contracts3/autoload.php',
+ '%{phpdir}/Symfony/Contracts2/autoload.php',
+ ],[
'%{phpdir}/Symfony6/Bridge/Doctrine/autoload.php',
'%{phpdir}/Symfony5/Bridge/Doctrine/autoload.php',
'%{phpdir}/Symfony4/Bridge/Doctrine/autoload.php',
@@ -367,6 +369,10 @@ exit $RETURN_CODE
%changelog
+* Thu Dec 2 2021 Remi Collet <remi@remirepo.net> - 2.5.2-1
+- update to 2.5.2
+- allow symfony/contracts 3
+
* Tue Nov 30 2021 Remi Collet <remi@remirepo.net> - 2.5.1-1
- update to 2.5.1
--
cgit