From e56157fbe526aa255409412ad851a850ea77fea7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 7 May 2020 09:48:04 +0200
Subject: [PATCH] update to 4.0.1 sources from git snapshot switch to phpunit9

---
 .gitignore                         |  1 +
 makesrc.sh                         | 28 ++++++++++++++++++++++++++++
 php-phpunit-php-token-stream4.spec | 19 ++++++++++++-------
 sources                            |  2 +-
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100755 makesrc.sh

diff --git a/.gitignore b/.gitignore
index 9b2ae5b..a3bc911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /php-phpunit-php-token-stream4-4.0.0-b2560a0.tar.gz
+/php-phpunit-php-token-stream4-4.0.1-cdc0db5.tgz
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..4190c13
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/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}
+
+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
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/php-phpunit-php-token-stream4.spec b/php-phpunit-php-token-stream4.spec
index 3843b5e..43d06fb 100644
--- a/php-phpunit-php-token-stream4.spec
+++ b/php-phpunit-php-token-stream4.spec
@@ -8,7 +8,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    b2560a0c33f7710e4d7f8780964193e8e8f8effe
+%global gh_commit    cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-token-stream
@@ -26,13 +26,14 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        4.0.0
+Version:        4.0.1
 Release:        1%{?dist}
 Summary:        Wrapper around PHP tokenizer extension
 
 License:        BSD
 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
 BuildRequires:  php-fedora-autoloader-devel
@@ -43,8 +44,7 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # from composer.json, "require-dev": {
 #        "phpunit/phpunit": "^9.0"
-# TODO test suite passes with v8, switch to v9 when available
-BuildRequires:  phpunit8
+BuildRequires:  phpunit9
 %endif
 
 # from composer.json
@@ -88,10 +88,10 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php73 php74; do
+for cmd in php php73 php74 php80; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
-      %{_bindir}/phpunit8  --verbose || ret=1
+      %{_bindir}/phpunit9  --verbose || ret=1
   fi
 done
 exit $ret
@@ -109,6 +109,11 @@ exit $ret
 
 
 %changelog
+* Wed May  6 2020 Remi Collet <remi@remirepo.net> - 4.0.1-1
+- update to 4.0.1
+- sources from git snapshot
+- switch to phpunit9
+
 * Fri Feb  7 2020 Remi Collet <remi@remirepo.net> - 4.0.0-1
 - update to 4.0.0
 - raise dependency on PHP 7.3
diff --git a/sources b/sources
index c5e2f1e..ba81f0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-token-stream4-4.0.0-b2560a0.tar.gz) = 222415b5c473b2a7d86c5ccba79c87d3a01306ee1c8301f19fd979e824faaaaa3f34f6b374c1ddaf77609d7af68f57af3fe7e93126b3abb65715ce0d3da1ecc1
+SHA512 (php-phpunit-php-token-stream4-4.0.1-cdc0db5.tgz) = 411dd9a9287f2b6d524b72a25f8cd69c554aba272bbee47ad95a28b451024339a33a69d68975c7fa91b5d92cf854421816da2775578ac1bc3afb9e869bf69ddb