From d08785bc27cb97108ec3f84cf690b061dd163c78 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Nov 2020 08:32:47 +0100 Subject: update to 3.2.6 add dependency on symfony/polyfill-php80 --- composer.json | 3 ++- phan.spec | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 929cb85..94b7a4b 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,8 @@ "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0", "sabre/event": "^5.0.3", "symfony/console": "^3.2|^4.0|^5.0", - "symfony/polyfill-mbstring": "^1.11.0" + "symfony/polyfill-mbstring": "^1.11.0", + "symfony/polyfill-php80": "^1.20.0" }, "suggest": { "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed, 1.0.8+ is recommended.", diff --git a/phan.spec b/phan.spec index f7d198b..44e4f59 100644 --- a/phan.spec +++ b/phan.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 079a6fc511aa5c0017e4ab26072a1f55940cf237 +%global gh_commit e14110d4bef8643562b02a4003015c2c0dcc9fe4 %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 3.2.4 +%global upstream_version 3.2.6 #global upstream_prever RC2 Name: %{gh_project} @@ -46,7 +46,8 @@ BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.23 with php- BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 4) BuildRequires: (php-composer(sabre/event) >= 5.0.3 with php-composer(sabre/event) < 6) BuildRequires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6) -# remirepo:13 +BuildRequires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2) +# remirepo:14 %else BuildRequires: php-composer(composer/semver) < 4 BuildRequires: php-composer(composer/semver) >= 1.4 @@ -59,6 +60,7 @@ BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.23 BuildRequires: php-netresearch-jsonmapper >= 1.6 BuildRequires: php-sabre-event5 >= 5.0.3 BuildRequires: php-symfony3-console >= 3.2 +BuildRequires: php-symfony-polyfill >= 1.20 %endif BuildRequires: php-reflection BuildRequires: php-ctype @@ -94,7 +96,8 @@ BuildRequires: php-composer(fedora/autoloader) # "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0", # "sabre/event": "^5.0.3", # "symfony/console": "^3.2|^4.0|^5.", -# "symfony/polyfill-mbstring": "^1.11.0" +# "symfony/polyfill-mbstring": "^1.11.0", +# "symfony/polyfill-php80": "^1.20.0" Requires: php(language) >= 7.2 Requires: php-filter Requires: php-tokenizer @@ -118,7 +121,8 @@ Requires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.23 with php- Requires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 4) Requires: (php-composer(sabre/event) >= 5.0.3 with php-composer(sabre/event) < 6) Requires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6) -# remirepo:14 +Requires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2) +# remirepo:15 %else Requires: php-ast >= 1.0.1 Requires: php-composer(composer/semver) < 4 @@ -132,6 +136,7 @@ Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.23 Requires: php-netresearch-jsonmapper >= 1.6 Requires: php-sabre-event5 >= 5.0.3 Requires: php-symfony3-console >= 3.2 +Requires: php-symfony-polyfill >= 1.20 %endif # From phpcompatinfo report for 2.3.0 Requires: php-cli @@ -188,6 +193,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; '%{_datadir}/php/Symfony4/Component/Console/autoload.php', '%{_datadir}/php/Symfony3/Component/Console/autoload.php', ], + '%{_datadir}/php/Symfony/Polyfill/autoload.php', ]); EOF @@ -245,6 +251,10 @@ EOF %changelog +* Mon Nov 30 2020 Remi Collet - 3.2.6-1 +- update to 3.2.6 +- add dependency on symfony/polyfill-php80 + * Fri Nov 13 2020 Remi Collet - 3.2.4-1 - update to 3.2.4 -- cgit