diff options
| author | Remi Collet <remi@remirepo.net> | 2021-01-05 09:24:35 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-01-05 09:24:35 +0100 |
| commit | b8a98a1ebe43a5c441419d8ed99497b43e5a2fa6 (patch) | |
| tree | a3d0f249b14e6486b9dbc211aa9014818442177f /phan-autoload.patch | |
| parent | e44fd6d99cf85cd223d397f6d0c72931723f0240 (diff) | |
update to 4.0.1
raise dependency on ast 1.0.10
Diffstat (limited to 'phan-autoload.patch')
| -rw-r--r-- | phan-autoload.patch | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/phan-autoload.patch b/phan-autoload.patch index e063c5e..cf14683 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-01-05 09:16:26.831115023 +0100 ++++ ./src/Phan/Bootstrap.php 2021-01-05 09:17:54.795753041 +0100 +@@ -102,20 +102,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,27 +18,36 @@ 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'); +@@ -162,11 +148,9 @@ if (extension_loaded('ast')) { + unset($did_warn); + 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-01-05 09:15:30.000000000 +0100 ++++ ./src/phan.php 2021-01-05 09:16:26.832115019 +0100 @@ -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 +--- ./src/Phan/Plugin/ConfigPluginSet.php.rpm 2021-01-05 09:15:30.000000000 +0100 ++++ ./src/Phan/Plugin/ConfigPluginSet.php 2021-01-05 09:16:26.832115019 +0100 @@ -904,7 +904,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-01-05 09:15:30.000000000 +0100 ++++ ./src/prep.php 2021-01-05 09:16:26.832115019 +0100 @@ -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-01-05 09:15:30.000000000 +0100 ++++ ./src/requirements.php 2021-01-05 09:16:26.832115019 +0100 @@ -2,11 +2,11 @@ declare(strict_types=1); |