From 279f6f850c4ccbec9b46f23400e5880232376fa0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 9 Sep 2022 08:08:44 +0200
Subject: update to 3.3.1

---
 composer.json             |  1 +
 php-doctrine-common3.spec | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 1afabad..6e62405 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,7 @@
         "doctrine/persistence": "^2.0 || ^3.0"
     },
     "require-dev": {
+        "doctrine/collections": "^1",
         "phpstan/phpstan": "^1.4.1",
         "phpstan/phpstan-phpunit": "^1",
         "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0",
diff --git a/php-doctrine-common3.spec b/php-doctrine-common3.spec
index 2678437..d6750ec 100644
--- a/php-doctrine-common3.spec
+++ b/php-doctrine-common3.spec
@@ -10,8 +10,8 @@
 
 %global github_owner     doctrine
 %global github_name      common
-%global github_version   3.3.0
-%global github_commit    c824e95d4c83b7102d8bc60595445a6f7d540f96
+%global github_version   3.3.1
+%global github_commit    6a76bd25b1030d35d6ba2bf2f69ca858a41fc580
 %global major            3
 
 %global composer_vendor  doctrine
@@ -25,6 +25,9 @@
 # "doctrine/persistence": "^2.0 || ^3.0"
 %global doctrine_pers_min_ver 2.0
 %global doctrine_pers_max_ver 4
+# "doctrine/collections": "^1",
+%global doctrine_coll_min_ver 1
+%global doctrine_coll_max_ver 2
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -55,9 +58,11 @@ BuildRequires: php(language) >= %{php_min_ver}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver})
-# remirepo:3
+BuildRequires: (php-composer(doctrine/collections) >= %{doctrine_coll_min_ver} with php-composer(doctrine/collections) < %{doctrine_coll_max_ver})
+# remirepo:4
 %else
 BuildRequires: php-doctrine-persistence2
+BuildRequires: php-doctrine-collections
 %endif
 %global phpunit %{_bindir}/phpunit9
 BuildRequires: phpunit9 >= 9.0
@@ -125,13 +130,13 @@ cp -rp lib/%{ns_vendor}/%{ns_project} %{buildroot}%{phpdir}/%{ns_vendor}/%{ns_pr
 %check
 %if %{with_tests}
 : Modify tests init
-sed "s#require.*autoload.*#require_once '%{buildroot}%{phpdir}/%{ns_vendor}/%{ns_project}%{major}/autoload.php';#" \
+sed "s#require.*autoload.*#require_once '%{buildroot}%{phpdir}/%{ns_vendor}/%{ns_project}%{major}/autoload.php'; require_once '%{phpdir}/%{ns_vendor}/Common/Collections/autoload.php';#" \
      -i tests/%{ns_vendor}/Tests/TestInit.php
 
 
 : Upstream tests
 RETURN_CODE=0
-for CMDARG in "php %{phpunit}" php74 php80 php81; do
+for CMDARG in "php %{phpunit}" php74 php80 php81 php82; do
     if which $CMDARG; then
         set $CMDARG
         $1 ${2:-%{_bindir}/phpunit9} --verbose || RETURN_CODE=1
@@ -154,6 +159,9 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri Sep  9 2022 Remi Collet <remi@remirepo.net> - 3.3.1-1
+- update to 3.3.1
+
 * Tue Apr 19 2022 Remi Collet <remi@remirepo.net> - 3.3.0-1
 - update to 3.3.0
 - allow doctrine/persistence v3
-- 
cgit