update to 5.5.0HEADmaster

2 files changed, 11 insertions, 36 deletions

diff --git a/composer.json b/composer.json
index cf8f49d..9cd35ed 100644
--- a/composer.json
+++ b/composer.json
@@ -23,13 +23,13 @@
         "doctrine/deprecations": "^1.1"
     },
     "require-dev": {
-        "mockery/mockery": "~1.3.5",
+        "mockery/mockery": "~1.3.5 || ~1.6.0",
         "phpunit/phpunit": "^9.5",
         "phpstan/phpstan": "^1.8",
         "phpstan/phpstan-mockery": "^1.1",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-webmozart-assert": "^1.2",
-        "vimeo/psalm": "^5.13"
+        "psalm/phar": "^5.26"
     },
     "autoload": {
         "psr-4": {
diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec
index 851d92a..09361e5 100644
--- a/php-phpdocumentor-reflection-docblock5.spec
+++ b/php-phpdocumentor-reflection-docblock5.spec
@@ -8,7 +8,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c
+%global gh_commit    54e10d44fc1a84e2598d26f70d4f6f1f233e228a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpDocumentor
 %global gh_project   ReflectionDocBlock
@@ -16,7 +16,7 @@
 %bcond_without       tests
 
 Name:           php-phpdocumentor-reflection-docblock%{major}
-Version:        5.4.1
+Version:        5.5.0
 Release:        1%{?dist}
 Summary:        DocBlock parser
 
@@ -33,38 +33,22 @@ BuildRequires:  php-fedora-autoloader-devel
 %if %{with tests}
 BuildRequires:  php(language) >= 7.4
 BuildRequires:  php-filter
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(phpdocumentor/type-resolver)     >= 1.7   with php-composer(phpdocumentor/type-resolver)     < 2)
 BuildRequires: (php-composer(webmozart/assert)                >= 1.9.1 with php-composer(webmozart/assert)                < 2)
 BuildRequires: (php-composer(phpdocumentor/reflection-common) >= 2.2   with php-composer(phpdocumentor/reflection-common) < 3)
 BuildRequires: (php-composer(phpstan/phpdoc-parser)           >= 1.7   with php-composer(phpstan/phpdoc-parser)           < 2)
 BuildRequires: (php-composer(doctrine/deprecations)           >= 1.1   with php-composer(doctrine/deprecations)           < 2)
-# remirepo:7
-%else
-BuildRequires:  php-phpdocumentor-type-resolver1              >= 1.7
-BuildRequires:  php-webmozart-assert                          >= 1.9.1
-BuildRequires:  php-phpdocumentor-reflection-common2          >= 2.2
-BuildRequires:  php-phpstan-phpdoc-parser                     >= 1.7
-BuildRequires:  php-doctrine-deprecations                     >= 1.1
-%endif
 # From composer.json, require-dev
-#        "mockery/mockery": "~1.3.5",
+#        "mockery/mockery": "~1.3.5 || ~1.6.0",
 #        "phpunit/phpunit": "^9.5",
 #        "phpstan/phpstan": "^1.8",
 #        "phpstan/phpstan-mockery": "^1.1",
 #        "phpstan/extension-installer": "^1.1",
 #        "phpstan/phpstan-webmozart-assert": "^1.2",
-#        "vimeo/psalm": "^5.13"
+#        "psalm/phar": "^5.26"
 BuildRequires:  phpunit9 >= 9.5
 %global phpunit %{_bindir}/phpunit9
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(mockery/mockery) >= 1.3.5 with php-composer(mockery/mockery) <  2)
-# remirepo:3
-%else
-BuildRequires:  php-mockery                   >= 1.3.5
-%endif
+BuildRequires: (php-composer(mockery/mockery) >= 1.6 with php-composer(mockery/mockery) <  2)
 # From phpcompatinfo report for 5.0.0
 BuildRequires:  php-reflection
 BuildRequires:  php-pcre
@@ -81,21 +65,11 @@ BuildRequires:  php-spl
 #        "doctrine/deprecations": "^1.1"
 Requires:       php(language) >= 7.4
 Requires:       php-filter
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-composer(phpdocumentor/type-resolver)     >= 1.7   with php-composer(phpdocumentor/type-resolver)     < 2)
 Requires:      (php-composer(webmozart/assert)                >= 1.9.1 with php-composer(webmozart/assert)                < 2)
 Requires:      (php-composer(phpdocumentor/reflection-common) >= 2.2   with php-composer(phpdocumentor/reflection-common) < 3)
 Requires:      (php-composer(phpstan/phpdoc-parser)           >= 1.7   with php-composer(phpstan/phpdoc-parser)           < 2)
 Requires:      (php-composer(doctrine/deprecations)           >= 1.1   with php-composer(doctrine/deprecations)           < 2)
-# remirepo:7
-%else
-Requires:       php-phpdocumentor-type-resolver1              >= 1.7
-Requires:       php-webmozart-assert                          >= 1.9.1
-Requires:       php-phpdocumentor-reflection-common2          >= 2.2
-Requires:       php-phpstan-phpdoc-parser                     >= 1.7
-Requires:       php-doctrine-deprecations                     >= 1.1
-%endif
 # From phpcompatinfo report for 4.3.2
 Requires:       php-reflection
 Requires:       php-pcre
@@ -168,7 +142,7 @@ cat <<BOOTSTRAP | tee -a bootstrap.php
 BOOTSTRAP
 
 RETURN_CODE=0
-for PHP_EXEC in "php %{phpunit}" php73 php74 php80 php81; do
+for PHP_EXEC in "php %{phpunit}" php81 php82 php83 php84; do
     if which $PHP_EXEC; then
         set $PHP_EXEC
         $1 -d auto_prepend_file=$PWD/bootstrap.php \
@@ -184,8 +158,6 @@ exit $RETURN_CODE
 
 
 %files
-# remirepo:1
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
 %doc composer.json
@@ -194,6 +166,9 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue Nov  5 2024 Remi Collet <remi@remirepo.net> - 5.5.0-1
+- update to 5.5.0
+
 * Wed May 22 2024 Remi Collet <remi@remirepo.net> - 5.4.1-1
 - update to 5.4.1