From 00f7b7d24955766a9a15ca265d00954da1f03ad7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 17 Nov 2023 16:14:09 +0100
Subject: [PATCH] v3.10.5

(cherry picked from commit fbe108193989d12e44150d47d7160f62b7336ac4)
---
 .gitignore                  |  1 +
 php-swaggest-json-diff.spec | 29 ++++++++++++++++++++---------
 sources                     |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 980ca25..3b9423b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /php-swaggest-json-diff-3.10.1-b9da3c5.tgz
 /php-swaggest-json-diff-3.10.3-02df617.tgz
 /php-swaggest-json-diff-3.10.4-f4e5117.tgz
+/php-swaggest-json-diff-3.10.5-17bfc66.tgz
diff --git a/php-swaggest-json-diff.spec b/php-swaggest-json-diff.spec
index 907b044..3442d2a 100644
--- a/php-swaggest-json-diff.spec
+++ b/php-swaggest-json-diff.spec
@@ -1,7 +1,7 @@
 # remirepo/fedora spec file for php-swaggest-json-diff
 #
-# Copyright (c) 2019-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2019-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -10,7 +10,7 @@
 %bcond_without       tests
 
 # Github
-%global gh_commit    f4e511708060ff7511a3743fab4aa484a062bcfb
+%global gh_commit    17bfc66b330f46e12a7e574133497a290cd79ba5
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     swaggest
 %global gh_project   json-diff
@@ -23,8 +23,8 @@
 %global major        %nil
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.10.4
-Release:        2%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
+Version:        3.10.5
+Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        JSON diff/rearrange/patch/pointer library for PHP
 
 License:        MIT
@@ -37,8 +37,8 @@ BuildArch:      noarch
 BuildRequires:  php-json
 # For tests, from composer.json "require-dev": {
 #    "phpunit/phpunit": "4.8.37"
-BuildRequires:  php-composer(phpunit/phpunit) >= 4.8.37
-%global phpunit %{_bindir}/phpunit
+BuildRequires:  phpunit9
+%global phpunit %{_bindir}/phpunit9
 BuildRequires:  php-filter
 BuildRequires:  php-pcre
 # For autoloader
@@ -86,12 +86,19 @@ cat << 'EOF' | tee vendor/autoload.php
 <?php
 require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Tests\\', dirname(__DIR__).'/tests');
+
+class PHPUnit_Framework_TestCase extends \PHPUnit\Framework\Testcase {
+	function setExpectedException($e, $m) {
+		$this->expectException($e);
+		$this->expectExceptionMessage($m);
+	}
+}
 EOF
 
 ret=0
-for cmd in php php74 php80 php81 php82; do
+for cmd in php php80 php81 php82 php83; do
    if which $cmd; then
-      $cmd %{phpunit} --no-coverage --verbose || ret=1
+      $cmd %{phpunit} --no-coverage || ret=1
    fi
 done
 exit $ret
@@ -110,6 +117,10 @@ exit $ret
 
 
 %changelog
+* Fri Nov 17 2023 Remi Collet <remi@remirepo.net> - 3.10.5-1
+- update to 3.10.5
+- switch to phpunit9
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 6c9d1df..b8da76d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-swaggest-json-diff-3.10.4-f4e5117.tgz) = f576474415cd151ee78d4931755d978d971b7c30ed6ebf0652f8ad0cb7ff1666d1fc562a2ee7cf8d373941bb8ad35e0b1593693dddd0a09f8a351c46944da569
+SHA512 (php-swaggest-json-diff-3.10.5-17bfc66.tgz) = b14770ab682a55f675448ebfbe50f713bbd8b74ab741482892c3cd10a9f64ded4e52a7670fc1a20c72fb2a96840f3c16727f65f4e14a86bffa40a71143e8432b