update to 10.1.11

raise dependency on nikic/php-parser 4.18 and allow 5.0

2 files changed, 16 insertions, 9 deletions

diff --git a/composer.json b/composer.json
index 92e9d5e..6e2ed05 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "ext-dom": "*",
         "ext-libxml": "*",
         "ext-xmlwriter": "*",
-        "nikic/php-parser": "^4.15",
+        "nikic/php-parser": "^4.18 || ^5.0",
         "phpunit/php-file-iterator": "^4.0",
         "phpunit/php-text-template": "^3.0",
         "sebastian/code-unit-reverse-lookup": "^3.0",
diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec
index e748d25..7e83ede 100644
--- a/php-phpunit-php-code-coverage10.spec
+++ b/php-phpunit-php-code-coverage10.spec
@@ -10,7 +10,7 @@
 %bcond_without       tests
 
 # Github
-%global gh_commit    599109c8ca6bae97b23482d557d2874c25a65e59
+%global gh_commit    78c3b7625965c2513ee96569a4dbb62601784145
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
 %global gh_project   php-code-coverage
@@ -24,7 +24,7 @@
 %global ver_major    10
 
 Name:           php-%{pk_vendor}-%{pk_project}%{ver_major}
-Version:        10.1.10
+Version:        10.1.11
 Release:        1%{?dist}
 Summary:        PHP code coverage information, version %{ver_major}
 
@@ -43,7 +43,7 @@ BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 %if %{with tests}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(nikic/php-parser)                   >= 4.15   with php-composer(nikic/php-parser)                   < 5)
+BuildRequires:  (php-composer(nikic/php-parser)                   >= 4.18   with php-composer(nikic/php-parser)                   < 6)
 BuildRequires:  (php-composer(phpunit/php-file-iterator)          >= 4.0    with php-composer(phpunit/php-file-iterator)          < 5)
 BuildRequires:  (php-composer(phpunit/php-text-template)          >= 3.0    with php-composer(phpunit/php-text-template)          < 4)
 BuildRequires:  (php-composer(sebastian/code-unit-reverse-lookup) >= 3.0    with php-composer(sebastian/code-unit-reverse-lookup) < 4)
@@ -54,7 +54,7 @@ BuildRequires:  (php-composer(sebastian/version)                  >= 4.0    with
 BuildRequires:  (php-composer(theseer/tokenizer)                  >= 1.2.0  with php-composer(theseer/tokenizer)                  < 2)
 # remirepo:11
 %else
-BuildRequires:  php-nikic-php-parser4                    >= 4.15
+BuildRequires:  php-nikic-php-parser4                    >= 4.18
 BuildRequires:  php-phpunit-php-file-iterator4
 BuildRequires:  php-phpunit-php-text-template3
 BuildRequires:  php-sebastian-code-unit-reverse-lookup3
@@ -84,7 +84,7 @@ BuildRequires:  php-xdebug
 #        "ext-dom": "*",
 #        "ext-libxml": "*",
 #        "ext-xmlwriter": "*",
-#        "nikic/php-parser": "^4.15",
+#        "nikic/php-parser": "^4.18 || ^5.0",
 #        "phpunit/php-file-iterator": "^4.0",
 #        "phpunit/php-text-template": "^3.0",
 #        "sebastian/code-unit-reverse-lookup": "^3.0",
@@ -99,7 +99,7 @@ Requires:       php-libxml
 Requires:       php-xmlwriter
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(nikic/php-parser)                   >= 4.15   with php-composer(nikic/php-parser)                   < 5)
+Requires:       (php-composer(nikic/php-parser)                   >= 4.18   with php-composer(nikic/php-parser)                   < 6)
 Requires:       (php-composer(phpunit/php-file-iterator)          >= 4.0    with php-composer(phpunit/php-file-iterator)          < 5)
 Requires:       (php-composer(phpunit/php-text-template)          >= 3.0    with php-composer(phpunit/php-text-template)          < 4)
 Requires:       (php-composer(sebastian/code-unit-reverse-lookup) >= 3.0    with php-composer(sebastian/code-unit-reverse-lookup) < 4)
@@ -115,7 +115,7 @@ Suggests:       php-xdebug
 Recommends:     php-pcov
 # remirepo:11
 %else
-Requires:       php-nikic-php-parser4                    >= 4.15
+Requires:       php-nikic-php-parser4                    >= 4.18
 Requires:       php-phpunit-php-file-iterator4
 Requires:       php-phpunit-php-text-template3
 Requires:       php-sebastian-code-unit-reverse-lookup3
@@ -166,7 +166,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}/PhpParser4/autoload.php',
+    [
+        '%{php_home}/PhpParser5/autoload.php',
+        '%{php_home}/PhpParser4/autoload.php',
+    ],
     '%{php_home}/%{ns_vendor}/FileIterator4/autoload.php',
     '%{php_home}/%{ns_vendor}/Template3/autoload.php',
     '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup3/autoload.php',
@@ -226,6 +229,10 @@ exit $ret
 
 
 %changelog
+* Thu Dec 21 2023 Remi Collet <remi@remirepo.net> - 10.1.11-1
+- update to 10.1.11
+- raise dependency on nikic/php-parser 4.18 and allow 5.0
+
 * Mon Dec 11 2023 Remi Collet <remi@remirepo.net> - 10.1.10-1
 - update to 10.1.10