diff --git a/.gitignore b/.gitignore index b92028a..cd49b53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1 @@ /php-yoast-phpunit-polyfills-0.2.0-c48e4cf.tgz -/php-yoast-phpunit-polyfills-1.0.0-5d257d5.tgz -/php-yoast-phpunit-polyfills-1.0.1-f014fb2.tgz -/php-yoast-phpunit-polyfills-1.0.2-1a582ab.tgz -/php-yoast-phpunit-polyfills-1.0.3-5ea3536.tgz -/php-yoast-phpunit-polyfills-1.0.4-3c621ff.tgz -/php-yoast-phpunit-polyfills-1.0.5-3b59ade.tgz -/php-yoast-phpunit-polyfills-1.1.1-a0f7d70.tgz -/php-yoast-phpunit-polyfills-2.0.1-4a088f1.tgz -/php-yoast-phpunit-polyfills-3.0.0-19e6d5f.tgz -/php-yoast-phpunit-polyfills-3.1.0-59b3f8f.tgz -/php-yoast-phpunit-polyfills-4.0.0-134921b.tgz diff --git a/php-yoast-phpunit-polyfills-layout.patch b/php-yoast-phpunit-polyfills-layout.patch new file mode 100644 index 0000000..637d51b --- /dev/null +++ b/php-yoast-phpunit-polyfills-layout.patch @@ -0,0 +1,11 @@ +diff -up ./phpunitpolyfills-autoload.php.rpm ./phpunitpolyfills-autoload.php +--- ./phpunitpolyfills-autoload.php.rpm 2020-11-26 07:45:13.798777427 +0100 ++++ ./phpunitpolyfills-autoload.php 2020-11-26 07:45:29.603748277 +0100 +@@ -88,7 +88,6 @@ if ( \class_exists( 'Yoast\PHPUnitPolyfi + default: + $file = \realpath( + __DIR__ . \DIRECTORY_SEPARATOR +- . 'src' . \DIRECTORY_SEPARATOR + . \strtr( \substr( $class, 23 ), '\\', \DIRECTORY_SEPARATOR ) . '.php' + ); + diff --git a/php-yoast-phpunit-polyfills.spec b/php-yoast-phpunit-polyfills.spec index 6c0b64f..7249aff 100644 --- a/php-yoast-phpunit-polyfills.spec +++ b/php-yoast-phpunit-polyfills.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-yoast-phpunit-polyfills # -# SPDX-FileCopyrightText: Copyright 2020-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2020 Remi Collet +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please preserve changelog entries # # Github -%global gh_commit 134921bfca9b02d8f374c48381451da1d98402f9 +%global gh_commit c48e4cf0c44b2d892540846aff19fb0468627bab %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner Yoast %global gh_project PHPUnit-Polyfills @@ -18,41 +18,46 @@ %global ns_vendor Yoast %global ns_project PHPUnitPolyfills # don't change major version used in package name -%global major 4 +%global major %nil %bcond_without tests %global php_home %{_datadir}/php -Name: php-%{pk_vendor}-%{pk_project} -Version: 4.0.0 -Release: 2%{?dist} -Summary: Set of polyfills for changed PHPUnit functionality, version %{major} +Name: php-%{pk_vendor}-%{pk_project}%{major} +Version: 0.2.0 +Release: 1%{?dist} +Summary: Set of polyfills for changed PHPUnit functionality -License: BSD-3-Clause +License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} # git snapshot to get upstream test suite Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +# autoloader relocated in src tree +Patch0: %{name}-layout.patch + BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 5.5 BuildRequires: php-reflection # From composer.json, "require-dev": { -# "yoast/yoastcs": "^2.3.0" -%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10 -BuildRequires: phpunit12 -BuildRequires: phpunit11 -%endif -# phpunit10 is not supported +# "php-parallel-lint/php-parallel-lint": "^1.2.0", +# "php-parallel-lint/php-console-highlighter": "^0.5", +# "yoast/yoastcs": "^2.1.0" +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 BuildRequires: phpunit9 -BuildRequires: phpunit8 %endif +BuildRequires: phpunit8 +BuildRequires: phpunit7 +BuildRequires: phpunit6 +BuildRequires: phpunit BuildRequires: php-fedora-autoloader-devel +%endif # From composer.json, "require": { -# "php": ">=7.1", -# "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0 || ^11.0 || ^12.0" -Requires: php(language) >= 7.1 +# "php": ">=5.5", +# "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0" +Requires: php(language) >= 5.5 # from phpcompatinfo report on version 0.2.0 Requires: php-reflection @@ -70,6 +75,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %setup -q -n %{gh_project}-%{gh_commit} # Fix for RPM layout +%patch0 -p1 -b .rpm sed -e 's:src/::' phpunitpolyfills-autoload.php > src/autoload.php @@ -95,31 +101,38 @@ EOF : Run upstream test suite ret=0 -if [ -x %{_bindir}/phpunit8 ]; then - for cmd in php php81 php82 php83; do +if [ -x %{_bindir}/phpunit ]; then + for cmd in php php71 php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit8 --no-coverage || ret=1 + $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1 + fi + done +fi +if [ -x %{_bindir}/phpunit6 ]; then + for cmd in php php71 php72 php73 php74; do + if which $cmd; then + $cmd %{_bindir}/phpunit6 --no-coverage --verbose || ret=1 + fi + done +fi +if [ -x %{_bindir}/phpunit7 ]; then + for cmd in php php71 php72 php73 php74; do + if which $cmd; then + $cmd %{_bindir}/phpunit7 --no-coverage --verbose || ret=1 + fi + done +fi +if [ -x %{_bindir}/phpunit8 ]; then + for cmd in php php72 php73 php74; do + if which $cmd; then + $cmd %{_bindir}/phpunit8 --no-coverage --verbose || ret=1 fi done fi if [ -x %{_bindir}/phpunit9 ]; then - for cmd in php php81 php82 php83 php84; do + for cmd in php php73 php74 php80; do if which $cmd; then - $cmd %{_bindir}/phpunit9 --no-coverage || ret=1 - fi - done -fi -if [ -x %{_bindir}/phpunit11 ]; then - for cmd in php php82 php83 php84; do - if which $cmd; then - $cmd %{_bindir}/phpunit11 --no-coverage || ret=1 - fi - done -fi -if [ -x %{_bindir}/phpunit12 ]; then - for cmd in php php83 php84; do - if which $cmd; then - $cmd %{_bindir}/phpunit11 --no-coverage || ret=1 + $cmd %{_bindir}/phpunit9 --no-coverage --verbose || ret=1 fi done fi @@ -136,81 +149,5 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 4.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Feb 10 2025 Remi Collet - 4.0.0-1 -- update to 4.0.0 -- move to /usr/share/php/Yoast/PHPUnitPolyfills4 -- raise dependency on PHP 7.1 -- add phpunit12 - -* Sat Jan 18 2025 Fedora Release Engineering - 3.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jan 9 2025 Remi Collet - 3.1.0-1 -- update to 3.1.0 -- re-license spec file to CECILL-2.1 - -* Mon Sep 9 2024 Remi Collet - 3.0.0-1 -- update to 3.0.0 -- move to /usr/share/php/Yoast/PHPUnitPolyfills3 -- raise dependency on PHP 7.0 -- drop phpunit10, add phpunit11 - -* Fri Aug 30 2024 Remi Collet - 2.0.1-1 -- update to 2.0.1 -- move to /usr/share/php/Yoast/PHPUnitPolyfills2 -- raise dependency on PHP 5.6 -- drop phpunit7, add phpunit10 - -* Fri Jul 19 2024 Fedora Release Engineering - 1.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Apr 9 2024 Remi Collet - 1.1.1-1 -- update to 1.1.1 - -* Thu Jan 25 2024 Fedora Release Engineering - 1.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Mar 31 2023 Remi Collet - 1.0.5-1 -- update to 1.0.5 - -* Fri Jan 20 2023 Fedora Release Engineering - 1.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Nov 16 2022 Remi Collet - 1.0.4-1 -- update to 1.0.4 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 23 2021 Remi Collet - 1.0.3-1 -- update to 1.0.3 - -* Mon Oct 4 2021 Remi Collet - 1.0.2-1 -- update to 1.0.2 - -* Tue Aug 10 2021 Remi Collet - 1.0.1-1 -- update to 1.0.1 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jun 21 2021 Remi Collet - 1.0.0-1 -- update to 1.0.0 - -* Wed Mar 10 2021 Remi Collet - 0.2.0-2 -- reduce build matrix - * Thu Nov 26 2020 Remi Collet - 0.2.0-1 - initial rpm diff --git a/sources b/sources index d4fd0e8..7bc3c38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-yoast-phpunit-polyfills-4.0.0-134921b.tgz) = 7f2995809279b01260c6aedf5a97957a18fb39f41c00d66ab442129aea5b5e2220b42e56e72dcfecd679c715aab62dedb59af8761fb8773b60278dfd25608be7 +SHA512 (php-yoast-phpunit-polyfills-0.2.0-c48e4cf.tgz) = 1989a26825d9e2a2ae0c61ab1de95f7aa933559ea058ccd8599fdbd749b801b5865066b03387703be7ad0463ccdb466bcb5c5c7645d7d5c7b16b0eaf9a4eaf0e