From 169f68babde041f93acd0915b35813c41d43e8aa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Jul 2021 11:23:03 +0200 Subject: update to 1.6.9 --- composer.json | 3 +++ php-mikey179-vfsstream.spec | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 9d1f3f0..2f5b8a9 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,9 @@ "autoload": { "psr-0": { "org\\bovigo\\vfs\\": "src/main/php" } }, + "scripts": { + "test": "phpunit" + }, "extra": { "branch-alias": { "dev-master": "1.6.x-dev" diff --git a/php-mikey179-vfsstream.spec b/php-mikey179-vfsstream.spec index 44c20d6..d68bc68 100644 --- a/php-mikey179-vfsstream.spec +++ b/php-mikey179-vfsstream.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 231c73783ebb7dd9ec77916c10037eff5a2b6efe +%global gh_commit 2257e326dc3d0f50e55d0a90f71e37899f029718 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner bovigo %global gh_project vfsStream @@ -15,7 +15,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-%{pk_owner}-%{pk_project} -Version: 1.6.8 +Version: 1.6.9 Release: 1%{?dist} Summary: PHP stream wrapper for a virtual file system @@ -83,10 +83,12 @@ rm src/test/php/org/bovigo/vfs/vfsStreamWrapperLargeFileTestCase.php mkdir vendor ln -s %{buildroot}%{_datadir}/php/org/bovigo/vfs/autoload.php vendor/autoload.php +# issue with PHP 8 and phpunit 5: unregisterThirdPartyVfsScheme|unregisterWhenNotInRegisteredState ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php73 php74 php80; do if which $cmd; then $cmd %{_bindir}/phpunit \ + --filter '^((?!(unregisterThirdPartyVfsScheme|unregisterWhenNotInRegisteredState)).)*$' \ --verbose || ret=1 fi done @@ -106,6 +108,9 @@ exit $ret %changelog +* Mon Jul 19 2021 Remi Collet - 1.6.9-1 +- update to 1.6.9 + * Thu Oct 31 2019 Remi Collet - 1.6.8-1 - update to 1.6.8 -- cgit