From e8dd654ff42882eddd26460baaf36cfa1a40689d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 3 Mar 2022 11:22:38 +0100
Subject: [PATCH] update to 1.10.3

switch to phpunit9 and doctrine/common v3

(cherry picked from commit 911c99320594aa5e07f9915432d212bb1ea0ad30)
---
 .gitignore                 |  1 +
 php-myclabs-deep-copy.spec | 36 +++++++++++++++++++++---------------
 sources                    |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8d0a74..acc0c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ clog
 /php-myclabs-deep-copy-1.10.0-5796d12.tgz
 /php-myclabs-deep-copy-1.10.1-969b211.tgz
 /php-myclabs-deep-copy-1.10.2-776f831.tgz
+/php-myclabs-deep-copy-1.10.3-c6a951b.tgz
diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec
index 13147ac..627872f 100644
--- a/php-myclabs-deep-copy.spec
+++ b/php-myclabs-deep-copy.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for php-myclabs-deep-copy
 #
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    776f831124e9c62e1a2c601ecc52e776d8bb7220
+%global gh_commit    c6a951b75d684fd43fbbd69617488e1e2e8924ba
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     myclabs
 %global gh_project   DeepCopy
@@ -16,8 +16,8 @@
 %bcond_without       tests
 
 Name:           php-myclabs-deep-copy%{major}
-Version:        1.10.2
-Release:        2%{?dist}
+Version:        1.10.3
+Release:        1%{?dist}
 
 Summary:        Create deep copies (clones) of your objects
 
@@ -35,12 +35,12 @@ BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "doctrine/collections": "^1.0",
-#        "doctrine/common": "^2.6",
-#        "phpunit/phpunit": "^7.1"
-BuildRequires: (php-composer(doctrine/collections) >= 1.0   with php-composer(doctrine/collections) < 2)
-BuildRequires: (php-composer(doctrine/common)      >= 2.6   with php-composer(doctrine/common)      < 3)
-BuildRequires:  phpunit7 >= 7.1
+#        "doctrine/collections": "^1.6.8",
+#        "doctrine/common": "^2.13.3 || ^3.2.2",
+#        "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
+BuildRequires: (php-composer(doctrine/collections) >= 1.6.8 with php-composer(doctrine/collections) < 2)
+BuildRequires: (php-composer(doctrine/common)      >= 3.2.2 with php-composer(doctrine/common)      < 4)
+BuildRequires:  phpunit9 >= 9.5.13
 # Required by autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 %endif
@@ -87,15 +87,17 @@ cat << 'EOF' | tee vendor/autoload.php
 require '%{buildroot}%{php_home}/%{gh_project}%{major}/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('DeepCopy\\', dirname(__DIR__).'/fixtures/');
 \Fedora\Autoloader\Autoload::addPsr4('DeepCopyTest\\', dirname(__DIR__).'/tests/DeepCopyTest/');
-require_once '%{php_home}/Doctrine/Common/Collections/autoload.php';
-require_once '%{php_home}/Doctrine/Common/autoload.php';
+\Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/Doctrine/Common/Collections/autoload.php',
+    '%{php_home}/Doctrine/Common3/autoload.php',
+]);
 EOF
 
 ret=0
-for cmd in php php72 php73 php74 php80; do
+for cmd in php php74 php80 php81; do
   if which $cmd; then
-    $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{gh_project}%{major}/autoload.php \
-         %{_bindir}/phpunit7 --verbose || ret=1
+    $cmd -d auto_prepend_file=vendor/autoload.php \
+         %{_bindir}/phpunit9 --verbose || ret=1
   fi
 done
 exit $ret
@@ -112,6 +114,10 @@ exit $ret
 
 
 %changelog
+* Thu Mar  3 2022 Remi Collet <remi@remirepo.net> - 1.10.3-1
+- update to 1.10.3
+- switch to phpunit9 and doctrine/common v3
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index b9859c1..2a5c574 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-myclabs-deep-copy-1.10.2-776f831.tgz) = 36ab08122c8762fc9417f137739e0a86a3c35be4a4ba95f3c043f044e19f91cabd5a1c31239ea01b884d8064418fcd5df752e5e8576fc3b39970765af1dddfc1
+SHA512 (php-myclabs-deep-copy-1.10.3-c6a951b.tgz) = cf80d479fe06609b725d80180a0131bb6b6fe8170d424e43a14d1e7464b87dc6de229e8e064f2790591f8c5064e878cf3623a11e21b1779d8002cae020791b1f