[rpms/phpunit9] f44: v9.6.35

[rpms/phpunit9] f44: v9.6.35

[Remi Collet]

A new commit has been pushed.

Repo   : rpms/phpunit9
Branch : f44
Commit : c2b724f139eb030824ab1e7321f60223cc9d8e54
Author : Remi Collet <remi@fedoraproject.org>
Date   : 2026-07-07T07:42:40+02:00
Stats  : +21/-32 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/phpunit9/c/c2b724f139eb030824ab1e7321f60223cc9d8e54?branch=f44

Log:
v9.6.35

---
diff --git a/.gitignore b/.gitignore
index 10762b4..22d5389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@
 /phpunit9-9.6.30-b69489b.tgz
 /phpunit9-9.6.32-492ee10.tgz
 /phpunit9-9.6.34-b36f023.tgz
+/phpunit9-9.6.35.tgz

diff --git a/makesrc.sh b/makesrc.sh
index c85b319..59cf430 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -1,35 +1,27 @@
 #!/bin/bash
 
 NAME=$(basename $PWD)
-DATE=$(sed    -n '/^%global gh_date/{s/.* //;p}'    $NAME.spec)
 OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
 PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
-VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
-COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
-SHORT=${COMMIT:0:7}
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
 
-DATE=$(date -d "$DATE -4 days" +%Y-%m-%d)
-
-if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
-	echo "$NAME-$VERSION-$SHORT.tgz already there"
+if [ -f $NAME-$VERSION.tgz ]; then
+	echo "$NAME-$VERSION.tgz already there"
 else
-	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Date=$DATE\n"
+	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION	\n"
 
 	echo "Cloning..."
-	rm -rf $PROJECT-$COMMIT
-	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
+	rm -rf $PROJECT-$VERSION
+	git clone https://github.com/$OWNER/$PROJECT.git --depth 1 --branch $VERSION $PROJECT-$VERSION || exit 1
 
-	echo "Getting commit..."
-	pushd $PROJECT-$COMMIT
-		git checkout $COMMIT || exit 1
-		cp composer.json ../composer.json
-	popd
+	echo "Getting composer..."
+	cp $PROJECT-$VERSION/composer.json composer.json
 
 	echo "Archiving..."
-	tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+	tar czf $NAME-$VERSION.tgz --exclude-vcs --exclude tools $PROJECT-$VERSION
 
 	echo "Cleaning..."
-	rm -rf $PROJECT-$COMMIT
+	rm -rf $PROJECT-$VERSION
 
 	echo "Done."
 fi

diff --git a/phpunit9.spec b/phpunit9.spec
index 55025f2..6028b0f 100644
--- a/phpunit9.spec
+++ b/phpunit9.spec
@@ -8,9 +8,6 @@
 #
 
 
-%global gh_commit    b36f02317466907a230d3aa1d34467041271ef4a
-%global gh_date      2026-01-27
-%global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phpunit
 # Packagist
@@ -22,17 +19,14 @@
 %global ver_major    9
 %global ver_minor    6
 
-%global upstream_version 9.6.34
-#global upstream_prever  dev
-
 Name:           %{pk_project}%{ver_major}
-Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Version:        9.6.35
 Release:        1%{?dist}
 Summary:        The PHP Unit Testing framework version %{ver_major}
 
 License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        %{name}-%{upstream_version}-%{gh_short}.tgz
+Source0:        %{name}-%{version}.tgz
 Source1:        makesrc.sh
 
 # Fix command for autoload
@@ -73,10 +67,10 @@ BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 # From composer.json, "require": {
 #        "php": ">=7.3",
 #        "ext-dom": "*",
+#        "ext-filter": "*",
 #        "ext-json": "*",
 #        "ext-libxml": "*",
 #        "ext-mbstring": "*",
-#        "ext-xml": "*",
 #        "ext-xmlwriter": "*",
 #        "doctrine/instantiator": "^1.5.0 || ^2",
 #        "myclabs/deep-copy": "^1.13.4",
@@ -104,7 +98,6 @@ Requires:       php-dom
 Requires:       php-json
 Requires:       php-libxml
 Requires:       php-mbstring
-Requires:       php-xml
 Requires:       php-xmlwriter
 Requires:       (php-composer(doctrine/instantiator) >= 1.5.0         with php-composer(doctrine/instantiator) <  3)
 Requires:       (php-composer(myclabs/deep-copy) >= 1.13.4            with php-composer(myclabs/deep-copy) <  2)
@@ -136,6 +129,7 @@ Suggests:       php-xdebug
 Recommends:     phpunit10
 Recommends:     phpunit11
 Recommends:     phpunit12
+Recommends:     phpunit13
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 8.0.0
@@ -145,7 +139,6 @@ Requires:       php-phar
 
 %if 0%{?fedora} >= 39 || 0%{?rhel} >= 10
 Provides:       php-composer(phpunit/phpunit) = %{version}
-Provides:       phpunit                       = %{version}-%{release}
 %endif
 
 
@@ -160,7 +153,7 @@ Documentation: https://phpunit.de/documentation.html
 
 
 %prep
-%setup -q -n %{gh_project}-%{gh_commit}
+%setup -q -n %{gh_project}-%{version}
 %patch -P0 -p0 -b .rpm
 
 find . -name \*.rpm -delete -print
@@ -240,7 +233,7 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php
 sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit
 
 ret=0
-for cmd in php php82 php83 php84 php85; do
+for cmd in php php82 php83 php84 php85 php86; do
   if which $cmd; then
      $cmd ./phpunit $OPT --verbose || ret=1
   fi
@@ -257,6 +250,9 @@ exit $ret
 
 
 %changelog
+* Tue Jul  7 2026 Remi Collet <remi@remirepo.net> - 9.6.35-1
+- update to 9.6.35
+
 * Tue Jan 27 2026 Remi Collet <remi@remirepo.net> - 9.6.34-1
 - update to 9.6.34
 

diff --git a/sources b/sources
index ba34cbb..d683fd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phpunit9-9.6.34-b36f023.tgz) = b01061d7c558af41f0f4942c24f6b096ccfac7c508e30860cc6a67c512d40a6709fd6af9e2108e96cfdc45768a744ac142cb5539b1260e8eb9ba56173e230390
+SHA512 (phpunit9-9.6.35.tgz) = b75bad445aa0e578d17d80fd638c5d7ed52d2aadcc2f8ea280e6cc606a1c44b98bbc9112eb7d54b9c54b3d20ccb967dd6b946a2cd6b512c991bb68f06a2da5fb