v3.2.1

(cherry picked from commit f2677171d7)

.gitignore

@@ -1,2 +1,4 @@
 /php-zumba-json-serializer-3.0.1-d91d5a2.tar.gz
 /php-zumba-json-serializer-3.0.2-421dcdd.tar.gz
+/php-zumba-json-serializer-3.2.0-9378616.tgz
+/php-zumba-json-serializer-3.2.1-c869bcb.tgz

makesrc.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
+	echo "skip $NAME-$VERSION-$SHORT.tgz already here"
+else
+	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n"
+
+	echo "Cloning..."
+	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+	echo "Getting commit..."
+	pushd $PROJECT-$COMMIT
+		git checkout $COMMIT || exit 1
+		cp composer.json ../composer.json
+	popd
+
+	echo "Archiving..."
+	tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT
+
+	echo "Cleaning..."
+	rm -rf $PROJECT-$COMMIT
+fi
+
+echo "Done."
+

php-zumba-json-serializer.spec

@@ -1,7 +1,7 @@
 # remirepo/fedora spec file for php-zumba-json-serializer
 #
-# Copyright (c) 2021-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2021-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -9,7 +9,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    421dcdd53d4b333303d984e9ebec557d3e37783b
+%global gh_commit    c869bcb7f934f785d69c978f7d0479b54bbe0cfa
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zumba
 %global gh_project   json-serializer
@@ -18,13 +18,14 @@
 %global major        %nil
 
 Name:           php-%{gh_owner}-%{gh_project}%{major}
-Version:        3.0.2
-Release:        2%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        Serialize PHP variables
 
 License:        MIT
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{?gh_short}.tar.gz
+Source0:        %{name}-%{version}-%{?gh_short}.tgz
+Source1:        makesrc.sh
 
 BuildArch:      noarch
 %if %{with tests}
@@ -36,9 +37,9 @@ BuildRequires:  php-pcre
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
 # For tests, from composer.json "require-dev": {
-#        "phpunit/phpunit": ">=6.0 <10.0"
-BuildRequires:  phpunit9
-%global phpunit %{_bindir}/phpunit9
+#        "phpunit/phpunit": ">=6.0 <11.0"
+BuildRequires:  phpunit10
+%global phpunit %{_bindir}/phpunit10
 %endif
 # For autoloader
 BuildRequires:  php-fedora-autoloader-devel
@@ -94,13 +95,14 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload
 EOF
 
 ret=0
-for cmdarg in "php %{phpunit}" php80 php81 php82; do
+# ignore testS relying on SuperClosure (deprecated and removed from repo)
+for cmdarg in "php %{phpunit}" "php80 %{_bindir}/phpunit9" php81 php82 php83; do
    if which $cmdarg; then
       set $cmdarg
-      $1 ${2:-%{_bindir}/phpunit9} \
+      $1 ${2:-%{_bindir}/phpunit10} \
           --bootstrap vendor/autoload.php \
-          --no-coverage \
-          --verbose || ret=1
+          --filter '^((?!(testAddSerializer|testGetPreferredSerializer|testSerialize|testUnserialize)).)*$' \
+          --no-coverage || ret=1
    fi
 done
 exit $ret
@@ -118,6 +120,14 @@ exit $ret
 
 
 %changelog
+* Thu Oct 19 2023 Remi Collet <remi@remirepo.net> - 3.2.1-1
+- update to 3.2.1
+
+* Tue Sep 26 2023 Remi Collet <remi@remirepo.net> - 3.2.0-1
+- update to 3.2.0
+- sources from git snapshot
+- switch to phpunit10
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (php-zumba-json-serializer-3.0.2-421dcdd.tar.gz) = a22a70f104ce6a37b639950364e27d09efc31ab7c1ad6505b6fb993ead7ae22ea75dfd2542178a39f6543b38bc41d3c5f6eba7967d12a6e24c755bb8ed02cf9b
+SHA512 (php-zumba-json-serializer-3.2.1-c869bcb.tgz) = 1c7a4bb21203b65fd51f7024b0458efe95930fc32e44722ef4d85eda20e664e8f1c641057429eadad1d94cbccd91185b93efa07414b16b401ebe4c79f76cdb85