From 5a1f56c3eedcaa97d185b0322cb2119a1c01c1a4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Apr 2024 15:54:07 +0200 Subject: update to 5.4.0 raise dependency on PHP 7.4 raise dependency on phpdocumentor/type-resolver 1.7 add dependency on phpstan/phpdoc-parser add dependency on doctrine/deprecations --- composer.json | 27 +++++++++--- php-phpdocumentor-reflection-docblock5.spec | 66 ++++++++++++++++++++--------- 2 files changed, 66 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index d907630..cf8f49d 100644 --- a/composer.json +++ b/composer.json @@ -10,19 +10,26 @@ }, { "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "email": "opensource@ijaap.nl" } ], "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/type-resolver": "^1.3", + "php": "^7.4 || ^8.0", + "phpdocumentor/type-resolver": "^1.7", "webmozart/assert": "^1.9.1", "phpdocumentor/reflection-common": "^2.2", - "ext-filter": "*" + "ext-filter": "*", + "phpstan/phpdoc-parser": "^1.7", + "doctrine/deprecations": "^1.1" }, "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" + "mockery/mockery": "~1.3.5", + "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" }, "autoload": { "psr-4": { @@ -34,6 +41,14 @@ "phpDocumentor\\Reflection\\": ["tests/unit", "tests/integration"] } }, + "config": { + "platform": { + "php":"7.4.0" + }, + "allow-plugins": { + "phpstan/extension-installer": true + } + }, "extra": { "branch-alias": { "dev-master": "5.x-dev" diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec index 9820c30..b10be02 100644 --- a/php-phpdocumentor-reflection-docblock5.spec +++ b/php-phpdocumentor-reflection-docblock5.spec @@ -1,6 +1,6 @@ # Fedora/remirepo spec file for php-phpdocumentor-reflection-docblock5 # -# Copyright (c) 2017-2020 Remi Collet, Shawn Iwinski +# Copyright (c) 2017-2024 Remi Collet, Shawn Iwinski # 2014-2015 Remi Collet # # License: CC-BY-SA @@ -8,7 +8,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 622548b623e81ca6d78b721c5e029f4ce664f170 +%global gh_commit 298d2febfe79d03fe714eb871d5538da55205b1a %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.3.0 +Version: 5.4.0 Release: 1%{?dist} Summary: DocBlock parser @@ -31,30 +31,39 @@ Source1: makesrc.sh BuildArch: noarch BuildRequires: php-fedora-autoloader-devel %if %{with tests} -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.4 BuildRequires: php-filter # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(phpdocumentor/type-resolver) >= 1.3 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) -# remirepo:5 +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.3 +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.2", -# "psalm/phar": "^4.8" -BuildRequires: phpunit9 +# "mockery/mockery": "~1.3.5", +# "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" +BuildRequires: phpunit9 >= 9.5 %global phpunit %{_bindir}/phpunit9 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(mockery/mockery) >= 1.3.2 with php-composer(mockery/mockery) < 2) +BuildRequires: (php-composer(mockery/mockery) >= 1.3.5 with php-composer(mockery/mockery) < 2) # remirepo:3 %else -BuildRequires: php-mockery >= 1.3.2 +BuildRequires: php-mockery >= 1.3.5 %endif # From phpcompatinfo report for 5.0.0 BuildRequires: php-reflection @@ -63,23 +72,29 @@ BuildRequires: php-spl %endif # From composer.json, require -# "php": "^7.2 || ^8.0", -# "phpdocumentor/type-resolver": "^1.3", +# "php": "^7.4 || ^8.0", +# "phpdocumentor/type-resolver": "^1.7", # "webmozart/assert": "^1.9.1", # "phpdocumentor/reflection-common": "^2.2", -# "ext-filter": "*" -Requires: php(language) >= 7.2 +# "ext-filter": "*", +# "phpstan/phpdoc-parser": "^1.7", +# "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.3 with php-composer(phpdocumentor/type-resolver) < 2) +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) -# remirepo:5 +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.3 +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 @@ -124,6 +139,8 @@ cat < - 5.4.0-1 +- update to 5.4.0 +- raise dependency on PHP 7.4 +- raise dependency on phpdocumentor/type-resolver 1.7 +- add dependency on phpstan/phpdoc-parser +- add dependency on doctrine/deprecations + * Wed Oct 20 2021 Remi Collet - 5.3.0-1 - update to 5.3.0 -- cgit