diff options
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | phan.spec | 19 | 
2 files changed, 15 insertions, 10 deletions
diff --git a/composer.json b/composer.json index d686e72..f8dc089 100644 --- a/composer.json +++ b/composer.json @@ -29,18 +29,18 @@          "composer/semver": "^1.4",          "composer/xdebug-handler": "^1.3.2",          "felixfbecker/advanced-json-rpc": "^3.0.4", -        "microsoft/tolerant-php-parser": "0.0.18", +        "microsoft/tolerant-php-parser": "0.0.20",          "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.", +        "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed, 1.0.6+ 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." +        "ext-tokenizer": "Needed for fallback/polyfill parser support and file/line-based suppressions."      },      "require-dev": {          "brianium/paratest": "^4.0.0", @@ -10,14 +10,14 @@  # For compatibility with SCL  %undefine __brp_mangle_shebangs -%global gh_commit    d458d8197b5b25bdca4c442be9a50321f0f8a15b +%global gh_commit    d082d19370ff87e6036073eaccda7c06ddc3f53e  %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  %global with_tests   0%{!?_without_tests:1} -%global upstream_version 2.5.0 +%global upstream_version 2.6.0  #global upstream_prever  RC2  Name:           %{gh_project} @@ -36,13 +36,13 @@ Patch0:         %{name}-autoload.patch  BuildArch:      noarch  %if %{with_tests}  BuildRequires:  php(language) >= 7.1.0 -BuildRequires:  php-ast >= 1.0.1 +BuildRequires:  php-ast >= 1.0.6  # remirepo:1  %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8  BuildRequires:  (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 2)  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.18 with php-composer(microsoft/tolerant-php-parser) <  0.1) +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)        <  2)  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) @@ -93,7 +93,7 @@ BuildRequires:  php-composer(fedora/autoloader)  #        "composer/semver": "^1.4",  #        "composer/xdebug-handler": "^1.3.2",  #        "felixfbecker/advanced-json-rpc": "^3.0.4", -#        "microsoft/tolerant-php-parser": "0.0.18", +#        "microsoft/tolerant-php-parser": "0.0.20",  #        "netresearch/jsonmapper": "^1.6.0",  #        "sabre/event": "^5.0",  #        "symfony/console": "^2.3|^3.0|~4.0|^5.0", @@ -110,14 +110,14 @@ Requires:       php-json  #        "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.1 +Recommends:     php-ast >= 1.0.6  Suggests:       php-igbinary  Suggests:       php-iconv  Requires:       (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 2)  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.18 with php-composer(microsoft/tolerant-php-parser) <  0.1) +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)        <  2)  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) @@ -243,6 +243,11 @@ EOF  %changelog +* Mon Mar  9 2020 Remi Collet <remi@remirepo.net> - 2.6.0-1 +- update to 2.6.0 +- raise dependency on microsoft/tolerant-php-parser 0.0.20 +- raise dependency on ast 1.0.6 +  * Thu Feb 20 2020 Remi Collet <remi@remirepo.net> - 2.5.0-1  - update to 2.5.0  | 
