summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-12-22 10:09:01 +0100
committerRemi Collet <remi@php.net>2023-12-22 10:09:01 +0100
commit6afc0f97c757b5c0da15f9ca64985dcb783271cc (patch)
tree765946ac1e4bceec38d14ee2a2c4fd6b0e7127f8
parent3a229c97b8635ba69d82f49d70b3f279dfae9d6f (diff)
update to 1.0.4HEADmaster
raise dependency on nikic/php-parser 4.18 and allow 5.0
-rw-r--r--composer.json2
-rw-r--r--php-sebastian-lines-of-code.spec25
2 files changed, 17 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index 95bb9e3..3f28786 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
"prefer-stable": true,
"require": {
"php": ">=7.3",
- "nikic/php-parser": "^4.6"
+ "nikic/php-parser": "^4.18 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^9.3"
diff --git a/php-sebastian-lines-of-code.spec b/php-sebastian-lines-of-code.spec
index 470ff27..8836b67 100644
--- a/php-sebastian-lines-of-code.spec
+++ b/php-sebastian-lines-of-code.spec
@@ -10,7 +10,7 @@
%bcond_without tests
# github
-%global gh_commit c1c2e997aa3146983ed888ad08b15470a2e22ecc
+%global gh_commit e1e4a170560925c26d424b6a03aed157e7dcc5c5
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project lines-of-code
@@ -24,8 +24,8 @@
%global ns_project LinesOfCode
Name: php-%{pk_vendor}-%{pk_project}%{major}
-Version: 1.0.3
-Release: 7%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
Summary: Counting the lines of code in PHP source code, version 1
License: BSD-3-Clause
@@ -38,10 +38,10 @@ BuildArch: noarch
BuildRequires: php(language) >= 7.3
# 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.18 with php-composer(nikic/php-parser) < 6)
# remirepo:3
%else
-BuildRequires: php-nikic-php-parser4 >= 4.6
+BuildRequires: php-nikic-php-parser4 >= 4.18
%endif
BuildRequires: php-spl
# Autoloader
@@ -54,14 +54,14 @@ BuildRequires: phpunit9 >= 9.3
# from composer.json, "require": {
# "php": ">=7.3",
-# "nikic/php-parser": "^4.6"
+# "nikic/php-parser": "^4.18 || ^5.0"
Requires: php(language) >= 7.3
# 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.18 with php-composer(nikic/php-parser) < 6)
# remirepo:3
%else
-Requires: php-nikic-php-parser4 >= 4.6
+Requires: php-nikic-php-parser4 >= 4.18
%endif
# from phpcompatinfo report for version 1.0.0
Requires: php-spl
@@ -89,7 +89,10 @@ phpab --template fedora --output src/autoload.php src
cat <<EOF | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/PhpParser4/autoload.php',
+ [
+ '%{php_home}/PhpParser5/autoload.php',
+ '%{php_home}/PhpParser4/autoload.php',
+ ],
]);
EOF
@@ -129,6 +132,10 @@ exit $ret
%changelog
+* Fri Dec 22 2023 Remi Collet <remi@remirepo.net> - 1.0.4-1
+- update to 1.0.4
+- raise dependency on nikic/php-parser 4.18 and allow 5.0
+
* Fri Apr 21 2023 Remi Collet <remi@remirepo.net> - 1.0.3-7
- use SPDX License id