diff options
| -rw-r--r-- | composer.json | 28 | ||||
| -rw-r--r-- | php-phpdocumentor-reflection-docblock5.spec | 119 |
2 files changed, 93 insertions, 54 deletions
diff --git a/composer.json b/composer.json index 7038f48..8105049 100644 --- a/composer.json +++ b/composer.json @@ -10,18 +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|^2.0", + "doctrine/deprecations": "^1.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "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", + "psalm/phar": "^5.26" }, "autoload": { "psr-4": { @@ -30,7 +38,15 @@ }, "autoload-dev": { "psr-4": { - "phpDocumentor\\Reflection\\": "tests/unit" + "phpDocumentor\\Reflection\\": ["tests/unit", "tests/integration"] + } + }, + "config": { + "platform": { + "php":"7.4.0" + }, + "allow-plugins": { + "phpstan/extension-installer": true } }, "extra": { diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec index 77b6ca3..21d0732 100644 --- a/php-phpdocumentor-reflection-docblock5.spec +++ b/php-phpdocumentor-reflection-docblock5.spec @@ -1,14 +1,12 @@ # Fedora/remirepo spec file for php-phpdocumentor-reflection-docblock5 # -# Copyright (c) 2017-2020 Remi Collet, Shawn Iwinski -# 2014-2015 Remi Collet -# -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2014-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global gh_commit d870572532cd70bc3fab58f2e23ad423c8404c44 +%global gh_commit 92dde6a5919e34835c506ac8c523ef095a95ed62 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpDocumentor %global gh_project ReflectionDocBlock @@ -16,7 +14,7 @@ %bcond_without tests Name: php-phpdocumentor-reflection-docblock%{major} -Version: 5.2.1 +Version: 5.6.2 Release: 1%{?dist} Summary: DocBlock parser @@ -31,32 +29,24 @@ 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 -%else -BuildRequires: php-phpdocumentor-type-resolver1 >= 1.3 -BuildRequires: php-webmozart-assert >= 1.9.1 -BuildRequires: php-phpdocumentor-reflection-common2 >= 2.2 -%endif +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) < 3) +BuildRequires: (php-composer(doctrine/deprecations) >= 1.1 with php-composer(doctrine/deprecations) < 2) # From composer.json, require-dev -# "mockery/mockery": "~1.3.2" -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(mockery/mockery) >= 1.3.2 with php-composer(mockery/mockery) < 2) -BuildRequires: phpunit9 +# "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", +# "psalm/phar": "^5.26" +BuildRequires: phpunit9 >= 9.5 %global phpunit %{_bindir}/phpunit9 -# remirepo:5 -%else -BuildRequires: php-mockery >= 1.3.2 -BuildRequires: phpunit8 -%global phpunit %{_bindir}/phpunit8 -%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 @@ -64,24 +54,20 @@ 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|^2.0", +# "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 -%else -Requires: php-phpdocumentor-type-resolver1 >= 1.3 -Requires: php-webmozart-assert >= 1.9.1 -Requires: php-phpdocumentor-reflection-common2 >= 2.2 -%endif +Requires: (php-composer(phpstan/phpdoc-parser) >= 1.7 with php-composer(phpstan/phpdoc-parser) < 3) +Requires: (php-composer(doctrine/deprecations) >= 1.1 with php-composer(doctrine/deprecations) < 2) # From phpcompatinfo report for 4.3.2 Requires: php-reflection Requires: php-pcre @@ -109,7 +95,8 @@ sed 's#vendor/mockery/mockery/library/Mockery#%{_datadir}/php/Mockery1#' phpunit > phpunit.xml # single directory tree -mv src/*php src/DocBlock/ +mv src/*php src/DocBlock/ +mv src/Exception src/DocBlock/ %build @@ -124,6 +111,8 @@ cat <<AUTOLOAD | tee -a src/DocBlock/autoload.php '%{_datadir}/php/phpDocumentor/Reflection2/autoload-common.php', '%{_datadir}/php/phpDocumentor/Reflection2/autoload-type-resolver.php', '%{_datadir}/php/Webmozart/Assert/autoload.php', + '%{_datadir}/php/PHPStan/PhpDocParser/autoload.php', + '%{_datadir}/php/Doctrine/Deprecations/autoload.php', ]); AUTOLOAD @@ -140,7 +129,7 @@ sed -e '/autoload.php/d' -i examples/*.php examples/*/*.php phpab \ --template fedora \ --output bootstrap.php \ - tests/unit/ + tests/unit tests/integration cat <<BOOTSTRAP | tee -a bootstrap.php @@ -151,12 +140,13 @@ cat <<BOOTSTRAP | tee -a bootstrap.php BOOTSTRAP RETURN_CODE=0 -for PHP_EXEC in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; 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 \ ${2:-%{_bindir}/phpunit9} \ --bootstrap bootstrap.php \ + --filter '^((?!(testAddingAKeyword|testRegressionWordpressDocblocks|testIndentationIsKept)).)*$' \ --verbose || RETURN_CODE=1 fi done @@ -167,8 +157,6 @@ exit $RETURN_CODE %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json @@ -177,6 +165,41 @@ exit $RETURN_CODE %changelog +* Mon Apr 14 2025 Remi Collet <remi@remirepo.net> - 5.6.2-1 +- update to 5.6.2 + +* Mon Dec 23 2024 Remi Collet <remi@remirepo.net> - 5.6.1-2 +- allow phpstan/phpdoc-parser v2 + +* Mon Dec 9 2024 Remi Collet <remi@remirepo.net> - 5.6.1-1 +- update to 5.6.1 +- re-license spec file to CECILL-2.1 + +* Tue Nov 12 2024 Remi Collet <remi@remirepo.net> - 5.6.0-1 +- update to 5.6.0 + +* Wed Nov 6 2024 Remi Collet <remi@remirepo.net> - 5.5.1-1 +- update to 5.5.1 + +* 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 + +* Thu Apr 25 2024 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 5.3.0-1 +- update to 5.3.0 + +* Fri Sep 18 2020 Remi Collet <remi@remirepo.net> - 5.2.2-1 +- update to 5.2.2 + * Mon Aug 17 2020 Remi Collet <remi@remirepo.net> - 5.2.1-1 - update to 5.2.1 |