From 028ff5a907e2e8f6abfc4088a55d08667607adff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 Feb 2022 09:39:59 +0100 Subject: update to 5.3.2 drop support for Symfony 3 --- composer.json | 4 ++-- phan.spec | 33 ++++++++++++++++++++------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index f31d84a..94f575e 100644 --- a/composer.json +++ b/composer.json @@ -27,12 +27,12 @@ "ext-json": "*", "ext-tokenizer": "*", "composer/semver": "^1.4|^2.0|^3.0", - "composer/xdebug-handler": "^1.3.2|^2.0.0", + "composer/xdebug-handler": "^2.0|^3.0", "felixfbecker/advanced-json-rpc": "^3.0.4", "microsoft/tolerant-php-parser": "^0.1.0", "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0|^4.0", "sabre/event": "^5.1.3", - "symfony/console": "^3.2|^4.0|^5.0", + "symfony/console": "^3.2|^4.0|^5.0|^6.0", "symfony/polyfill-mbstring": "^1.11.0", "symfony/polyfill-php80": "^1.20.0", "tysonandre/var_representation_polyfill": "^0.0.2|^0.1.0" diff --git a/phan.spec b/phan.spec index 392ac6c..fa7309d 100644 --- a/phan.spec +++ b/phan.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phan # -# Copyright (c) 2016-2021 Remi Collet +# Copyright (c) 2016-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 777fb4781068af411ce153bd839d8856149fa4b7 +%global gh_commit b7697eb811e912c038f709f8e1c4911c7ada3edc %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 5.3.1 +%global upstream_version 5.3.2 #global upstream_prever a4 Name: %{gh_project} @@ -41,12 +41,12 @@ BuildRequires: php-var_representation # 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) >= 2.0.0 with php-composer(composer/xdebug-handler) < 3) +BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 4) 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.1 with php-composer(microsoft/tolerant-php-parser) < 0.2) BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 5) BuildRequires: (php-composer(sabre/event) >= 5.1.3 with php-composer(sabre/event) < 6) -BuildRequires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6) +BuildRequires: (php-composer(symfony/console) >= 4.0 with php-composer(symfony/console) < 7) BuildRequires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2) # remirepo:13 %else @@ -59,7 +59,7 @@ BuildRequires: php-composer(microsoft/tolerant-php-parser) < 0.2 BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.1 BuildRequires: php-netresearch-jsonmapper >= 1.6 BuildRequires: php-sabre-event5 >= 5.1.3 -BuildRequires: php-symfony3-console >= 3.2 +BuildRequires: php-symfony4-console >= 4.0 BuildRequires: php-symfony-polyfill >= 1.20 %endif BuildRequires: php-reflection @@ -90,12 +90,12 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-json": "*", # "ext-tokenizer": "*", # "composer/semver": "^1.4|^2.0|^3.0", -# "composer/xdebug-handler": "^1.3.2|^2.0.0", +# "composer/xdebug-handler": "^2.0|^3.0", # "felixfbecker/advanced-json-rpc": "^3.0.4", # "microsoft/tolerant-php-parser": "^0.1", # "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0|^4.0", # "sabre/event": "^5.1.3", -# "symfony/console": "^3.2|^4.0|^5.", +# "symfony/console": "^3.2|^4.0|^5.0|^6.0", # "symfony/polyfill-mbstring": "^1.11.0", # "symfony/polyfill-php80": "^1.20.0", # ignore and use the ext instead @@ -117,13 +117,13 @@ Recommends: php-ast >= 1.0.16 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) >= 2.0.0 with php-composer(composer/xdebug-handler) < 3) +Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 4) 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.1 with php-composer(microsoft/tolerant-php-parser) < 0.2) Requires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 5) Requires: (php-composer(sabre/event) >= 5.1.3 with php-composer(sabre/event) < 6) -Requires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6) +Requires: (php-composer(symfony/console) >= 4.0 with php-composer(symfony/console) < 7) Requires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2) # remirepo:15 %else @@ -138,7 +138,7 @@ Requires: php-composer(microsoft/tolerant-php-parser) < 0.2 Requires: php-composer(microsoft/tolerant-php-parser) >= 0.1 Requires: php-netresearch-jsonmapper >= 1.6 Requires: php-sabre-event5 >= 5.1.3 -Requires: php-symfony3-console >= 3.2 +Requires: php-symfony4-console >= 4.0 Requires: php-symfony-polyfill >= 1.20 %endif # From phpcompatinfo report for 2.3.0 @@ -184,16 +184,18 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; '%{_datadir}/php/Composer/Semver3/autoload.php', '%{_datadir}/php/Composer/Semver2/autoload.php', '%{_datadir}/php/Composer/Semver/autoload.php', + ], [ + '%{_datadir}/php/Composer/XdebugHandler3/autoload.php', + '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', ], - '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', '%{_datadir}/php/AdvancedJsonRpc3/autoload.php', '%{_datadir}/php/Microsoft/PhpParser/autoload.php', '%{_datadir}/php/netresearch/jsonmapper/autoload.php', '%{_datadir}/php/Sabre/Event5/autoload.php', [ + '%{_datadir}/php/Symfony6/Component/Console/autoload.php', '%{_datadir}/php/Symfony5/Component/Console/autoload.php', '%{_datadir}/php/Symfony4/Component/Console/autoload.php', - '%{_datadir}/php/Symfony3/Component/Console/autoload.php', ], '%{_datadir}/php/Symfony/Polyfill/autoload.php', ]); @@ -253,9 +255,14 @@ EOF %changelog +* Wed Feb 2 2022 Remi Collet - 5.3.2-1 +- update to 5.3.2 +- drop support for Symfony 3 + * Tue Dec 14 2021 Remi Collet - 5.3.1-1 - update to 5.3.1 - raise dependency on ast 1.0.16 +- raise dependency on sabre/event 5.1.3 * Mon Nov 15 2021 Remi Collet - 5.3.0-1 - update to 5.3.0 -- cgit