From 92e963a81b737acdfaaf82444794b180a2e30c8c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Aug 2020 11:21:16 +0200 Subject: update to 3.1.1 allow netresearch/jsonmapper 3.0 --- phan.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'phan.spec') diff --git a/phan.spec b/phan.spec index eb2686d..031c136 100644 --- a/phan.spec +++ b/phan.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b04358cfb5a9ead1c587c08fdbe84283f8c46c01 +%global gh_commit d9ee6bd18aa993b4f8d35245b9c24fbd27e204f3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phan #global gh_date 20150820 %global gh_project phan %global psr0 Phan %bcond_without tests -%global upstream_version 3.1.0 +%global upstream_version 3.1.1 #global upstream_prever RC2 Name: %{gh_project} @@ -43,7 +43,7 @@ BuildRequires: (php-composer(composer/semver) >= 1.4 with php- BuildRequires: (php-composer(composer/xdebug-handler) >= 1.3.2 with php-composer(composer/xdebug-handler) < 2) BuildRequires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 with php-composer(felixfbecker/advanced-json-rpc) < 4) BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.20 with php-composer(microsoft/tolerant-php-parser) < 0.1) -BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 3) +BuildRequires: php-composer(netresearch/jsonmapper) >= 1.6 BuildRequires: (php-composer(sabre/event) >= 5.0 with php-composer(sabre/event) < 6) BuildRequires: (php-composer(symfony/console) >= 2.8 with php-composer(symfony/console) < 6) # remirepo:15 @@ -56,7 +56,6 @@ BuildRequires: php-composer(felixfbecker/advanced-json-rpc) < 4 BuildRequires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 BuildRequires: php-composer(microsoft/tolerant-php-parser) < 0.1 BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.18 -BuildRequires: php-composer(netresearch/jsonmapper) < 3 BuildRequires: php-composer(netresearch/jsonmapper) >= 1.6 BuildRequires: php-composer(sabre/event) < 6 BuildRequires: php-composer(sabre/event) >= 5.0 @@ -93,7 +92,7 @@ BuildRequires: php-composer(fedora/autoloader) # "composer/xdebug-handler": "^1.3.2", # "felixfbecker/advanced-json-rpc": "^3.0.4", # "microsoft/tolerant-php-parser": "0.0.20", -# "netresearch/jsonmapper": "^1.6.0|^2.0", +# "netresearch/jsonmapper": ">=1.6.0", # "sabre/event": "^5.0", # "symfony/console": "^2.3|^3.0|~4.0|^5.0", # "symfony/polyfill-mbstring": "^1.11.0" @@ -117,7 +116,7 @@ Requires: (php-composer(composer/xdebug-handler) >= 1.3.2 with php- Requires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 with php-composer(felixfbecker/advanced-json-rpc) < 4) Requires: (php-composer(nikic/php-parser) >= 3.1.1 with php-composer(nikic/php-parser) < 4) Requires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.20 with php-composer(microsoft/tolerant-php-parser) < 0.1) -Requires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 3) +Requires: php-composer(netresearch/jsonmapper) >= 1.6 Requires: (php-composer(sabre/event) >= 5.0 with php-composer(sabre/event) < 6) Requires: (php-composer(symfony/console) >= 2.8 with php-composer(symfony/console) < 6) # remirepo:16 @@ -131,7 +130,6 @@ Requires: php-composer(felixfbecker/advanced-json-rpc) < 4 Requires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 Requires: php-composer(microsoft/tolerant-php-parser) < 0.1 Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.18 -Requires: php-composer(netresearch/jsonmapper) < 3 Requires: php-composer(netresearch/jsonmapper) >= 1.6 Requires: php-composer(sabre/event) < 6 Requires: php-composer(sabre/event) >= 5.0 @@ -228,8 +226,9 @@ EOF # NOTICE mosquitto, request and grpc must be disabled # testHash failing on bigendian +# testConstantsDocumented was written for php-ast 1.0.6 and php <=7.4 %{_bindir}/phpunit8 -d memory_limit=1G \ - --filter '^((?!(testGetProjectRelativePathForPath|testHash)).)*$' \ + --filter '^((?!(testGetProjectRelativePathForPath|testHash|testConstantsDocumented)).)*$' \ --bootstrap tests/autoload.php --verbose @@ -249,6 +248,10 @@ EOF %changelog +* Tue Aug 11 2020 Remi Collet - 3.1.1-1 +- update to 3.1.1 +- allow netresearch/jsonmapper 3.0 + * Fri Jul 17 2020 Remi Collet - 3.1.0-1 - update to 3.1.0 -- cgit