diff options
Diffstat (limited to 'phan-autoload.patch')
| -rw-r--r-- | phan-autoload.patch | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/phan-autoload.patch b/phan-autoload.patch index 14642fd..eed0e93 100644 --- a/phan-autoload.patch +++ b/phan-autoload.patch @@ -1,15 +1,17 @@ diff -up ./src/codebase.php.rpm ./src/codebase.php ---- ./src/codebase.php.rpm 2018-08-27 03:28:15.000000000 +0200 -+++ ./src/codebase.php 2018-08-27 06:58:20.113887853 +0200 -@@ -6,13 +6,8 @@ $internal_interface_name_list = get_decl +--- ./src/codebase.php.rpm 2018-10-23 10:37:31.657768196 +0200 ++++ ./src/codebase.php 2018-10-23 10:38:09.371967988 +0200 +@@ -6,15 +6,8 @@ $internal_interface_name_list = get_decl $internal_trait_name_list = get_declared_traits(); $internal_function_name_list = get_defined_functions()['internal']; -if (file_exists(__DIR__ . '/../vendor/autoload.php')) { -- // This is the normal path when Phan is installed only in the scope of a project. +- // This is the path to autoload.php when Phan is installed globally. +- // @phan-suppress-next-line PhanMissingRequireFile - require_once __DIR__ . '/../vendor/autoload.php'; -} else { -- // This is the path to autoload.php when Phan is installed globally. +- // This is the normal path when Phan is installed only in the scope of a project. +- // @phan-suppress-next-line PhanMissingRequireFile - require_once __DIR__ . '/../../../autoload.php'; -} +// Use the fedora autoloader @@ -18,9 +20,9 @@ diff -up ./src/codebase.php.rpm ./src/codebase.php use Composer\XdebugHandler\XdebugHandler; use Phan\CodeBase; diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php ---- ./src/Phan/Bootstrap.php.rpm 2018-08-27 03:28:15.000000000 +0200 -+++ ./src/Phan/Bootstrap.php 2018-08-27 06:58:20.114887859 +0200 -@@ -12,16 +12,8 @@ ini_set("memory_limit", '-1'); +--- ./src/Phan/Bootstrap.php.rpm 2018-10-23 10:27:56.000000000 +0200 ++++ ./src/Phan/Bootstrap.php 2018-10-23 10:37:31.657768196 +0200 +@@ -13,16 +13,8 @@ ini_set("memory_limit", '-1'); define('CLASS_DIR', __DIR__ . '/../'); set_include_path(get_include_path() . PATH_SEPARATOR . CLASS_DIR); @@ -40,24 +42,36 @@ 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 2018-08-27 03:28:15.000000000 +0200 -+++ ./src/phan.php 2018-08-27 06:58:20.114887859 +0200 +--- ./src/phan.php.rpm 2018-10-23 10:27:56.000000000 +0200 ++++ ./src/phan.php 2018-10-23 10:37:31.657768196 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/env php <?php declare(strict_types=1); // Phan does a ton of GC and this offers a major speed +diff -up ./src/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPluginSet.php +--- ./src/Phan/Plugin/ConfigPluginSet.php.rpm 2018-10-23 10:27:56.000000000 +0200 ++++ ./src/Phan/Plugin/ConfigPluginSet.php 2018-10-23 10:37:31.657768196 +0200 +@@ -702,7 +702,7 @@ final class ConfigPluginSet extends Plug + // E.g. 'AlwaysReturnPlugin' becomes /path/to/phan/.phan/plugins/AlwaysReturnPlugin.php + // (Useful when using phan.phar, etc.) + if (\preg_match('@^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$@', $plugin_file_name) > 0) { +- $plugin_file_name = __DIR__ . '/../../../.phan/plugins/' . $plugin_file_name . '.php'; ++ $plugin_file_name = '/usr/share/php/Phan/plugins/' . $plugin_file_name . '.php'; + } + + try { diff -up ./src/prep.php.rpm ./src/prep.php ---- ./src/prep.php.rpm 2018-08-27 03:28:15.000000000 +0200 -+++ ./src/prep.php 2018-08-27 06:58:20.114887859 +0200 +--- ./src/prep.php.rpm 2018-10-23 10:27:56.000000000 +0200 ++++ ./src/prep.php 2018-10-23 10:37:31.657768196 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/env php <?php declare(strict_types=1); // Phan does a ton of GC and this offers a major speed diff -up ./src/requirements.php.rpm ./src/requirements.php ---- ./src/requirements.php.rpm 2018-08-27 06:58:20.114887859 +0200 -+++ ./src/requirements.php 2018-08-27 06:59:57.839473923 +0200 +--- ./src/requirements.php.rpm 2018-10-23 10:37:31.657768196 +0200 ++++ ./src/requirements.php 2018-10-23 10:38:38.126120310 +0200 @@ -8,10 +8,10 @@ if ((int)phpversion()[0] < 7) { exit(1); } @@ -66,20 +80,8 @@ diff -up ./src/requirements.php.rpm ./src/requirements.php +if (!(file_exists(__DIR__ . '/autoload.php'))) { fwrite( STDERR, -- 'Autoloader not found. Make sure you run `composer install` before running Phan. See https://github.com/phan/phan#getting-it-running for more details.' +- 'Autoloader not found. Make sure you run `composer install` before running Phan. See https://github.com/phan/phan#getting-started for more details.' + 'Autoloader not found.' ); exit(1); } -diff -up ./src/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPluginSet.php ---- ./src/Phan/Plugin/ConfigPluginSet.php.rpm 2018-09-10 15:46:45.304166390 +0200 -+++ ./src/Phan/Plugin/ConfigPluginSet.php 2018-09-10 15:47:16.265325009 +0200 -@@ -687,7 +687,7 @@ final class ConfigPluginSet extends Plug - // E.g. 'AlwaysReturnPlugin' becomes /path/to/phan/.phan/plugins/AlwaysReturnPlugin.php - // (Useful when using phan.phar, etc.) - if (\preg_match('@^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$@', $plugin_file_name) > 0) { -- $plugin_file_name = __DIR__ . '/../../../.phan/plugins/' . $plugin_file_name . '.php'; -+ $plugin_file_name = '/usr/share/php/Phan/plugins/' . $plugin_file_name . '.php'; - } - - try { |