From 918716160678141f607d044b423a480c5fa2f7ef Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Feb 2023 15:40:35 +0100 Subject: update to 4.0.0 raise dependency on PHP 8.1 rename to php-phpunit-php-file-iterator4 move to /usr/share/php/SebastianBergmann/FileIterator4 --- composer.json | 8 +++--- php-phpunit-php-file-iterator4.spec | 53 ++++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/composer.json b/composer.json index f1b95b3..e2bef2a 100644 --- a/composer.json +++ b/composer.json @@ -20,17 +20,17 @@ }, "config": { "platform": { - "php": "7.3.0" + "php": "8.1.0" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "autoload": { "classmap": [ @@ -39,7 +39,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "4.0-dev" } } } diff --git a/php-phpunit-php-file-iterator4.spec b/php-phpunit-php-file-iterator4.spec index 45811db..37b0036 100644 --- a/php-phpunit-php-file-iterator4.spec +++ b/php-phpunit-php-file-iterator4.spec @@ -1,14 +1,17 @@ -# remirepo/fedora spec file for php-phpunit-php-file-iterator3 +# remirepo/fedora spec file for php-phpunit-php-file-iterator4 # -# Copyright (c) 2009-2021 Christof Damian, Remi Collet +# Copyright (c) 2009-2023 Christof Damian, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT # # Please, preserve the changelog entries # -%global bootstrap 0 -%global gh_commit cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf + +# disabled until phpunit10 available +%bcond_with tests + +%global gh_commit 7d66d4e816d34e90acec9db9d8d94b5cfbfe926f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-file-iterator @@ -16,21 +19,16 @@ # Packagist %global pk_vendor phpunit %global pk_project %{gh_project} -%global major 3 +%global major 4 # Namespace %global ns_vendor SebastianBergmann %global ns_project FileIterator -%if %{bootstrap} -%bcond_with tests -%else -%bcond_without tests -%endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.6 +Version: 4.0.0 Release: 1%{?dist} -Summary: FilterIterator implementation that filters files based on a list of suffixes, version %{major} +Summary: FilterIterator implementation based on a list of suffixes, version %{major} License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} @@ -38,20 +36,20 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with tests} -# From composer.json, "require-dev" -# "phpunit/phpunit": "^9.3" -BuildRequires: phpunit9 >= 9.3 -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 8.1 BuildRequires: php-pcre BuildRequires: php-spl +%if %{with tests} +# From composer.json, "require-dev" +# "phpunit/phpunit": "^10.0" +BuildRequires: phpunit10 %endif BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" -# "php": ">=7.3" -Requires: php(language) >= 7.3 -# From phpcompatinfo report for 3.0.0 +# "php": ">=8.1" +Requires: php(language) >= 8.1 +# From phpcompatinfo report for 4.0.0 Requires: php-pcre Requires: php-spl # Autoloader @@ -61,7 +59,8 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} %description -FilterIterator implementation that filters files based on a list of suffixes. +FilterIterator implementation that filters files based on a list of suffixes, +version %{major}. %prep @@ -81,16 +80,16 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} %check -%if %{with_tests} +%if %{with tests} mkdir vendor touch vendor/autoload.php : Run upstream test suite ret=0 -for cmd in php php74 php80 php81; do +for cmd in php php81 php82; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit9 --verbose || ret=1 + %{_bindir}/phpunit10 --verbose || ret=1 fi done exit $ret @@ -109,6 +108,12 @@ exit $ret %changelog +* Fri Feb 3 2023 Remi Collet - 4.0.0-1 +- update to 4.0.0 +- raise dependency on PHP 8.1 +- rename to php-phpunit-php-file-iterator4 +- move to /usr/share/php/SebastianBergmann/FileIterator4 + * Thu Dec 2 2021 Remi Collet - 3.0.6-1 - update to 3.0.6 -- cgit