summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-03 11:08:39 +0100
committerRemi Collet <remi@remirepo.net>2020-01-03 11:08:39 +0100
commit0e8f74a8314a9fd785e3d9f1e2fcbe0bc252e897 (patch)
tree20c2eea70631926025577cf356921645b63e6588
parent12d0621a93c0507c57eb5a07675596014bb63f85 (diff)
-rw-r--r--composer.json1
-rw-r--r--php-phpdocumentor-reflection-docblock4.spec14
2 files changed, 11 insertions, 4 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..da2728d 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-2020 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,7 +16,7 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: php-phpdocumentor-reflection-docblock%{major}
-Version: 4.3.3
+Version: 4.3.4
Release: 1%{?dist}
Summary: DocBlock parser
@@ -35,7 +35,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 +45,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
@@ -148,6 +149,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',
]);
@@ -180,6 +183,9 @@ exit $RETURN_CODE
%changelog
+* 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