diff options
Diffstat (limited to 'phan-autoload.patch')
| -rw-r--r-- | phan-autoload.patch | 58 |
1 files changed, 35 insertions, 23 deletions
diff --git a/phan-autoload.patch b/phan-autoload.patch index dc5fc92..2894344 100644 --- a/phan-autoload.patch +++ b/phan-autoload.patch @@ -1,15 +1,16 @@ diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php ---- ./src/Phan/Bootstrap.php.rpm 2019-11-25 07:24:07.197111533 +0100 -+++ ./src/Phan/Bootstrap.php 2019-11-25 07:25:17.914851384 +0100 -@@ -109,21 +109,9 @@ if (extension_loaded('ast')) { - phan_output_ast_installation_instructions(); - } +--- ./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 -$found_autoloader = false; -foreach ([ - dirname(__DIR__, 2) . '/vendor/autoload.php', // autoloader is in this project (we're in src/Phan and want vendor/autoload.php) - dirname(__DIR__, 5) . '/vendor/autoload.php', // autoloader is in parent project (we're in vendor/phan/phan/src/Phan/Bootstrap.php and want autoload.php +- dirname(__DIR__, 4) . '/autoload.php', // autoloader is in parent project (we're in non-standard-vendor/phan/phan/src/Phan/Bootstrap.php and want non-standard-vendor/autoload.php - ] as $file) { - if (file_exists($file)) { - require_once($file); @@ -17,9 +18,19 @@ 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'; @@ -27,42 +38,43 @@ diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php define('EXIT_SUCCESS', 0); define('EXIT_FAILURE', 1); diff -up ./src/phan.php.rpm ./src/phan.php ---- ./src/phan.php.rpm 2019-11-25 07:23:25.000000000 +0100 -+++ ./src/phan.php 2019-11-25 07:24:07.197111533 +0100 +--- ./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); + <?php - // Phan does a ton of GC and this offers a major speed + declare(strict_types=1); diff -up ./src/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPluginSet.php ---- ./src/Phan/Plugin/ConfigPluginSet.php.rpm 2019-11-25 07:23:25.000000000 +0100 -+++ ./src/Phan/Plugin/ConfigPluginSet.php 2019-11-25 07:24:07.197111533 +0100 -@@ -767,7 +767,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 + public static function getBuiltinPluginDirectory(): string { - return \dirname(__DIR__, 3) . '/.phan/plugins'; + return \dirname(__DIR__, 2) . '/plugins/'; } - private function ensurePluginsExist() : void + private function ensurePluginsExist(): void diff -up ./src/prep.php.rpm ./src/prep.php ---- ./src/prep.php.rpm 2019-11-25 07:23:25.000000000 +0100 -+++ ./src/prep.php 2019-11-25 07:24:07.197111533 +0100 +--- ./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); + <?php - // Phan does a ton of GC and this offers a major speed + declare(strict_types=1); diff -up ./src/requirements.php.rpm ./src/requirements.php ---- ./src/requirements.php.rpm 2019-11-25 07:23:25.000000000 +0100 -+++ ./src/requirements.php 2019-11-25 07:24:07.197111533 +0100 -@@ -8,10 +8,10 @@ if ((int)phpversion()[0] < 7) { - exit(1); - } +--- ./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); -if (!(file_exists(__DIR__ . '/../vendor/autoload.php') || file_exists(__DIR__ . '/../../../autoload.php'))) { +if (!(file_exists(__DIR__ . '/autoload.php'))) { + // @phan-suppress-next-line PhanPluginRemoveDebugCall fwrite( STDERR, - 'Autoloader not found. Make sure you run `composer install` before running Phan. See https://github.com/phan/phan#getting-started for more details.' |