From 6fbfdd6d04bf8ba6246bfe0090777617ebc3c12b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Feb 2023 15:07:05 +0100 Subject: update to 2.0.0 raise dependency on PHP 8.1 raise dependency on nikic/php-parser 4.10 rename to php-sebastian-lines-of-code2 move to /usr/share/php/SebastianBergmann/LinesOfCode2 --- composer.json | 10 ++++---- php-sebastian-lines-of-code2.spec | 48 +++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 95bb9e3..1e72f96 100644 --- a/composer.json +++ b/composer.json @@ -16,15 +16,15 @@ }, "prefer-stable": true, "require": { - "php": ">=7.3", - "nikic/php-parser": "^4.6" + "php": ">=8.1", + "nikic/php-parser": "^4.10" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "config": { "platform": { - "php": "7.3.0" + "php": "8.1" }, "optimize-autoloader": true, "sort-packages": true @@ -36,7 +36,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "2.0-dev" } } } diff --git a/php-sebastian-lines-of-code2.spec b/php-sebastian-lines-of-code2.spec index 780de68..10bf473 100644 --- a/php-sebastian-lines-of-code2.spec +++ b/php-sebastian-lines-of-code2.spec @@ -1,30 +1,31 @@ -# remirepo/fedora spec file for php-sebastian-lines-of-code +# remirepo/fedora spec file for php-sebastian-lines-of-code2 # -# Copyright (c) 2020 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2020-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%bcond_without tests +# disabled until phpunit10 available +%bcond_with tests # github -%global gh_commit c1c2e997aa3146983ed888ad08b15470a2e22ecc +%global gh_commit 17c4d940ecafb3d15d2cf916f4108f664e28b130 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project lines-of-code # packagist %global pk_vendor sebastian %global pk_project %{gh_project} -%global major %nil +%global major 2 # namespace %global php_home %{_datadir}/php %global ns_vendor SebastianBergmann %global ns_project LinesOfCode Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 1.0.3 +Version: 2.0.0 Release: 1%{?dist} Summary: Counting the lines of code in PHP source code @@ -35,35 +36,35 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 8.1 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(nikic/php-parser) >= 4.6 with php-composer(nikic/php-parser) < 5) +BuildRequires: (php-composer(nikic/php-parser) >= 4.10 with php-composer(nikic/php-parser) < 5) # remirepo:3 %else -BuildRequires: php-nikic-php-parser4 >= 4.6 +BuildRequires: php-nikic-php-parser4 >= 4.10 %endif BuildRequires: php-spl # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} # from composer.json, "require-dev": { -# "phpunit/phpunit": "^9.3" -BuildRequires: phpunit9 >= 9.3 +# "phpunit/phpunit": "^10.0" +BuildRequires: phpunit10 %endif # from composer.json, "require": { -# "php": ">=7.3", -# "nikic/php-parser": "^4.6" -Requires: php(language) >= 7.3 +# "php": ">=8.1", +# "nikic/php-parser": "^4.10" +Requires: php(language) >= 8.1 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(nikic/php-parser) >= 4.6 with php-composer(nikic/php-parser) < 5) +Requires: (php-composer(nikic/php-parser) >= 4.10 with php-composer(nikic/php-parser) < 5) # remirepo:3 %else -Requires: php-nikic-php-parser4 >= 4.6 +Requires: php-nikic-php-parser4 >= 4.10 %endif -# from phpcompatinfo report for version 1.0.0 +# from phpcompatinfo report for version 2.0.0 Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -102,10 +103,10 @@ touch vendor/autoload.php : Run upstream test suite ret=0 -for cmd in php php73 php74 php80; do +for cmd in php php81 php82; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit9 --verbose || ret=1 + %{_bindir}/phpunit10 --verbose || ret=1 fi done exit $ret @@ -125,6 +126,13 @@ exit $ret %changelog +* Fri Feb 3 2023 Remi Collet - 2.0.0-1 +- update to 2.0.0 +- raise dependency on PHP 8.1 +- raise dependency on nikic/php-parser 4.10 +- rename to php-sebastian-lines-of-code2 +- move to /usr/share/php/SebastianBergmann/LinesOfCode2 + * Mon Nov 30 2020 Remi Collet - 1.0.3-1 - update to 1.0.3 -- cgit