From 98215a05516863e9cc2415ab9e3b16f39c0a5eb5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Aug 2023 14:25:01 +0200 Subject: [PATCH 1/3] v3.0.1 enable test suite (cherry picked from commit 31770e764879df039bd3c93281d9feecf3d4ccfb) --- .gitignore | 1 + php-sebastian-complexity3.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 289569a..8435ed4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-sebastian-complexity3-3.0.0-e67d240.tgz +/php-sebastian-complexity3-3.0.1-c70b738.tgz diff --git a/php-sebastian-complexity3.spec b/php-sebastian-complexity3.spec index 30dd250..1e604d2 100644 --- a/php-sebastian-complexity3.spec +++ b/php-sebastian-complexity3.spec @@ -7,11 +7,10 @@ # Please, preserve the changelog entries # -# disabled until phpunit10 available -%bcond_with tests +%bcond_without tests # github -%global gh_commit e67d240970c9dc7ea7b2123a6d520e334dd61dc6 +%global gh_commit c70b73893e10757af9c6a48929fa6a333b56a97a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project complexity @@ -25,7 +24,7 @@ %global ns_project Complexity Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} Summary: Calculating the complexity of PHP code units, version %{major} @@ -94,7 +93,7 @@ touch vendor/autoload.php : Run upstream test suite ret=0 -for cmd in php php81 php82; do +for cmd in php php81 php82 php83; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit10 || ret=1 @@ -115,6 +114,10 @@ exit $ret %changelog +* Thu Aug 31 2023 Remi Collet - 3.0.1-1 +- update to 3.0.1 +- Enable test suite + * Fri Feb 3 2023 Remi Collet - 3.0.0-1 - update to 3.0.0 - raise dependency on PHP 8.1 diff --git a/sources b/sources index ad3301f..e8049e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-complexity3-3.0.0-e67d240.tgz) = 228787b0e65690851f45d2c100cfaa674f06faa9339700f07c595d42ca4c63355e3c9cdfefa52513a111350071b470b8c9103d3d1e578feaed98dfbf082b7a33 +SHA512 (php-sebastian-complexity3-3.0.1-c70b738.tgz) = 2c862087cb6461c4946b7a42ed24db78ad3aaf0f9c0565160788d2e5aef863f37d7ef29778a3b1869da5d2bf55b09e9ed26b01932765302c6d358e5359509f29 From 21e5afd32f0d498a68612d846c3bc0ef465e4523 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Sep 2023 16:19:51 +0200 Subject: [PATCH 2/3] v3.1.0 (cherry picked from commit 093f27ab09c20c7b64eaf1265926b77cc34a46b0) --- .gitignore | 1 + php-sebastian-complexity3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8435ed4..60d0248 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-sebastian-complexity3-3.0.0-e67d240.tgz /php-sebastian-complexity3-3.0.1-c70b738.tgz +/php-sebastian-complexity3-3.1.0-68cfb34.tgz diff --git a/php-sebastian-complexity3.spec b/php-sebastian-complexity3.spec index 1e604d2..1b703d0 100644 --- a/php-sebastian-complexity3.spec +++ b/php-sebastian-complexity3.spec @@ -10,7 +10,7 @@ %bcond_without tests # github -%global gh_commit c70b73893e10757af9c6a48929fa6a333b56a97a +%global gh_commit 68cfb347a44871f01e33ab0ef8215966432f6957 %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.0.1 +Version: 3.1.0 Release: 1%{?dist} Summary: Calculating the complexity of PHP code units, version %{major} @@ -114,6 +114,9 @@ exit $ret %changelog +* Thu Sep 28 2023 Remi Collet - 3.1.0-1 +- update to 3.1.0 + * Thu Aug 31 2023 Remi Collet - 3.0.1-1 - update to 3.0.1 - Enable test suite diff --git a/sources b/sources index e8049e4..5c07bd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-complexity3-3.0.1-c70b738.tgz) = 2c862087cb6461c4946b7a42ed24db78ad3aaf0f9c0565160788d2e5aef863f37d7ef29778a3b1869da5d2bf55b09e9ed26b01932765302c6d358e5359509f29 +SHA512 (php-sebastian-complexity3-3.1.0-68cfb34.tgz) = dc10b7d6589f5fad24ff6d654f214b9a8e7a3f21f732ecc6561f1ad57e9b1e26f6887d8f44cac203f49a552dcbe1c506b5f8f5043dd3856372788afee133921e From 8ffdb52b2b6c89ebf3b9ac1fc05cfbdbad35fe73 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Dec 2023 14:29:46 +0100 Subject: [PATCH 3/3] update to 3.2.0 raise dependency on nikic/php-parser 4.18 and allow 5.0 (cherry picked from commit 2e536ea96c57f7e6f469d43e2059ad79c2c8e369) --- .gitignore | 1 + php-sebastian-complexity3.spec | 19 +++++++++++++------ sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 60d0248..6af1979 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-sebastian-complexity3-3.0.0-e67d240.tgz /php-sebastian-complexity3-3.0.1-c70b738.tgz /php-sebastian-complexity3-3.1.0-68cfb34.tgz +/php-sebastian-complexity3-3.2.0-68ff824.tgz diff --git a/php-sebastian-complexity3.spec b/php-sebastian-complexity3.spec index 1b703d0..b05b91b 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} @@ -36,7 +36,7 @@ Source1: makesrc.sh BuildArch: noarch BuildRequires: php(language) >= 8.1 -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) # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} @@ -47,9 +47,9 @@ 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 -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) # from phpcompatinfo report for version 3.0.0 # none # Autoloader @@ -76,7 +76,10 @@ phpab --template fedora --output src/autoload.php src cat < - 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 - 3.1.0-1 - update to 3.1.0 diff --git a/sources b/sources index 5c07bd8..44f6adc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-complexity3-3.1.0-68cfb34.tgz) = dc10b7d6589f5fad24ff6d654f214b9a8e7a3f21f732ecc6561f1ad57e9b1e26f6887d8f44cac203f49a552dcbe1c506b5f8f5043dd3856372788afee133921e +SHA512 (php-sebastian-complexity3-3.2.0-68ff824.tgz) = c4bbae7fd782adf1d5f86d95aa32f439cbdf6c9ac273b04671ca112cc789926c6279f63662743c0faea9cb18133eec31ac0d074f9e5eb30b392005a981402010