From 3f2b782c4757ee4147016323adb24536b650eb89 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Jul 2020 14:01:33 +0200 Subject: [PATCH] update to 5.2.0 raise dependency on phpdocumentor/type-resolver 1.3 raise dependency on webmozart/assert 1.9.1 raise dependency on phpdocumentor/reflection-common 2.2 raise build dependency on mockery/mockery 1.3.2 switch to phpunit9 --- .gitignore | 1 + php-phpdocumentor-reflection-docblock5.spec | 55 ++++++++++++--------- sources | 2 +- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index c68c2bf..46c25c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-phpdocumentor-reflection-docblock5-5.1.0-cd72d39.tar.gz +/php-phpdocumentor-reflection-docblock5-5.2.0-3170448.tar.gz diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec index 6b7589e..dbe7b16 100644 --- a/php-phpdocumentor-reflection-docblock5.spec +++ b/php-phpdocumentor-reflection-docblock5.spec @@ -8,15 +8,15 @@ # # Please, preserve the changelog entries # -%global gh_commit cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e +%global gh_commit 3170448f5769fe19f456173d833734e0ff1b84df %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpDocumentor %global gh_project ReflectionDocBlock %global major 5 -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} +%bcond_without tests Name: php-phpdocumentor-reflection-docblock%{major} -Version: 5.1.0 +Version: 5.2.0 Release: 1%{?dist} Summary: DocBlock parser @@ -30,17 +30,17 @@ Source1: makesrc.sh BuildArch: noarch BuildRequires: php-fedora-autoloader-devel -%if %{with_tests} +%if %{with tests} BuildRequires: php(language) >= 7.2 BuildRequires: php-filter -BuildRequires: (php-composer(phpdocumentor/type-resolver) >= 1.0 with php-composer(phpdocumentor/type-resolver) < 2) -BuildRequires: (php-composer(webmozart/assert) >= 1.0 with php-composer(webmozart/assert) < 2) -BuildRequires: (php-composer(phpdocumentor/reflection-common) >= 2.0 with php-composer(phpdocumentor/reflection-common) < 3) +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) # From composer.json, require-dev -# "mockery/mockery": "^1", -# "doctrine/instantiator": "^1" -BuildRequires: (php-composer(mockery/mockery) >= 1.0 with php-composer(mockery/mockery) < 2) -BuildRequires: phpunit8 +# "mockery/mockery": "~1.3.2" +BuildRequires: (php-composer(mockery/mockery) >= 1.3.2 with php-composer(mockery/mockery) < 2) +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 # From phpcompatinfo report for 5.0.0 BuildRequires: php-reflection BuildRequires: php-pcre @@ -48,16 +48,16 @@ BuildRequires: php-spl %endif # From composer.json, require -# "php": "^7.2", -# "phpdocumentor/type-resolver": "^1.0", -# "webmozart/assert": "^1", -# "phpdocumentor/reflection-common": "^2.0", -# "ext-filter": "^7.1" +# "php": "^7.2 || ^8.0", +# "phpdocumentor/type-resolver": "^1.3", +# "webmozart/assert": "^1.9.1", +# "phpdocumentor/reflection-common": "^2.2", +# "ext-filter": "*" Requires: php(language) >= 7.2 Requires: php-filter -Requires: (php-composer(phpdocumentor/type-resolver) >= 1.0 with php-composer(phpdocumentor/type-resolver) < 2) -Requires: (php-composer(webmozart/assert) >= 1.0 with php-composer(webmozart/assert) < 2) -Requires: (php-composer(phpdocumentor/reflection-common) >= 2.0 with php-composer(phpdocumentor/reflection-common) < 3) +Requires: (php-composer(phpdocumentor/type-resolver) >= 1.3 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) # From phpcompatinfo report for 4.3.2 Requires: php-reflection Requires: php-pcre @@ -110,7 +110,7 @@ cp -pr src/DocBlock %{buildroot}%{_datadir}/php/phpDocumentor/Reflection/DocBloc %check -%if %{with_tests} +%if %{with tests} sed -e '/autoload.php/d' -i examples/*.php examples/*/*.php phpab \ @@ -127,10 +127,11 @@ cat < - 5.2.0-1 +- update to 5.2.0 +- raise dependency on phpdocumentor/type-resolver 1.3 +- raise dependency on webmozart/assert 1.9.1 +- raise dependency on phpdocumentor/reflection-common 2.2 +- raise build dependency on mockery/mockery 1.3.2 +- switch to phpunit9 + * Wed Feb 26 2020 Remi Collet - 5.1.0-1 - update to 5.1.0 - drop unneeded hack as our PR was merged upstream diff --git a/sources b/sources index 3bff126..e37bf96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-reflection-docblock5-5.1.0-cd72d39.tar.gz) = b179b07bc8a7a8852f1f02f1bbcce1985eefbff765c3b1054946d77fc8b0f1a145c729155904416d62847cec3cadff341de0e1fca6daee65a5094c35dcc2d467 +SHA512 (php-phpdocumentor-reflection-docblock5-5.2.0-3170448.tar.gz) = 568f0625c9198e5a1bcd5bbf7079db357f9e4c45fba75cdf4b3b011a7aca6be0ff70cae08481a27959f06da272db21a3eab6f135fc2ccdd798a43ee7315fccc3