diff options
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | php-mikey179-vfsstream.spec | 40 |
2 files changed, 27 insertions, 18 deletions
diff --git a/composer.json b/composer.json index 2f5b8a9..f729a8d 100644 --- a/composer.json +++ b/composer.json @@ -17,10 +17,11 @@ "wiki": "https://github.com/bovigo/vfsStream/wiki" }, "require": { - "php": ">=5.3.0" + "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "^4.5|^5.0" + "phpunit/phpunit": "^7.5||^8.5||^9.6", + "yoast/phpunit-polyfills": "^2.0" }, "autoload": { "psr-0": { "org\\bovigo\\vfs\\": "src/main/php" } diff --git a/php-mikey179-vfsstream.spec b/php-mikey179-vfsstream.spec index abf6901..5becd92 100644 --- a/php-mikey179-vfsstream.spec +++ b/php-mikey179-vfsstream.spec @@ -1,12 +1,12 @@ # spec file for php-mikey179-vfsstream # -# Copyright (c) 2014-2022 Remi Collet +# Copyright (c) 2014-2024 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f +%global gh_commit fe695ec993e0a55c3abdda10a9364eb31c6f1bf0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner bovigo %global gh_project vfsStream @@ -15,26 +15,28 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-%{pk_owner}-%{pk_project} -Version: 1.6.11 +Version: 1.6.12 Release: 1%{?dist} Summary: PHP stream wrapper for a virtual file system -License: BSD +License: BSD-3-Clause 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 BuildArch: noarch -BuildRequires: php(language) >= 5.3 +BuildRequires: php(language) >= 7.1 BuildRequires: %{_bindir}/phpab %if %{with_tests} # From composer.json, "require-dev": { -# "phpunit/phpunit": "~4.5|^5.0" -BuildRequires: php-composer(phpunit/phpunit) >= 4.5 +# "phpunit/phpunit": "^7.5||^8.5||^9.6", +# "yoast/phpunit-polyfills": "^2.0" +BuildRequires: phpunit9 >= 9.6 +BuildRequires: (php-composer(yoast/phpunit-polyfills) >= 2.0 with php-composer(yoast/phpunit-polyfills) < 3) %endif # From composer.json, "require": { -# "php": ">=5.3.0" -Requires: php(language) >= 5.3 +# "php": ">=7.1.0" +Requires: php(language) >= 7.1 # From phpcompatifo report for 1.6.0 Requires: php-date Requires: php-dom @@ -80,19 +82,21 @@ cp -pr src/main/php/org %{buildroot}%{_datadir}/php/org # erratic result in mock rm src/test/php/org/bovigo/vfs/vfsStreamWrapperLargeFileTestCase.php +: Use installed tree and autoloader mkdir vendor -ln -s %{buildroot}%{_datadir}/php/org/bovigo/vfs/autoload.php vendor/autoload.php +cat << 'EOF' | tee -a vendor/autoload.php +<?php +require_once '%{buildroot}%{_datadir}/php/org/bovigo/vfs/autoload.php'; +require_once '%{_datadir}/php/Yoast/PHPUnitPolyfills2/autoload.php'; +EOF ret=0 -for cmd in php php74 php80; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then VER=$($cmd -r 'echo PHP_VERSION_ID;') - if [ $VER -ge 80100 ]; then - echo skip test with PHP $ver - else $cmd %{_bindir}/phpunit \ + $cmd %{_bindir}/phpunit9 \ --filter '^((?!(unregisterThirdPartyVfsScheme|unregisterWhenNotInRegisteredState)).)*$' \ --verbose --no-coverage || ret=1 - fi fi done exit $ret @@ -100,7 +104,6 @@ exit $ret %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json @@ -111,6 +114,11 @@ exit $ret %changelog +* Fri Aug 30 2024 Remi Collet <remi@remirepo.net> - 1.6.12-1 +- update to 1.6.12 +- raise dependency on PHP 7.1 +- add build dependency on yoast/phpunit-polyfills 2.0 + * Thu Aug 11 2022 Remi Collet <remi@remirepo.net> - 1.6.11-1 - update to 1.6.11 |