enable upstream test suite

(cherry picked from commit d480e2bc12)
update phpunitgoodpractices/polyfill to 1.5.0
2020-12-08 10:07:47 +01:00 · 2020-12-08 08:06:54 +01:00 · 2020-10-20 08:21:46 +02:00
4 changed files with 145 additions and 54 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,4 @@
-/php-phpunitgoodpractices-polyfill-1.0.0-3968a1f.tgz
-/php-phpunitgoodpractices-polyfill-1.1.0-f7c9b77.tgz
-/php-phpunitgoodpractices-traits-1.5.1-10d22ad.tgz
-/php-phpunitgoodpractices-traits-1.6.0-d3d74de.tgz
-/php-phpunitgoodpractices-traits-1.7.0-d7864f7.tgz
-/php-phpunitgoodpractices-polyfill-1.2.0-1613c59.tgz
-/php-phpunitgoodpractices-traits-1.8.0-7bdb460.tgz
+clog
+/php-phpunitgoodpractices-traits-1.9.1-1f56f64.tgz
+/php-phpunitgoodpractices-polyfill-1.5.0-b87c59f.tgz
+/php-sanmai-phpunit-legacy-adapter-8.1-464c750.tgz
--- a/makesrc.sh
+++ b/makesrc.sh
@ -8,21 +8,24 @@ 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"
+if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
+	echo "$PROJECT Skipped"
+else
+	echo "Cloning..."
+	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT

-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-polyfill.json
+	popd

-echo "Getting commit..."
-pushd $PROJECT-$COMMIT
-git checkout $COMMIT
-cp composer.json ../composer-polyfill.json
-popd
+	echo "Archiving..."
+	tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT

-echo "Archiving..."
-tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
-
-echo "Cleaning..."
-rm -rf $PROJECT-$COMMIT
+	echo "Cleaning..."
+	rm -rf $PROJECT-$COMMIT
+fi

 PROJECT=Traits
 VERSION=$(sed -n '/^%global tr_version/{s/.* //;p}' $NAME.spec)
@ -30,22 +33,54 @@ COMMIT=$(sed  -n '/^%global tr_commit/{s/.* //;p}'  $NAME.spec)
 SHORT=${COMMIT:0:7}
 NAME=php-phpunitgoodpractices-traits

-echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
+	echo "$PROJECT Skipped"
+else
+	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"

-echo "Cloning..."
-git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+	echo "Cloning..."
+	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT

-echo "Getting commit..."
-pushd $PROJECT-$COMMIT
-git checkout $COMMIT
-cp composer.json ../composer-traits.json
-popd
+	echo "Getting commit..."
+	pushd $PROJECT-$COMMIT
+		git checkout $COMMIT || exit 1
+		cp composer.json ../composer-traits.json
+	popd

-echo "Archiving..."
-tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+	echo "Archiving..."
+	tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT

-echo "Cleaning..."
-rm -rf $PROJECT-$COMMIT
+	echo "Cleaning..."
+	rm -rf $PROJECT-$COMMIT
+fi

