From 935906e547ab945637f897c302277ad3c5e2c208 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Aug 2020 09:40:10 +0200 Subject: update to 3.2.0 raise dependency on microsoft/tolerant-php-parser 0.0.22 --- composer.json | 2 +- phan.spec | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 4fd5f9d..0ce1ae2 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "composer/semver": "^1.4|^2.0|^3.0", "composer/xdebug-handler": "^1.3.2", "felixfbecker/advanced-json-rpc": "^3.0.4", - "microsoft/tolerant-php-parser": "0.0.20", + "microsoft/tolerant-php-parser": "0.0.22", "netresearch/jsonmapper": ">=1.6.0", "sabre/event": "^5.0", "symfony/console": "^2.3|^3.0|^4.0|^5.0", diff --git a/phan.spec b/phan.spec index 031c136..7e89649 100644 --- a/phan.spec +++ b/phan.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit d9ee6bd18aa993b4f8d35245b9c24fbd27e204f3 +%global gh_commit cef3be384aa32c7e2d54c9cd57de9836cda02030 %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.1 +%global upstream_version 3.2.0 #global upstream_prever RC2 Name: %{gh_project} @@ -42,11 +42,11 @@ BuildRequires: php-ast >= 1.0.6 BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 4) 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(microsoft/tolerant-php-parser) >= 0.0.22 with php-composer(microsoft/tolerant-php-parser) < 0.1) 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 +# remirepo:14 %else BuildRequires: php-composer(composer/semver) < 4 BuildRequires: php-composer(composer/semver) >= 1.4 @@ -55,7 +55,7 @@ BuildRequires: php-composer(composer/xdebug-handler) >= 1.3.2 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(microsoft/tolerant-php-parser) >= 0.0.22 BuildRequires: php-composer(netresearch/jsonmapper) >= 1.6 BuildRequires: php-composer(sabre/event) < 6 BuildRequires: php-composer(sabre/event) >= 5.0 @@ -91,7 +91,7 @@ BuildRequires: php-composer(fedora/autoloader) # "composer/semver": "^1.4|^2.0|^3.0", # "composer/xdebug-handler": "^1.3.2", # "felixfbecker/advanced-json-rpc": "^3.0.4", -# "microsoft/tolerant-php-parser": "0.0.20", +# "microsoft/tolerant-php-parser": "0.0.22", # "netresearch/jsonmapper": ">=1.6.0", # "sabre/event": "^5.0", # "symfony/console": "^2.3|^3.0|~4.0|^5.0", @@ -115,11 +115,11 @@ Requires: (php-composer(composer/semver) >= 1.4 with php- Requires: (php-composer(composer/xdebug-handler) >= 1.3.2 with php-composer(composer/xdebug-handler) < 2) 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(microsoft/tolerant-php-parser) >= 0.0.22 with php-composer(microsoft/tolerant-php-parser) < 0.1) 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 +# remirepo:15 %else Requires: php-ast >= 0.1.5 Requires: php-composer(composer/semver) < 4 @@ -129,7 +129,7 @@ Requires: php-composer(composer/xdebug-handler) >= 1.3.2 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(microsoft/tolerant-php-parser) >= 0.0.22 Requires: php-composer(netresearch/jsonmapper) >= 1.6 Requires: php-composer(sabre/event) < 6 Requires: php-composer(sabre/event) >= 5.0 @@ -248,6 +248,10 @@ EOF %changelog +* Wed Aug 26 2020 Remi Collet - 3.2.0-1 +- update to 3.2.0 +- raise dependency on microsoft/tolerant-php-parser 0.0.22 + * Tue Aug 11 2020 Remi Collet - 3.1.1-1 - update to 3.1.1 - allow netresearch/jsonmapper 3.0 -- cgit