diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rwxr-xr-x | makesrc.sh | 28 | ||||
| -rw-r--r-- | php-phpunit-php-code-coverage7.spec | 68 |
3 files changed, 79 insertions, 21 deletions
diff --git a/composer.json b/composer.json index 19f8586..ed6e813 100644 --- a/composer.json +++ b/composer.json @@ -25,11 +25,11 @@ }, "prefer-stable": true, "require": { - "php": "^7.2", + "php": ">=7.2", "ext-dom": "*", "ext-xmlwriter": "*", "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-token-stream": "^3.1.1", + "phpunit/php-token-stream": "^3.1.3 || ^4.0", "phpunit/php-text-template": "^1.2.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", "sebastian/environment": "^4.2.2", diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..3d8028d --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/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 73b1c5f..24ce469 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -1,7 +1,7 @@ # remirepo/fedora spec file for php-phpunit-php-code-coverage7 # -# Copyright (c) 2013-2019 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2013-2024 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -9,10 +9,10 @@ %global bootstrap 0 # Github -%global gh_commit f1884187926fbb755a9aaf0b3836ad3165b478bf +%global gh_commit 40a4ed114a4aea5afd6df8d0f0c9cd3033097f66 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_vendor sebastianbergmann +%global gh_owner sebastianbergmann %global gh_project php-code-coverage # Packagist %global pk_vendor phpunit @@ -29,17 +29,18 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.10 +Version: 7.0.17 Release: 1%{?dist} Summary: PHP code coverage information -# Main license is BSD -# BSD: D3 +# SPDX: Main license is BSD-3-Clause +# BSD-3-Clause: D3 # MIT: boostrap, d3, holder, html5shiv, jquery, respond -# ASL 2.0: nvd3 -License: BSD and MIT and ASL 2.0 -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 +# 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 BuildArch: noarch BuildRequires: php-fedora-autoloader-devel >= 1.0.0 @@ -48,7 +49,7 @@ BuildRequires: php(language) >= 7.2 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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) >= 3.1.0 with php-composer(phpunit/php-token-stream) < 4) +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) @@ -68,15 +69,15 @@ BuildRequires: php-theseer-tokenizer >= 1.1.3 # "phpunit/phpunit": "^8.2.2" # 7.2 because of tests BuildRequires: phpunit8 >= 8.2.2 -BuildRequires: php-pecl-xdebug >= 2.6.1 +BuildRequires: php-xdebug >= 2.6.1 %endif # From composer.json, require -# "php": "^7.2", +# "php": ">=7.2", # "ext-dom": "*", # "ext-xmlwriter": "*", # "phpunit/php-file-iterator": "^2.0.2", -# "phpunit/php-token-stream": "^3.1.0", +# "phpunit/php-token-stream": "^3.1.3 || ^4.0", # "phpunit/php-text-template": "^1.2.1", # "sebastian/code-unit-reverse-lookup": "^1.0.1", # "sebastian/environment": "^4.2.2", @@ -88,7 +89,7 @@ Requires: php-xmlwriter # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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) >= 3.1.1 with php-composer(phpunit/php-token-stream) < 4) +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) @@ -149,7 +150,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}/PhpTokenStream3/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', @@ -170,6 +174,7 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major} if ! php -v | grep Xdebug then EXT="-d zend_extension=xdebug.so" fi +export XDEBUG_MODE=coverage cat << 'EOF' | tee tests/bootstrap.php <?php @@ -178,13 +183,15 @@ require __DIR__ . '/_files/BankAccountTest.php'; define('TEST_FILES_PATH', __DIR__ . '/_files/'); EOF + ret=0 -for cmd in php php72 php73 php74; do +for cmd in php php81 php82 php83; do if which $cmd; then + FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction|testForBankAccountTest|testGetLinesToBeIgnored3|testGetLinesToBeIgnoredOneLineAnnotations)).)*$'" $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ %{_bindir}/phpunit8 \ - --verbose || ret=1 + --verbose $FILTER || ret=1 fi done exit $ret @@ -202,6 +209,29 @@ exit $ret %changelog +* Tue Mar 5 2024 Remi Collet <remi@remirepo.net> - 7.0.17-1 +- update to 7.0.17 + +* Fri Mar 1 2024 Remi Collet <remi@remirepo.net> - 7.0.16-1 +- update to 7.0.16 (no change) +- sources from git snapshot + +* Thu Apr 20 2023 Remi Collet <remi@fedoraproject.org> - 7.0.15-5 +- use SPDX license ID + +* Mon Jul 26 2021 Remi Collet <remi@remirepo.net> - 7.0.15-1 +- update to 7.0.15 (no change) + +* Wed Dec 2 2020 Remi Collet <remi@remirepo.net> - 7.0.14-1 +- update to 7.0.14 (no change) +- allow phpunit/php-token-stream v4 + +* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 7.0.13-1 +- update to 7.0.13 (no change) + +* Fri Nov 27 2020 Remi Collet <remi@remirepo.net> - 7.0.12-1 +- update to 7.0.12 + * Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 7.0.10-1 - update to 7.0.10 |