diff options
| -rw-r--r-- | composer.json | 1 | ||||
| -rw-r--r-- | php-phpdocumentor-reflection-docblock4.spec | 33 |
2 files changed, 26 insertions, 8 deletions
diff --git a/composer.json b/composer.json index f15fe38..9bbf8eb 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ }, "require-dev": { "mockery/mockery": "^1.0", + "phpdocumentor/type-resolver": "0.4.*", "phpunit/phpunit": "^6.4", "doctrine/instantiator": "^1.0.5" }, diff --git a/php-phpdocumentor-reflection-docblock4.spec b/php-phpdocumentor-reflection-docblock4.spec index 6feb72c..2a69cd3 100644 --- a/php-phpdocumentor-reflection-docblock4.spec +++ b/php-phpdocumentor-reflection-docblock4.spec @@ -1,6 +1,6 @@ # Fedora/remirepo spec file for php-phpdocumentor-reflection-docblock4 # -# Copyright (c) 2017-2019 Remi Collet, Shawn Iwinski +# Copyright (c) 2017-2021 Remi Collet, Shawn Iwinski # 2014-2015 Remi Collet # # License: CC-BY-SA @@ -8,7 +8,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 2ecaa9fef01634c83bfa8dc1fe35fb5cef223a62 +%global gh_commit da3fd972d6bafd628114f7e7e036f45944b62e9c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpDocumentor %global gh_project ReflectionDocBlock @@ -16,8 +16,8 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-phpdocumentor-reflection-docblock%{major} -Version: 4.3.3 -Release: 1%{?dist} +Version: 4.3.4 +Release: 5%{?dist} Summary: DocBlock parser License: MIT @@ -28,6 +28,9 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_commit}.tar.gz Source1: %{name}-get-source.sh +# Minimal fix for PHP 8 +Patch0: %{name}-php8.patch + BuildArch: noarch BuildRequires: php-fedora-autoloader-devel %if %{with_tests} @@ -35,7 +38,7 @@ BuildRequires: php(language) >= 7.0 # 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(phpdocumentor/type-resolver) >= 0.4.0 with php-composer(phpdocumentor/type-resolver) < 0.5) BuildRequires: (php-composer(webmozart/assert) >= 1.0 with php-composer(webmozart/assert) < 2) # remirepo:5 %else @@ -45,6 +48,7 @@ BuildRequires: php-webmozart-assert >= 1.0 %endif # From composer.json, require-dev # "mockery/mockery": "^1.0", +# "phpdocumentor/type-resolver": "0.4.*", # "phpunit/phpunit": "^6.4", # "doctrine/instantiator": "^1.0.5" # remirepo:1 @@ -54,7 +58,7 @@ BuildRequires: (php-composer(mockery/mockery) >= 1.0 with php-composer(mockery/m %else BuildRequires: php-mockery >= 1.0 %endif -BuildRequires: phpunit6 >= 6.4 +BuildRequires: phpunit7 # From phpcompatinfo report for 4.3.2 BuildRequires: php-reflection BuildRequires: php-filter @@ -102,6 +106,7 @@ Autoloader: %{_datadir}/php/phpDocumentor/Reflection/DocBlock%{major}/autoload.p %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 sed 's#vendor/mockery/mockery/library/Mockery#%{_datadir}/php/Mockery1#' phpunit.xml.dist \ > phpunit.xml @@ -148,6 +153,8 @@ phpab \ cat <<BOOTSTRAP | tee -a bootstrap.php \Fedora\Autoloader\Dependencies::required([ + // only v0.4 at buidtime + '%{_datadir}/php/phpDocumentor/Reflection/autoload-type-resolver.php', '%{buildroot}%{_datadir}/php/phpDocumentor/Reflection/DocBlock%{major}/autoload.php', '%{_datadir}/php/Mockery1/autoload.php', ]); @@ -155,10 +162,11 @@ BOOTSTRAP # use auto_prepend_file to ensure build version used first RETURN_CODE=0 -for PHP_EXEC in php php71 php72 php73 php74; do +for PHP_EXEC in php php73 php74 php80; do if which $PHP_EXEC; then $PHP_EXEC -d auto_prepend_file=$PWD/bootstrap.php \ - %{_bindir}/phpunit6 \ + %{_bindir}/phpunit7 \ + --no-coverage \ --bootstrap bootstrap.php \ --verbose || RETURN_CODE=1 fi @@ -180,6 +188,15 @@ exit $RETURN_CODE %changelog +* Tue Mar 23 2021 Remi Collet <remi@remirepo.net> - 4.3.4-5 +- fix FTBFS with PHP 8 + +* Fri Jan 29 2021 Remi Collet <remi@remirepo.net> - 4.3.4-4 +- switch to phpunit7 and fix FTBFS + +* Fri Jan 3 2020 Remi Collet <remi@remirepo.net> - 4.3.4-1 +- update to 4.3.4 + * Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 4.3.3-1 - update to 4.3.3 |