From 90b9016133eb0a9f2e2fa63591cb6f2cc023f90e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Mar 2023 09:02:19 +0200 Subject: minimal fix for PHP 8 --- php-file-iterator-php8.patch | 11 +++++++++++ php-phpunit-File-Iterator.spec | 14 ++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 php-file-iterator-php8.patch diff --git a/php-file-iterator-php8.patch b/php-file-iterator-php8.patch new file mode 100644 index 0000000..4d96826 --- /dev/null +++ b/php-file-iterator-php8.patch @@ -0,0 +1,11 @@ +diff -up ./File/Iterator.php.old ./File/Iterator.php +--- ./File/Iterator.php.old 2023-03-31 08:58:25.848491706 +0200 ++++ ./File/Iterator.php 2023-03-31 08:58:39.908447317 +0200 +@@ -73,6 +73,7 @@ class File_Iterator extends FilterIterat + /** + * @return bool + */ ++ #[\ReturnTypeWillChange] + public function accept() + { + $current = $this->getInnerIterator()->current(); diff --git a/php-phpunit-File-Iterator.spec b/php-phpunit-File-Iterator.spec index 149801c..7fcf893 100644 --- a/php-phpunit-File-Iterator.spec +++ b/php-phpunit-File-Iterator.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-File-Iterator # -# Copyright (c) 2009-2015 Christof Damian, Remi Collet +# Copyright (c) 2009-2023 Christof Damian, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -19,14 +19,15 @@ Name: php-phpunit-File-Iterator Version: 1.4.5 -Release: 1%{?dist} +Release: 13%{?dist} Summary: FilterIterator implementation that filters files based on a list of suffixes -Group: Development/Libraries -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}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Patch0: %{gh_project}-php8.patch + BuildArch: noarch BuildRequires: php(language) >= 5.3.3 BuildRequires: php-fedora-autoloader-devel @@ -59,6 +60,8 @@ mkdir -p File/Iterator/ mv src/* File/Iterator/ mv File/Iterator/Iterator.php File/Iterator.php +%patch0 -p1 + %build %{_bindir}/phpab \ @@ -87,6 +90,9 @@ fi %changelog +* Fri Mar 31 2023 Remi Collet - 1.4.5-13 +- minimal fix for PHP 8 + * Tue Nov 28 2017 Remi Collet - 1.4.5-1 - Update to 1.4.5 -- cgit