diff --git a/.gitignore b/.gitignore index 029da84..072a161 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ /php-phpunit-php-code-coverage7-7.0.13-ad0dcd7.tar.gz /php-phpunit-php-code-coverage7-7.0.14-bb7c9a2.tar.gz /php-phpunit-php-code-coverage7-7.0.15-819f92b.tar.gz -/php-phpunit-php-code-coverage7-7.0.17-40a4ed1.tgz diff --git a/makesrc.sh b/makesrc.sh deleted file mode 100755 index 3d8028d..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} - -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" - -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT - -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd - -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index abe0825..adca67a 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -1,18 +1,18 @@ # remirepo/fedora spec file for php-phpunit-php-code-coverage7 # -# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2013-2023 Remi Collet +# License: CC-BY-SA-4.0 +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 # Github -%global gh_commit 40a4ed114a4aea5afd6df8d0f0c9cd3033097f66 +%global gh_commit 819f92bba8b001d4363065928088de22f25a3a48 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner sebastianbergmann +%global gh_vendor sebastianbergmann %global gh_project php-code-coverage # Packagist %global pk_vendor phpunit @@ -29,8 +29,8 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.17 -Release: 5%{?dist} +Version: 7.0.15 +Release: 6%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -38,16 +38,15 @@ Summary: PHP code coverage information # MIT: boostrap, d3, holder, html5shiv, jquery, respond # Apache-2.0: nvd3 License: BSD-3-Clause AND MIT AND Apache-2.0 -URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{version}-%{gh_short}.tgz -Source1: makesrc.sh +URL: https://github.com/%{gh_vendor}/%{gh_project} +Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz BuildArch: noarch BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} BuildRequires: php(language) >= 7.2 BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -BuildRequires: (php-composer(phpunit/php-token-stream) >= 4.0 with php-composer(phpunit/php-token-stream) < 5) +BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.1.0 with php-composer(phpunit/php-token-stream) < 5) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) BuildRequires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) @@ -75,7 +74,7 @@ Requires: php(language) >= 7.1 Requires: php-dom Requires: php-xmlwriter Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -Requires: (php-composer(phpunit/php-token-stream) >= 4.0 with php-composer(phpunit/php-token-stream) < 5) +Requires: (php-composer(phpunit/php-token-stream) >= 3.1.1 with php-composer(phpunit/php-token-stream) < 5) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) @@ -86,7 +85,10 @@ Requires: (php-composer(theseer/tokenizer) >= 1.1.3 with Suggests: php-xdebug Recommends: php-pcov # From phpcompatinfo report for version 5.0.0 +Requires: php-reflection +Requires: php-date Requires: php-json +Requires: php-spl Requires: php-tokenizer # Autoloader Requires: php-composer(fedora/autoloader) @@ -123,7 +125,10 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{php_home}/SebastianBergmann/FileIterator2/autoload.php', - '%{php_home}/%{ns_vendor}/PhpTokenStream4/autoload.php', + [ + '%{php_home}/%{ns_vendor}/PhpTokenStream4/autoload.php', + '%{php_home}/%{ns_vendor}/PhpTokenStream3/autoload.php', + ], '%{php_home}/Text/Template/Autoload.php', '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup/autoload.php', '%{php_home}/%{ns_vendor}/Environment4/autoload.php', @@ -155,9 +160,14 @@ EOF ret=0 -for cmd in php php81 php82 php83 php84; do +for cmd in php php74 php80 php81 php82; do if which $cmd; then - FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction|testForBankAccountTest|testGetLinesToBeIgnored3|testGetLinesToBeIgnoredOneLineAnnotations)).)*$'" + if [ $($cmd -r 'echo PHP_VERSION_ID;') -lt 80000 ]; then + # ignore test failing with phpunit/php-token-stream v4 + FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction)).)*$'" + else + FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction|testForBankAccountTest)).)*$'" + fi $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ %{_bindir}/phpunit8 \ @@ -177,28 +187,6 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 7.0.17-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu May 22 2025 Remi Collet - 7.0.17-4 -- drop phpunit/php-token-stream v3 - -* Sat Jan 18 2025 Fedora Release Engineering - 7.0.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 7.0.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Mar 5 2024 Remi Collet - 7.0.17-1 -- update to 7.0.17 -- sources from git snapshot - -* Thu Jan 25 2024 Fedora Release Engineering - 7.0.15-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 7.0.15-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Fri Jul 21 2023 Fedora Release Engineering - 7.0.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 838409b..465e0f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.17-40a4ed1.tgz) = 6141c867d1d1992d1dc8b16e10db6f91d912e5cf70879d792def6796444a8b47e5815e8bb958156d20c08278c15efd5dd140c60a1ce876d8a7321f196c798f33 +SHA512 (php-phpunit-php-code-coverage7-7.0.15-819f92b.tar.gz) = ba8921ddeacb6831baf922c80f62eb3d968036219e491f125737bd12db932b7dd97e88cb2466dce04dfeb14ca2e97af0e60d1de6b128ace13e2a51d4a6ebff1c