diff options
| -rw-r--r-- | composer.json | 19 | ||||
| -rw-r--r-- | phan-autoload.patch | 35 | ||||
| -rw-r--r-- | phan.spec | 186 |
3 files changed, 172 insertions, 68 deletions
diff --git a/composer.json b/composer.json index 929cb85..f9210ec 100644 --- a/composer.json +++ b/composer.json @@ -27,20 +27,23 @@ "ext-json": "*", "ext-tokenizer": "*", "composer/semver": "^1.4|^2.0|^3.0", - "composer/xdebug-handler": "^1.3.2", + "composer/xdebug-handler": "^2.0|^3.0", "felixfbecker/advanced-json-rpc": "^3.0.4", - "microsoft/tolerant-php-parser": "0.0.23", - "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" + "microsoft/tolerant-php-parser": "0.1.2", + "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0|^4.0", + "sabre/event": "^5.1.3", + "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" }, "suggest": { - "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed, 1.0.8+ is recommended.", + "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed, 1.0.16+ 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 fallback/polyfill parser support and file/line-based suppressions." + "ext-tokenizer": "Needed for fallback/polyfill parser support and file/line-based suppressions.", + "ext-var_representation": "Suggested for converting values to strings in issue messages" }, "require-dev": { "phpunit/phpunit": "^8.5.0" diff --git a/phan-autoload.patch b/phan-autoload.patch index e063c5e..2894344 100644 --- a/phan-autoload.patch +++ b/phan-autoload.patch @@ -1,8 +1,8 @@ diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php ---- ./src/Phan/Bootstrap.php.rpm 2020-08-11 11:05:14.019166382 +0200 -+++ ./src/Phan/Bootstrap.php 2020-08-11 11:06:23.713091459 +0200 -@@ -142,24 +142,8 @@ if (extension_loaded('ast')) { - unset($ast_version); +--- ./src/Phan/Bootstrap.php.rpm 2021-05-20 08:05:36.000000000 +0200 ++++ ./src/Phan/Bootstrap.php 2021-05-20 08:08:31.358343779 +0200 +@@ -104,20 +104,6 @@ EOT + fwrite(STDERR, "For more information, see https://github.com/phan/phan/wiki/Getting-Started#installing-dependencies" . PHP_EOL); } -// Use the composer autoloader @@ -18,28 +18,37 @@ diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php - break; - } -} +- + if (extension_loaded('ast')) { + // Warn if the php-ast version is too low. + $ast_version = (string)phpversion('ast'); +@@ -169,11 +155,9 @@ if (extension_loaded('ast')) { + } + unset($ast_version); + } -unset($file); -if (!$found_autoloader) { - fwrite(STDERR, "Could not locate the autoloader\n"); -} -unset($found_autoloader); ++ +// Use the fedora autoloader +require_once __DIR__ . '/../autoload.php'; define('EXIT_SUCCESS', 0); define('EXIT_FAILURE', 1); diff -up ./src/phan.php.rpm ./src/phan.php ---- ./src/phan.php.rpm 2020-08-11 10:59:01.000000000 +0200 -+++ ./src/phan.php 2020-08-11 11:05:14.019166382 +0200 +--- ./src/phan.php.rpm 2021-05-20 08:05:36.000000000 +0200 ++++ ./src/phan.php 2021-05-20 08:06:58.598558870 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/env php <?php declare(strict_types=1); diff -up ./src/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPluginSet.php ---- ./src/Phan/Plugin/ConfigPluginSet.php.rpm 2020-08-11 10:59:01.000000000 +0200 -+++ ./src/Phan/Plugin/ConfigPluginSet.php 2020-08-11 11:05:14.019166382 +0200 -@@ -904,7 +904,7 @@ final class ConfigPluginSet extends Plug +--- ./src/Phan/Plugin/ConfigPluginSet.php.rpm 2021-05-20 08:05:36.000000000 +0200 ++++ ./src/Phan/Plugin/ConfigPluginSet.php 2021-05-20 08:06:58.598558870 +0200 +@@ -907,7 +907,7 @@ final class ConfigPluginSet extends Plug */ public static function getBuiltinPluginDirectory(): string { @@ -49,16 +58,16 @@ diff -up ./src/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPlugi private function ensurePluginsExist(): void diff -up ./src/prep.php.rpm ./src/prep.php ---- ./src/prep.php.rpm 2020-08-11 10:59:01.000000000 +0200 -+++ ./src/prep.php 2020-08-11 11:05:14.019166382 +0200 +--- ./src/prep.php.rpm 2021-05-20 08:05:36.000000000 +0200 ++++ ./src/prep.php 2021-05-20 08:06:58.598558870 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/env php <?php declare(strict_types=1); diff -up ./src/requirements.php.rpm ./src/requirements.php ---- ./src/requirements.php.rpm 2020-08-11 10:59:01.000000000 +0200 -+++ ./src/requirements.php 2020-08-11 11:05:14.019166382 +0200 +--- ./src/requirements.php.rpm 2021-05-20 08:05:36.000000000 +0200 ++++ ./src/requirements.php 2021-05-20 08:06:58.598558870 +0200 @@ -2,11 +2,11 @@ declare(strict_types=1); @@ -1,7 +1,7 @@ # remirepo/fedora spec file for phan # -# Copyright (c) 2016-2020 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2016-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -10,15 +10,15 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit fa98748d8cb130e159317cb8ed4af3ddd19092eb +%global gh_commit 4f2870ed6fea320f62f3c3c63f3274d357a7980e %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.3 -#global upstream_prever RC2 +%global upstream_version 5.4.2 +#global upstream_prever a4 Name: %{gh_project} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} @@ -36,29 +36,31 @@ Patch0: %{name}-autoload.patch BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.2 -BuildRequires: php-ast >= 1.0.8 +BuildRequires: php-ast >= 1.0.16 +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) >= 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.23 with php-composer(microsoft/tolerant-php-parser) < 0.1) -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) +BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 4) +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.2 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) >= 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 BuildRequires: php-composer(composer/semver) < 4 BuildRequires: php-composer(composer/semver) >= 1.4 -BuildRequires: php-composer(composer/xdebug-handler) < 2 -BuildRequires: php-composer(composer/xdebug-handler) >= 1.3.2 -BuildRequires: php-composer(felixfbecker/advanced-json-rpc) < 4 +BuildRequires: php-composer-xdebug-handler2 +BuildRequires: php-composer(felixfbecker/advanced-json-rpc) < 5 BuildRequires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 -BuildRequires: php-composer(microsoft/tolerant-php-parser) < 0.1 -BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.23 +BuildRequires: php-composer(microsoft/tolerant-php-parser) < 0.2 +BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.1.2 BuildRequires: php-netresearch-jsonmapper >= 1.6 -BuildRequires: php-sabre-event5 >= 5.0.3 -BuildRequires: php-symfony3-console >= 3.2 +BuildRequires: php-sabre-event5 >= 5.1.3 +BuildRequires: php-symfony4-console >= 4.0 +BuildRequires: php-symfony-polyfill >= 1.20 %endif BuildRequires: php-reflection BuildRequires: php-ctype @@ -88,50 +90,56 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-json": "*", # "ext-tokenizer": "*", # "composer/semver": "^1.4|^2.0|^3.0", -# "composer/xdebug-handler": "^1.3.2", +# "composer/xdebug-handler": "^2.0|^3.0", # "felixfbecker/advanced-json-rpc": "^3.0.4", -# "microsoft/tolerant-php-parser": "0.0.23", -# "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" +# "microsoft/tolerant-php-parser": "^0.1.2", +# "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0|^4.0", +# "sabre/event": "^5.1.3", +# "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 +# "tysonandre/var_representation_polyfill": "^0.0.2|^0.1.0" Requires: php(language) >= 7.2 Requires: php-filter Requires: php-tokenizer Requires: php-json +Requires: php-var_representation # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 # From composer.json, "suggest": { -# "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed, 1.0.8+ is recommended.", +# "ext-ast": "Needed for parsing ASTs (unless --use-fallback-parser is used). 1.0.1+ is needed, 1.0.16+ 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." -Recommends: php-ast >= 1.0.8 +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) >= 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.23 with php-composer(microsoft/tolerant-php-parser) < 0.1) -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(composer/semver) >= 1.4 with php-composer(composer/semver) < 4) +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.2 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) >= 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 -Requires: php-ast >= 1.0.1 +Requires: php-ast >= 1.0.16 +Requires: php-var_representation Requires: php-composer(composer/semver) < 4 Requires: php-composer(composer/semver) >= 1.4 -Requires: php-composer(composer/xdebug-handler) < 2 -Requires: php-composer(composer/xdebug-handler) >= 1.3.2 +Requires: php-composer-xdebug-handler2 Requires: php-composer(felixfbecker/advanced-json-rpc) < 4 Requires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 -Requires: php-composer(microsoft/tolerant-php-parser) < 0.1 -Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.23 +Requires: php-composer(microsoft/tolerant-php-parser) < 0.2 +Requires: php-composer(microsoft/tolerant-php-parser) >= 0.1.2 Requires: php-netresearch-jsonmapper >= 1.6 -Requires: php-sabre-event5 >= 5.0.3 -Requires: php-symfony3-console >= 3.2 +Requires: php-sabre-event5 >= 5.1.3 +Requires: php-symfony4-console >= 4.0 +Requires: php-symfony-polyfill >= 1.20 %endif # From phpcompatinfo report for 2.3.0 Requires: php-cli @@ -150,7 +158,6 @@ Requires: php-sysvsem Requires: php-composer(fedora/autoloader) # Composer -Provides: php-composer(etsy/%{gh_project}) = %{version} Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} @@ -177,17 +184,20 @@ 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/XdebugHandler/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', ]); EOF @@ -245,6 +255,88 @@ EOF %changelog +* Mon Mar 6 2023 Remi Collet <remi@remirepo.net> - 5.4.2-1 +- update to 5.4.2 +- raise dependency on microsoft/tolerant-php-parser 0.1.2 + +* Thu Sep 8 2022 Remi Collet <remi@remirepo.net> - 5.4.1-1 +- update to 5.4.1 +- raise dependency on microsoft/tolerant-php-parser 0.1.1 + +* Tue Aug 9 2022 Remi Collet <remi@remirepo.net> - 5.4.0-1 +- update to 5.4.0 + +* Wed Feb 2 2022 Remi Collet <remi@remirepo.net> - 5.3.2-1 +- update to 5.3.2 +- drop support for Symfony 3 + +* Tue Dec 14 2021 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 5.3.0-1 +- update to 5.3.0 + +* Mon Sep 20 2021 Remi Collet <remi@remirepo.net> - 5.2.1-1 +- update to 5.2.1 + +* Thu Sep 2 2021 Remi Collet <remi@remirepo.net> - 5.2.0-1 +- update to 5.2.0 + +* Mon Aug 9 2021 Remi Collet <remi@remirepo.net> - 5.1.0-1 +- update to 5.1.0 + +* Mon Aug 2 2021 Remi Collet <remi@remirepo.net> - 5.0.0-1 +- update to 5.0.0 + +* Mon Jul 26 2021 Remi Collet <remi@remirepo.net> - 5.0.0~a4-1 +- update to 5.0.0a4 + +* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 5.0.0~a3-1 +- update to 5.0.0a3 + +* Mon Jun 28 2021 Remi Collet <remi@remirepo.net> - 5.0.0~a2-1 +- update to 5.0.0a2 +- raise dependency on microsoft/tolerant-php-parser 0.1 +- add dependency on var_representation extension + +* Mon May 31 2021 Remi Collet <remi@remirepo.net> - 5.0.0~a1-1 +- update to 5.0.0a1 + +* Thu May 20 2021 Remi Collet <remi@remirepo.net> - 4.0.6-1 +- update to 4.0.6 + +* Mon May 3 2021 Remi Collet <remi@remirepo.net> - 4.0.5-1 +- update to 4.0.5 + +* Thu Apr 15 2021 Remi Collet <remi@remirepo.net> - 4.0.4-1 +- update to 4.0.4 +- raise dependency on composer/xdebug-handler 2.0.0 + +* Wed Feb 3 2021 Remi Collet <remi@remirepo.net> - 4.0.3-1 +- update to 4.0.3 + +* Mon Jan 11 2021 Remi Collet <remi@remirepo.net> - 4.0.2-1 +- update to 4.0.2 + +* Tue Jan 5 2021 Remi Collet <remi@remirepo.net> - 4.0.1-1 +- update to 4.0.1 +- raise dependency on ast 1.0.10 + +* Tue Jan 5 2021 Remi Collet <remi@remirepo.net> - 3.2.10-1 +- update to 3.2.10 + +* Mon Dec 14 2020 Remi Collet <remi@remirepo.net> - 3.2.7-1 +- update to 3.2.7 + +* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 3.2.6-1 +- update to 3.2.6 +- add dependency on symfony/polyfill-php80 + +* Fri Nov 13 2020 Remi Collet <remi@remirepo.net> - 3.2.4-1 +- update to 3.2.4 + * Tue Oct 13 2020 Remi Collet <remi@remirepo.net> - 3.2.3-1 - update to 3.2.3 - raise dependency on symfony/console 3.2 |