+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global lg_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global lg_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^%global lg_version/{s/.* //;p}' $NAME.spec)
+COMMIT=$(sed  -n '/^%global lg_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+NAME=php-$OWNER-$PROJECT
+
+if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
+	echo "$PROJECT Skipped"
+else
+	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\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-legacy.json
+	popd
+
+	echo "Archiving..."
+	tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+
+	echo "Cleaning..."
+	rm -rf $PROJECT-$COMMIT
+fi

 echo "Done."
--- a/php-phpunitgoodpractices-polyfill.spec
+++ b/php-phpunitgoodpractices-polyfill.spec
@ -1,15 +1,17 @@
 # remirepo/fedora spec file for php-phpunitgoodpractices-polyfill
 #
-# Copyright (c) 2018 Remi Collet
+# Copyright (c) 2018-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #

+%bcond_without       tests
+
 # Polyfill
 # https://github.com/PHPUnitGoodPractices/polyfill/releases
-%global gh_commit    1613c59be473c6b238c119607de820b9274c81fd
+%global gh_commit    b87c59f0d3df764d0dcf8154e18be69fe6cb5cba
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     PHPUnitGoodPractices
 %global gh_project   polyfill
@ -20,16 +22,22 @@
 %global ns_vendor    PHPUnitGoodPractices
 %global ns_project   Polyfill
 %global php_home     %{_datadir}/php
-%global with_tests   0%{!?_without_tests:1}
 # Traits
 # https://github.com/PHPUnitGoodPractices/Traits/releases
-%global tr_commit    7bdb460da0f9d4cfa2f11ca1ecb69a6d7f126925
+%global tr_commit    1f56f643aaa3e98f22acf71129109479afb9ef33
 %global tr_short     %(c=%{tr_commit}; echo ${c:0:7})
-%global tr_version   1.8.0
+%global tr_version   1.9.1
+# Legacy
+# https://github.com/sanmai/phpunit-legacy-adapter/releases
+%global lg_owner     sanmai
+%global lg_project   phpunit-legacy-adapter
+%global lg_commit    464c7505c15c487239ac696a82097c765f38a2a1
+%global lg_short     %(c=%{lg_commit}; echo ${c:0:7})
+%global lg_version   8.1

 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.2.0
-Release:        3%{?dist}
+Version:        1.5.0
+Release:        2%{?dist}
 Summary:        Lacking future-compat polyfills for PHPUnit

 License:        MIT
@ -37,30 +45,44 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to get upstream test suite (none for now)
 Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        php-%{pk_vendor}-traits-%{tr_version}-%{tr_short}.tgz
-Source2:        makesrc.sh
+Source2:        php-%{lg_owner}-%{lg_project}-%{lg_version}-%{lg_short}.tgz
+Source3:        makesrc.sh

 BuildArch:      noarch
-%if %{with_tests}
+%if %{with tests}
 # For tests
 BuildRequires:  php(language) >= 5.5
-BuildRequires:  %{_bindir}/phpunit
-# From composer.json,     "require-dev": {
-#        "friendsofphp/php-cs-fixer": "^2.11"
+%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+%global phpunit %{_bindir}/phpunit9
+%else
+%global phpunit %{_bindir}/phpunit8
+%endif
+BuildRequires: %{phpunit}
+# From polyfill, composer.json,     "require-dev": {
+#        "friendsofphp/php-cs-fixer": "^2",
+#        "php-coveralls/php-coveralls": "^2.4"
+# From traits, composer.json,     "require-dev": {
+#        "phpunitgoodpractices/polyfill": "^1.1",
+#        "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0"
+%endif
+BuildRequires:  php-cli
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
-%endif

-# From composer.json,     "require": {
-#        "php": "^5.5 || ^7.0",
-#        "phpunit/phpunit": ""~4.0.0 || ~4.1.0 || ~4.2.0 || ~4.3.0 || ~4.4.0 || ~4.5.0 || ~4.6.0 || ~4.8.0 || ~5.3.0 || ~5.4.0 || ~5.5.0 || ~5.6.0 || ~5.7.0 || ~6.0.0 || ~6.1.0 || ~6.2.0 || ~6.3.0 || ~6.4.0 || ~6.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.6 || ~7.3.0 || ~7.4.0 || ~7.5.0"
+# From polyfill, composer.json,     "require": {
+#        "php": "^5.5 || ^7.0 || ^8.0",
+#        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.0 || ^9.0"
+# From traits, composer.json,     "require": {
+#        "php": "^5.5 || ^7.0 || ^8.0",
+#        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ~8.5 || ~9.4"
 Requires:       php(language) >= 5.5
-Requires:      (phpunit8 or phpunit7 or phpunit6 or php-phpunit-PHPUnit)
-# From phpcompatinfo report for version 1.0.0
+Requires:      (phpunit9 or phpunit8 or phpunit7 or phpunit6 or php-phpunit-PHPUnit)
+# From phpcompatinfo report for version polyfill 1.5.0 and traits 1.9.1
 # nothing
 # Autoloader
 Requires:       php-composer(fedora/autoloader)

-Provides:       php-%{pk_vendor}-traits = %{tr_version}
+Provides:       php-%{pk_vendor}-traits = %{tr_version}-%{release}
 Provides:       php-composer(%{pk_vendor}/traits) = %{tr_version}
 Provides:       php-composer(%{pk_vendor}/%{pk_project}) = %{version}

@ -72,13 +94,15 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}/autoload.php


 %prep
-%setup -q -n %{gh_project}-%{gh_commit} -a 1
+%setup -q -n %{gh_project}-%{gh_commit} -a 1 -a 2
 mv composer.json composer-polyfill.json
 mv LICENSE LICENSE-polyfill

 mv Traits-%{tr_commit}/src           src2
 mv Traits-%{tr_commit}/composer.json composer-traits.json
 mv Traits-%{tr_commit}/LICENSE       LICENSE-traits
+mv Traits-%{tr_commit}/tests         tests/Traits
+mv %{lg_project}-%{lg_commit}/src    src3

 cat << 'EOF' | tee src/autoload.php
 <?php
@ -88,6 +112,7 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php';
 if (!class_exists('PHPUnit\\Framework\\TestCase')) { // Call outside of phpunit command
    \Fedora\Autoloader\Dependencies::required([
        [
+            '%{php_home}/PHPUnit9/autoload.php',
            '%{php_home}/PHPUnit8/autoload.php',
            '%{php_home}/PHPUnit7/autoload.php',
            '%{php_home}/PHPUnit6/autoload.php',
@ -113,7 +138,6 @@ cp -pr src2 %{buildroot}%{php_home}/%{ns_vendor}/Traits


 %check
-%if %{with_tests}
 : Minimal check for our autoloader
 php -r '
 require "%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php";
@ -127,6 +151,29 @@ if (!class_exists("PHPUnitGoodPractices\\Traits\\PHPUnitVersionRetriever")) {
   exit(1);
 }
 '
+
+%if %{with tests}
+: Upstream test suite
+mkdir vendor
+cat << 'EOF' | tee vendor/autoload.php
+<?php
+require '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php';
+require dirname(__DIR__) . '/src3/TestCase.php';
+\Fedora\Autoloader\Autoload::addPsr4('PHPUnitGoodPractices\\Traits\\Tests\\', dirname(__DIR__) . '/tests/Traits');
+EOF
+
+ret=0
+for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80
+do
+  if which $cmdarg; then
+    set $cmdarg
+    $1 ${2:-%{_bindir}/phpunit9} \
+      --filter '^((?!(testThatThereIsProperPHPUnitInComposer)).)*$' \
+      --verbose || ret=1
+  fi
+done
+
+exit $ret
 %else
 : Test suite disabled
 %endif
@ -142,6 +189,17 @@ if (!class_exists("PHPUnitGoodPractices\\Traits\\PHPUnitVersionRetriever")) {


 %changelog
+* Tue Dec  8 2020 Remi Collet <remi@remirepo.net> - 1.5.0-2
+- enable upstream test suite
+
+* Tue Dec  8 2020 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update phpunitgoodpractices/polyfill to 1.5.0
+
+* Tue Oct 20 2020 Remi Collet <remi@remirepo.net> - 1.4.0-1
+- update phpunitgoodpractices/polyfill to 1.4.0
+- update phpunitgoodpractices/traits to 1.9.1
+- allow PHPUnit 9
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

--- a/5
+++ b/5
@ -1,2 +1,3 @@
-SHA512 (php-phpunitgoodpractices-polyfill-1.2.0-1613c59.tgz) = 2c2494f948a3fb235c474fbcb7d70530a06c5973f1616aa0291094dc197ca42874aeee38563479d8e538f4fbebcebc84da114db2a51b4593f129913e14409afb
-SHA512 (php-phpunitgoodpractices-traits-1.8.0-7bdb460.tgz) = 00e74a5fc639e718370d238259d2e3727197d5893e91915082eab83776b1d76682e62157fd873eb383e312182a8ca1e3093fe547d3e34fd6ef6d9632768bd289
+SHA512 (php-phpunitgoodpractices-polyfill-1.5.0-b87c59f.tgz) = 4f5ba02c41ea6c9bb0865e1103280b6c73d34b67fcc0b74debd24ed95aad7735f6d53fcd2c165f3c8e462e25d695580d250a9525103ad796942ee44ba1e773fd
+SHA512 (php-phpunitgoodpractices-traits-1.9.1-1f56f64.tgz) = f80bd879abf7d9a474241cd43c30e817ef1c2db7f9669f02c57b7d9ac8e971ad7a0c05dafa59932b27d8d03a0a345794cfedfac1504985eed047611b8eb6291a
+SHA512 (php-sanmai-phpunit-legacy-adapter-8.1-464c750.tgz) = 4f5704608294fdecdbc5345fba88471d13cd33156f0c5c27287413087fce74a2ebc7dbb6f0ad67563e950312f315012597ae03fda8cdad2396dd50905002f688
Author	SHA1	Message	Date
Remi Collet	b316f612b9	enable upstream test suite (cherry picked from commit `d480e2bc12`)	2020-12-08 10:07:47 +01:00
Remi Collet	599cc037da	update phpunitgoodpractices/polyfill to 1.5.0 (cherry picked from commit `2d17417a27`)	2020-12-08 08:06:54 +01:00
Remi Collet	35f1c2b6d0	update phpunitgoodpractices/polyfill to 1.4.0 update phpunitgoodpractices/traits to 1.9.1 allow PHPUnit 9 (cherry picked from commit `85c6159b42`)	2020-10-20 08:21:46 +02:00