summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-sebastian-complexity3.spec23
2 files changed, 17 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index 78f6ffb..77001bb 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"prefer-stable": true,
"require": {
"php": ">=8.1",
- "nikic/php-parser": "^4.10"
+ "nikic/php-parser": "^4.18 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^10.0"
@@ -37,7 +37,7 @@
},
"extra": {
"branch-alias": {
- "dev-main": "3.1-dev"
+ "dev-main": "3.2-dev"
}
}
}
diff --git a/php-sebastian-complexity3.spec b/php-sebastian-complexity3.spec
index 7061cb6..ae31721 100644
--- a/php-sebastian-complexity3.spec
+++ b/php-sebastian-complexity3.spec
@@ -10,7 +10,7 @@
%bcond_without tests
# github
-%global gh_commit 68cfb347a44871f01e33ab0ef8215966432f6957
+%global gh_commit 68ff824baeae169ec9f2137158ee529584553799
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project complexity
@@ -24,7 +24,7 @@
%global ns_project Complexity
Name: php-%{pk_vendor}-%{pk_project}%{major}
-Version: 3.1.0
+Version: 3.2.0
Release: 1%{?dist}
Summary: Calculating the complexity of PHP code units, version %{major}
@@ -38,10 +38,10 @@ BuildArch: noarch
BuildRequires: php(language) >= 8.1
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(nikic/php-parser) >= 4.10 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.10
+BuildRequires: php-nikic-php-parser4 >= 4.18
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel >= 1.0.0
@@ -53,14 +53,14 @@ BuildRequires: phpunit10
# from composer.json, "require": {
# "php": ">=8.1",
-# "nikic/php-parser": "^4.10"
+# "nikic/php-parser": "^4.18 || ^5.0"
Requires: php(language) >= 8.1
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(nikic/php-parser) >= 4.10 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.10
+Requires: php-nikic-php-parser4 >= 4.18
%endif
# from phpcompatinfo report for version 3.0.0
# none
@@ -88,7 +88,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
@@ -128,6 +131,10 @@ exit $ret
%changelog
+* Thu Dec 21 2023 Remi Collet <remi@remirepo.net> - 3.2.0-1
+- update to 3.2.0
+- raise dependency on nikic/php-parser 4.18 and allow 5.0
+
* Thu Sep 28 2023 Remi Collet <remi@remirepo.net> - 3.1.0-1
- update to 3.1.0