From 69761b3edf2f5fa25a1dbe0e5e736587bc0d2a5c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 5 Aug 2022 09:20:08 +0200
Subject: update to 3.0.3

drop dependency on doctrine/collections
---
 composer.json                  |  1 -
 php-doctrine-persistence3.spec | 20 +++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 9918ad4..3e7653f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,6 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "doctrine/collections": "^1.0",
         "doctrine/event-manager": "^1.0",
         "psr/cache": "^1.0 || ^2.0 || ^3.0"
     },
diff --git a/php-doctrine-persistence3.spec b/php-doctrine-persistence3.spec
index ed7a670..3bee6b6 100644
--- a/php-doctrine-persistence3.spec
+++ b/php-doctrine-persistence3.spec
@@ -8,7 +8,7 @@
 #
 
 %global bootstrap    0
-%global gh_commit    25ec98a8cbd1f850e60fdb62c0ef77c162da8704
+%global gh_commit    ac6fce61f037d7e54dbb2435f5b5648d86548e23
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     doctrine
 %global gh_project   persistence
@@ -27,7 +27,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.2
+Version:        3.0.3
 Release:        1%{?dist}
 Summary:        Doctrine Persistence abstractions, version %{major}
 
@@ -57,15 +57,13 @@ BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(doctrine/annotations)   >= 1.7   with php-composer(doctrine/annotations)   < 2)
-BuildRequires: (php-composer(doctrine/collections)   >= 1.0   with php-composer(doctrine/collections)   < 2)
 BuildRequires: (php-composer(doctrine/event-manager) >= 1.0   with php-composer(doctrine/event-manager) < 2)
 BuildRequires: (php-composer(doctrine/common)        >= 3.0   with php-composer(doctrine/common)        < 4)
 BuildRequires: (php-composer(symfony/cache)          >= 4.4   with php-composer(symfony/cache)          < 7)
 BuildRequires: (php-composer(psr/cache)              >= 1.0   with php-composer(psr/cache)              < 2)
-# remirepo:8
+# remirepo:7
 %else
 BuildRequires:  php-doctrine-annotations             >= 1.7
-BuildRequires:  php-doctrine-collections             >= 1.0
 BuildRequires:  php-doctrine-event-manager           >= 1.0
 BuildRequires:  php-doctrine-common3                 >= 3.0
 BuildRequires:  php-symfony4-cache                   >= 4.4
@@ -77,19 +75,16 @@ BuildRequires:  phpunit9 >= 9.5
 
 # From composer.json
 #        "php": "^7.2 || ^8.0"
-#        "doctrine/collections": "^1.0",
 #        "doctrine/event-manager": "^1.0",
 #        "psr/cache": "^1.0 || ^2.0 || ^3.0"
 Requires:       php(language) >= 7.2
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(doctrine/collections)   >= 1.0   with php-composer(doctrine/collections)   < 2)
 Requires:      (php-composer(doctrine/event-manager) >= 1.0   with php-composer(doctrine/event-manager) < 2)
 # ignore v2 and v3
 Requires:      (php-composer(psr/cache)              >= 1.0   with php-composer(psr/cache)              < 2)
-# remirepo:5
+# remirepo:4
 %else
-Requires:       php-doctrine-collections             >= 1.0
 Requires:       php-doctrine-event-manager           >= 1.0
 Requires:       php-psr-cache                        >= 1.0
 %endif
@@ -131,7 +126,6 @@ cat << 'EOF' | tee -a src/%{ns_subproj}%{major}/autoload.php
 // Dependencies
 \Fedora\Autoloader\Dependencies::required([
     '%{_datadir}/php/Psr/Cache/autoload.php',
-    '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Collections/autoload.php',
     '%{_datadir}/php/%{ns_vendor}/%{ns_project}/EventManager/autoload.php',
 ]);
 EOF
@@ -169,7 +163,7 @@ find tests -type f -exec grep -q PHPStan {} \; -delete -print
 
 : Run test suite
 ret=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} \
@@ -193,6 +187,10 @@ exit $ret
 
 
 %changelog
+* Fri Aug  5 2022 Remi Collet <remi@remirepo.net> - 3.0.3-1
+- update to 3.0.3
+- drop dependency on doctrine/collections
+
 * Mon May  9 2022 Remi Collet <remi@remirepo.net> - 3.0.2-1
 - update to 3.0.2
 
-- 
cgit