diff options
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | phan.spec | 36 |
2 files changed, 26 insertions, 15 deletions
diff --git a/composer.json b/composer.json index 88ae65c..80a14b9 100644 --- a/composer.json +++ b/composer.json @@ -21,10 +21,11 @@ "require": { "php": "~7.0.0 || ~7.1.0 || ~7.2.0", "ext-ast": "^0.1.5", - "felixfbecker/advanced-json-rpc": "^2.0", + "felixfbecker/advanced-json-rpc": "^3.0", "nikic/PHP-Parser": "~3.1.1", + "microsoft/tolerant-php-parser": "0.0.8", "sabre/event": "^5.0", - "symfony/console": "~2.3|~3.0" + "symfony/console": "^2.3|^3.0|~4.0" }, "require-dev": { "phpunit/phpunit": "^6.3.0" @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 2520ce1292974b274017570cffaa8454018baee7 +%global gh_commit 576643422b4b36434091c190f82c929befc25f71 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phan #global gh_date 20150820 @@ -15,7 +15,7 @@ %global with_tests 0%{!?_without_tests:1} Name: %{gh_project} -Version: 0.8.10 +Version: 0.8.11 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}.7.0 Summary: A static analyzer for PHP @@ -32,12 +32,13 @@ BuildArch: noarch BuildRequires: php(language) < 7.1 BuildRequires: php(language) >= 7.0 BuildRequires: php-ast >= 0.1.5 -BuildRequires: php-composer(felixfbecker/advanced-json-rpc) < 3 -BuildRequires: php-composer(felixfbecker/advanced-json-rpc) >= 2.0 +BuildRequires: php-composer(felixfbecker/advanced-json-rpc) < 4 +BuildRequires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0 BuildRequires: php-composer(nikic/php-parser) < 4 BuildRequires: php-composer(nikic/php-parser) >= 3.1.1 -BuildRequires: php-composer(symfony/console) < 4 -BuildRequires: php-composer(symfony/console) >= 2.8 +BuildRequires: php-composer(microsoft/tolerant-php-parser) < 1 +BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.8 +BuildRequires: php-symfony3-console BuildRequires: php-composer(sabre/event) < 6 BuildRequires: php-composer(sabre/event) >= 5.0 BuildRequires: php-reflection @@ -64,18 +65,20 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": "~7.0.0 || ~7.1.0 || ~7.2.0", # "ext-ast": "^0.1.5", -# "felixfbecker/advanced-json-rpc": "^2.0", +# "felixfbecker/advanced-json-rpc": "^3.0", # "nikic/PHP-Parser": "~3.1.1", +# "microsoft/tolerant-php-parser": "0.0.8", # "sabre/event": "^5.0", -# "symfony/console": "~2.3|~3.0" +# "symfony/console": "~2.3|~3.0|~4.0" Requires: php(language) >= 7.0 Requires: php-ast >= 0.1.5 -Requires: php-composer(felixfbecker/advanced-json-rpc) < 3 -Requires: php-composer(felixfbecker/advanced-json-rpc) >= 2.0 +Requires: php-composer(felixfbecker/advanced-json-rpc) < 4 +Requires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0 Requires: php-composer(nikic/php-parser) < 4 Requires: php-composer(nikic/php-parser) >= 3.1.1 -Requires: php-composer(symfony/console) < 4 -Requires: php-composer(symfony/console) >= 2.3 +Requires: php-composer(microsoft/tolerant-php-parser) < 1 +Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.8 +Requires: php-symfony3-console Requires: php-composer(sabre/event) < 6 Requires: php-composer(sabre/event) >= 5.0 # From phpcompatinfo report for 0.8.4 @@ -118,10 +121,12 @@ cat << 'EOF' | tee src/autoload.php require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Phan\\', __DIR__ . '/Phan'); \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/AdvancedJsonRpc/autoload.php', + '%{_datadir}/php/AdvancedJsonRpc3/autoload.php', '%{_datadir}/php/PhpParser3/autoload.php', + '%{_datadir}/php/Microsoft/PhpParser/autoload.php', '%{_datadir}/php/Sabre/Event5/autoload.php', [ + '%{_datadir}/php/Symfony4/Component/Console/autoload.php', '%{_datadir}/php/Symfony3/Component/Console/autoload.php', '%{_datadir}/php/Symfony/Component/Console/autoload.php', ], @@ -174,6 +179,11 @@ EOF %changelog +* Mon Jan 22 2018 Remi Collet <remi@remirepo.net> - 0.8.11-1 +- Update to 0.8.11 +- raise dependency on felixfbecker/advanced-json-rpc 3.0 +- add dependency on microsoft/tolerant-php-parser + * Sat Nov 18 2017 Remi Collet <remi@remirepo.net> - 0.8.10-1 - Update to 0.8.10 |