diff options
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | php-phpdocumentor-reflection-docblock4.spec | 85 |
2 files changed, 51 insertions, 40 deletions
diff --git a/composer.json b/composer.json index e3dc38a..f15fe38 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,8 @@ ], "require": { "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0", - "phpdocumentor/type-resolver": "^0.4.0", + "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", + "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", "webmozart/assert": "^1.0" }, "autoload": { @@ -24,7 +24,7 @@ "require-dev": { "mockery/mockery": "^1.0", "phpunit/phpunit": "^6.4", - "doctrine/instantiator": "~1.0.5" + "doctrine/instantiator": "^1.0.5" }, "extra": { "branch-alias": { diff --git a/php-phpdocumentor-reflection-docblock4.spec b/php-phpdocumentor-reflection-docblock4.spec index 8dfe532..2df5375 100644 --- a/php-phpdocumentor-reflection-docblock4.spec +++ b/php-phpdocumentor-reflection-docblock4.spec @@ -8,7 +8,7 @@ # # Please, preserve the changelog entries # -%global gh_commit bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c +%global gh_commit b83ff7cfcfee7827e1e78b637a5904fe6a96698e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpDocumentor %global gh_project ReflectionDocBlock @@ -16,7 +16,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-phpdocumentor-reflection-docblock%{major} -Version: 4.3.1 +Version: 4.3.2 Release: 1%{?dist} Summary: DocBlock parser @@ -32,58 +32,57 @@ BuildArch: noarch BuildRequires: php-fedora-autoloader-devel %if %{with_tests} BuildRequires: php(language) >= 7.0 -%if 0%{?fedora} >= 27 -BuildRequires: (php-composer(phpdocumentor/reflection-common) >= 1.0 with php-composer(phpdocumentor/reflection-common) < 2) -BuildRequires: (php-composer(phpdocumentor/type-resolver) >= 0.4.0 with php-composer(phpdocumentor/type-resolver) < 1.0) -BuildRequires: (php-composer(webmozart/assert) >= 1.0 with php-composer(webmozart/assert) < 2) +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(phpdocumentor/reflection-common) >= 1.0.0 with php-composer(phpdocumentor/reflection-common) < 3) +BuildRequires: (php-composer(phpdocumentor/type-resolver) >= 0.4.0 with php-composer(phpdocumentor/type-resolver) < 2) +BuildRequires: (php-composer(webmozart/assert) >= 1.0 with php-composer(webmozart/assert) < 2) +# remirepo:5 %else -BuildRequires: php-composer(phpdocumentor/reflection-common) < 2 -BuildRequires: php-composer(phpdocumentor/reflection-common) >= 1.0 -BuildRequires: php-composer(phpdocumentor/type-resolver) < 1.0 -BuildRequires: php-composer(phpdocumentor/type-resolver) >= 0.4.0 -BuildRequires: php-composer(webmozart/assert) < 2 -BuildRequires: php-composer(webmozart/assert) >= 1.0 +BuildRequires: php-phpdocumentor-reflection-common >= 1.0.0 +BuildRequires: php-phpdocumentor-type-resolver >= 0.4.0 +BuildRequires: php-webmozart-assert >= 1.0 %endif # From composer.json, require-dev # "mockery/mockery": "^1.0", # "phpunit/phpunit": "^6.4", -# "doctrine/instantiator": "~1.0.5" -%if 0%{?fedora} >= 27 -BuildRequires: (php-composer(mockery/mockery) >= 1.0 with php-composer(mockery/mockery) < 2) +# "doctrine/instantiator": "^1.0.5" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(mockery/mockery) >= 1.0 with php-composer(mockery/mockery) < 2) +# remirepo:3 %else -BuildRequires: php-composer(mockery/mockery) < 2 -BuildRequires: php-composer(mockery/mockery) >= 1.0 +BuildRequires: php-mockery >= 1.0 %endif BuildRequires: phpunit6 >= 6.4 -# From phpcompatinfo report for 4.2.0 +# From phpcompatinfo report for 4.3.2 +BuildRequires: php-reflection BuildRequires: php-filter BuildRequires: php-pcre -BuildRequires: php-reflection BuildRequires: php-spl %endif # From composer.json, require # "php": ">=7.0" -# "phpdocumentor/reflection-common": "^1.0.0", -# "phpdocumentor/type-resolver": "^0.4.0", +# "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", +# "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", # "webmozart/assert": "^1.0" Requires: php(language) >= 7.0 -%if 0%{?fedora} >= 27 -Requires: (php-composer(phpdocumentor/reflection-common) >= 1.0 with php-composer(phpdocumentor/reflection-common) < 2) -Requires: (php-composer(phpdocumentor/type-resolver) >= 0.4.0 with php-composer(phpdocumentor/type-resolver) < 1.0) -Requires: (php-composer(webmozart/assert) >= 1.0 with php-composer(webmozart/assert) < 2) +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(phpdocumentor/reflection-common) >= 1.0.0 with php-composer(phpdocumentor/reflection-common) < 3) +Requires: (php-composer(phpdocumentor/type-resolver) >= 0.4.0 with php-composer(phpdocumentor/type-resolver) < 2) +Requires: (php-composer(webmozart/assert) >= 1.0 with php-composer(webmozart/assert) < 2) +# remirepo:5 %else -Requires: php-composer(phpdocumentor/reflection-common) < 2 -Requires: php-composer(phpdocumentor/reflection-common) >= 1.0 -Requires: php-composer(phpdocumentor/type-resolver) < 1 -Requires: php-composer(phpdocumentor/type-resolver) >= 0.4.0 -Requires: php-composer(webmozart/assert) < 2 -Requires: php-composer(webmozart/assert) >= 1.0 +Requires: php-phpdocumentor-reflection-common >= 1.0.0 +Requires: php-phpdocumentor-type-resolver >= 0.4.0 +Requires: php-webmozart-assert >= 1.0 %endif -# From phpcompatinfo report for 3.2.1 +# From phpcompatinfo report for 4.3.2 +Requires: php-reflection Requires: php-filter Requires: php-pcre -Requires: php-reflection Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -120,8 +119,13 @@ phpab \ cat <<AUTOLOAD | tee -a src/DocBlock/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/phpDocumentor/Reflection/autoload-common.php', - '%{_datadir}/php/phpDocumentor/Reflection/autoload-type-resolver.php', + [ + '%{_datadir}/php/phpDocumentor/Reflection2/autoload-common.php', + '%{_datadir}/php/phpDocumentor/Reflection/autoload-common.php', + ], [ + '%{_datadir}/php/phpDocumentor/Reflection2/autoload-type-resolver.php', + '%{_datadir}/php/phpDocumentor/Reflection/autoload-type-resolver.php', + ], '%{_datadir}/php/Webmozart/Assert/autoload.php', ]); AUTOLOAD @@ -151,7 +155,7 @@ BOOTSTRAP # use auto_prepend_file to ensure build version used first RETURN_CODE=0 -for PHP_EXEC in php php71 php72 php73; do +for PHP_EXEC in php php71 php72 php73 php74; do if which $PHP_EXEC; then $PHP_EXEC -d auto_prepend_file=$PWD/bootstrap.php \ %{_bindir}/phpunit6 \ @@ -166,14 +170,21 @@ exit $RETURN_CODE %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json -%{_datadir}/php/phpDocumentor/Reflection/DocBlock%{major} +%dir %{_datadir}/php/phpDocumentor/Reflection + %{_datadir}/php/phpDocumentor/Reflection/DocBlock%{major} %changelog +* Fri Sep 13 2019 Remi Collet <remi@remirepo.net> - 4.3.2-1 +- update to 4.3.2 +- allow reflection-common 2.0 +- allow type-resolver 1.0 + * Thu May 2 2019 Remi Collet <remi@remirepo.net> - 4.3.1-1 - update to 4.3.1 |