diff options
| -rw-r--r-- | composer.json | 9 | ||||
| -rw-r--r-- | phan.spec | 40 |
2 files changed, 28 insertions, 21 deletions
diff --git a/composer.json b/composer.json index e1dab30..73cb632 100644 --- a/composer.json +++ b/composer.json @@ -16,13 +16,16 @@ } ], "config": { - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "7.0.24" + } }, "require": { - "php": "~7.2.0", + "php": "^7.0.0", "ext-ast": "^0.1.5", + "composer/semver": "^1.4", "felixfbecker/advanced-json-rpc": "^3.0", - "nikic/PHP-Parser": "~3.1.1", "microsoft/tolerant-php-parser": "0.0.9", "sabre/event": "^5.0", "symfony/console": "^2.3|^3.0|~4.0" @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 1b473dd00a681d4d325599139c6585212fdaf673 +%global gh_commit a19241bf2ff9c94fad665afade533ca815b251dd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phan #global gh_date 20150820 @@ -15,8 +15,8 @@ %global with_tests 0%{!?_without_tests:1} Name: %{gh_project} -Version: 0.11.3 -Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}.7.2 +Version: 0.12.0 +Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: A static analyzer for PHP License: MIT @@ -28,26 +28,24 @@ Patch0: %{name}-autoload.patch BuildArch: noarch %if %{with_tests} -BuildRequires: php(language) < 7.3 -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.0.0 BuildRequires: php-ast >= 0.1.5 %if 0%{?fedora} >= 27 +BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 2) BuildRequires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0 with php-composer(felixfbecker/advanced-json-rpc) < 4) -BuildRequires: (php-composer(nikic/php-parser) >= 3.1.1 with php-composer(nikic/php-parser) < 4) BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.9 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) %else +BuildRequires: php-composer(composer/semver) < 2 +BuildRequires: php-composer(composer/semver) >= 1.4 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(microsoft/tolerant-php-parser) < 1 BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.9 BuildRequires: php-composer(sabre/event) < 6 BuildRequires: php-composer(sabre/event) >= 5.0 -BuildRequires: php-composer(symfony/console) < 5 -BuildRequires: php-composer(symfony/console) >= 2.8 +BuildRequires: php-composer(symfony/console) < 4 %endif BuildRequires: php-reflection BuildRequires: php-dom @@ -70,32 +68,32 @@ BuildRequires: php-soap BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { -# "php": "~7.2.0", +# "php": "^7.0.0", # "ext-ast": "^0.1.5", +# "composer/semver": "^1.4", # "felixfbecker/advanced-json-rpc": "^3.0", -# "nikic/PHP-Parser": "~3.1.1", # "microsoft/tolerant-php-parser": "0.0.9", # "sabre/event": "^5.0", # "symfony/console": "~2.3|~3.0|~4.0" -Requires: php(language) >= 7.2 +Requires: php(language) >= 7.0.0 Requires: php-ast >= 0.1.5 %if 0%{?fedora} >= 27 +Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 2) Requires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0 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.9 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) %else +Requires: php-composer(composer/semver) < 2 +Requires: php-composer(composer/semver) >= 1.4 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(microsoft/tolerant-php-parser) < 1 Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.9 Requires: php-composer(sabre/event) < 6 Requires: php-composer(sabre/event) >= 5.0 -Requires: php-composer(symfony/console) < 5 -Requires: php-composer(symfony/console) >= 2.3 +Requires: php-composer(symfony/console) < 4 %endif # From phpcompatinfo report for 0.8.0 Requires: php-cli @@ -137,8 +135,8 @@ 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/Composer/Semver/autoload.php', '%{_datadir}/php/AdvancedJsonRpc3/autoload.php', - '%{_datadir}/php/PhpParser3/autoload.php', '%{_datadir}/php/Microsoft/PhpParser/autoload.php', '%{_datadir}/php/Sabre/Event5/autoload.php', [ @@ -195,6 +193,12 @@ EOF %changelog +* Mon Feb 26 2018 Remi Collet <remi@remirepo.net> - 0.12.0-1 +- Update to 0.12.0 +- drop dependency on nikic/PHP-Parser +- add dependency on composer/semver +- same version for PHP 7.0, 7.1 and 7.2 + * Thu Feb 15 2018 Remi Collet <remi@remirepo.net> - 0.11.3-1 - Update to 0.11.3 - raise dependency on microsoft/tolerant-php-parser 0.0.9 |