From 515d2ad9a35d035d4ecebaab02dc23e4f6d34a7e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Feb 2020 10:36:16 +0100 Subject: update to 3.0.0 raise dependency on PHP 7.3 rename to php-phpunit-php-file-iterator3 move to /usr/share/php/SebastianBergmann/FileIterator3 --- composer.json | 14 +++++++++++--- php-phpunit-php-file-iterator3.spec | 31 +++++++++++++++++++------------ 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 002e511..4a6e6f8 100644 --- a/composer.json +++ b/composer.json @@ -18,11 +18,19 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues" }, + "config": { + "platform": { + "php": "7.3.0" + }, + "optimize-autoloader": true, + "sort-packages": true + }, + "prefer-stable": true, "require": { - "php": "^7.1" + "php": "^7.3" }, "require-dev": { - "phpunit/phpunit": "^7.1" + "phpunit/phpunit": "^9.0" }, "autoload": { "classmap": [ @@ -31,7 +39,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } } } diff --git a/php-phpunit-php-file-iterator3.spec b/php-phpunit-php-file-iterator3.spec index fe82712..743d249 100644 --- a/php-phpunit-php-file-iterator3.spec +++ b/php-phpunit-php-file-iterator3.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-php-file-iterator2 # -# Copyright (c) 2009-2018 Christof Damian, Remi Collet +# Copyright (c) 2009-2020 Christof Damian, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -8,7 +8,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 050bedf145a257b1ff02746c31894800e5122946 +%global gh_commit 354d4a5faa7449a377a18b94a2026ca3415e3d7a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-file-iterator @@ -16,7 +16,7 @@ # Packagist %global pk_vendor phpunit %global pk_project %{gh_project} -%global major 2 +%global major 3 # Namespace %global ns_vendor SebastianBergmann %global ns_project FileIterator @@ -28,7 +28,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 2.0.2 +Version: 3.0.0 Release: 1%{?dist} Summary: FilterIterator implementation that filters files based on a list of suffixes @@ -39,18 +39,19 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit BuildArch: noarch %if %{with_tests} # From composer.json, "require-dev" -# "phpunit/phpunit": "^7.1" -BuildRequires: phpunit7 >= 7.1 -BuildRequires: php(language) >= 7.1 +# "phpunit/phpunit": "^9.0" +# TODO test suite passes with v8, switch to v9 when available +BuildRequires: phpunit8 +BuildRequires: php(language) >= 7.3 BuildRequires: php-pcre BuildRequires: php-spl %endif BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" -# "php": "^7.1" -Requires: php(language) >= 7.1 -# From phpcompatinfo report for 2.0.2 +# "php": "^7.3" +Requires: php(language) >= 7.3 +# From phpcompatinfo report for 3.0.0 Requires: php-pcre Requires: php-spl # Autoloader @@ -86,10 +87,10 @@ touch vendor/autoload.php : Run upstream test suite ret=0 -for cmd in php php71 php72; do +for cmd in php php73 php74; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit7 --verbose || ret=1 + %{_bindir}/phpunit8 --verbose || ret=1 fi done exit $ret @@ -108,6 +109,12 @@ exit $ret %changelog +* Fri Feb 7 2020 Remi Collet - 3.0.0-1 +- update to 3.0.0 +- raise dependency on PHP 7.3 +- rename to php-phpunit-php-file-iterator3 +- move to /usr/share/php/SebastianBergmann/FileIterator3 + * Fri Sep 14 2018 Remi Collet - 2.0.2-1 - update to 2.0.2 - run upstream test suite -- cgit