From 012876d1da024cab765e9f45378fb719328970e6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Oct 2018 09:14:04 +0200 Subject: update to 1.0.7 raise dependency on microsoft/tolerant-php-parser 0.0.15 php-ast is optional --- composer.json | 2 +- phan.spec | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 31f549d..08dd618 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "composer/semver": "^1.4", "composer/xdebug-handler": "^1.3", "felixfbecker/advanced-json-rpc": "^3.0.3", - "microsoft/tolerant-php-parser": "0.0.13", + "microsoft/tolerant-php-parser": "0.0.15", "sabre/event": "^5.0", "symfony/console": "^2.3|^3.0|~4.0" }, diff --git a/phan.spec b/phan.spec index e8c770f..65ee51a 100644 --- a/phan.spec +++ b/phan.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 11eb4f3235ccc2ce5a5709bccdbdb674152e36ba +%global gh_commit a0727954afb3cd87dd97d2026434b4b248218f42 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phan #global gh_date 20150820 @@ -19,7 +19,7 @@ %global with_tests 0%{!?_without_tests:1} Name: %{gh_project} -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: A static analyzer for PHP @@ -40,7 +40,7 @@ BuildRequires: php-ast >= 0.1.5 BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 2) BuildRequires: (php-composer(composer/xdebug-handler) >= 1.3 with php-composer(composer/xdebug-handler) < 2) BuildRequires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.3 with php-composer(felixfbecker/advanced-json-rpc) < 4) -BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.13 with php-composer(microsoft/tolerant-php-parser) < 1) +BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.15 with php-composer(microsoft/tolerant-php-parser) < 1) 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) < 5) # remirepo:13 @@ -52,7 +52,7 @@ BuildRequires: php-composer(composer/xdebug-handler) >= 1.3 BuildRequires: php-composer(felixfbecker/advanced-json-rpc) < 4 BuildRequires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.3 BuildRequires: php-composer(microsoft/tolerant-php-parser) < 1 -BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.13 +BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.15 BuildRequires: php-composer(sabre/event) < 6 BuildRequires: php-composer(sabre/event) >= 5.0 BuildRequires: php-composer(symfony/console) < 4 @@ -85,24 +85,25 @@ BuildRequires: php-composer(fedora/autoloader) # "composer/semver": "^1.4", # "composer/xdebug-handler": "^1.3", # "felixfbecker/advanced-json-rpc": "^3.0.3", -# "microsoft/tolerant-php-parser": "0.0.13", +# "microsoft/tolerant-php-parser": "0.0.15", # "sabre/event": "^5.0", # "symfony/console": "~2.3|~3.0|~4.0" Requires: php(language) >= 7.0.0 -Requires: php-ast >= 0.1.5 Requires: php-filter Requires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Recommends: php-ast >= 0.1.5 Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 2) Requires: (php-composer(composer/xdebug-handler) >= 1.3 with php-composer(composer/xdebug-handler) < 2) Requires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.3 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.13 with php-composer(microsoft/tolerant-php-parser) < 1) +Requires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.15 with php-composer(microsoft/tolerant-php-parser) < 1) 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) < 5) -# remirepo:13 +# remirepo:14 %else +Requires: php-ast >= 0.1.5 Requires: php-composer(composer/semver) < 2 Requires: php-composer(composer/semver) >= 1.4 Requires: php-composer(composer/xdebug-handler) < 2 @@ -110,7 +111,7 @@ Requires: php-composer(composer/xdebug-handler) >= 1.3 Requires: php-composer(felixfbecker/advanced-json-rpc) < 4 Requires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.3 Requires: php-composer(microsoft/tolerant-php-parser) < 1 -Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.13 +Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.15 Requires: php-composer(sabre/event) < 6 Requires: php-composer(sabre/event) >= 5.0 Requires: php-composer(symfony/console) < 4 @@ -215,6 +216,11 @@ EOF %changelog +* Wed Oct 3 2018 Remi Collet - 1.0.7-1 +- update to 1.0.7 +- raise dependency on microsoft/tolerant-php-parser 0.0.15 +- php-ast is optional + * Wed Sep 26 2018 Remi Collet - 1.0.6-1 - update to 1.0.6 - sources from git snapshot -- cgit