From 673477883245f58437d3da9931c44fee1b39f187 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 Sep 2020 09:25:26 +0200 Subject: update to 3.2.1 raise dependency on microsoft/tolerant-php-parser 0.0.23 --- composer.json | 4 ++-- phan.spec | 26 +++++++++++++++----------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 0ce1ae2..4e1c639 100644 --- a/composer.json +++ b/composer.json @@ -29,14 +29,14 @@ "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.22", + "microsoft/tolerant-php-parser": "0.0.23", "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" }, "suggest": { - "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed, 1.0.6+ is recommended.", + "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed, 1.0.8+ is recommended.", "ext-iconv": "Either iconv or mbstring is needed to ensure issue messages are valid utf-8", "ext-igbinary": "Improves performance of polyfill when ext-ast is unavailable", "ext-mbstring": "Either iconv or mbstring is needed to ensure issue messages are valid utf-8", diff --git a/phan.spec b/phan.spec index 7e89649..f596a85 100644 --- a/phan.spec +++ b/phan.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit cef3be384aa32c7e2d54c9cd57de9836cda02030 +%global gh_commit 22f2083e2b0c10d6861d7d0e2ddd423660488609 %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.2.0 +%global upstream_version 3.2.1 #global upstream_prever RC2 Name: %{gh_project} @@ -36,13 +36,13 @@ Patch0: %{name}-autoload.patch BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.2 -BuildRequires: php-ast >= 1.0.6 +BuildRequires: php-ast >= 1.0.8 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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.22 with php-composer(microsoft/tolerant-php-parser) < 0.1) +BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.23 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) @@ -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.22 +BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.23 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.22", +# "microsoft/tolerant-php-parser": "0.0.23", # "netresearch/jsonmapper": ">=1.6.0", # "sabre/event": "^5.0", # "symfony/console": "^2.3|^3.0|~4.0|^5.0", @@ -103,25 +103,25 @@ Requires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 # From composer.json, "suggest": { -# "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed.", +# "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed, 1.0.8+ is recommended.", # "ext-iconv": "Either iconv or mbstring is needed to ensure issue messages are valid utf-8", # "ext-igbinary": "Improves performance of polyfill when ext-ast is unavailable", # "ext-mbstring": "Either iconv or mbstring is needed to ensure issue messages are valid utf-8", # "ext-tokenizer": "Needed for non-AST support and file/line-based suppressions." -Recommends: php-ast >= 1.0.6 +Recommends: php-ast >= 1.0.8 Suggests: php-igbinary Suggests: php-iconv Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 4) 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.22 with php-composer(microsoft/tolerant-php-parser) < 0.1) +Requires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.23 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:15 %else -Requires: php-ast >= 0.1.5 +Requires: php-ast >= 1.0.1 Requires: php-composer(composer/semver) < 4 Requires: php-composer(composer/semver) >= 1.4 Requires: php-composer(composer/xdebug-handler) < 2 @@ -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.22 +Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.23 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 +* Mon Sep 14 2020 Remi Collet - 3.2.1-1 +- update to 3.2.1 +- raise dependency on microsoft/tolerant-php-parser 0.0.23 + * 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 -- cgit