diff options
| author | Remi Collet <remi@remirepo.net> | 2020-08-11 11:21:16 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-08-11 11:21:16 +0200 |
| commit | 92e963a81b737acdfaaf82444794b180a2e30c8c (patch) | |
| tree | a467314dad8ce8c538a4e358bd1951015ca0d801 /phan-autoload.patch | |
| parent | 6eefc757502efca7223a0c057e3ba9bf96eb1506 (diff) | |
update to 3.1.1
allow netresearch/jsonmapper 3.0
Diffstat (limited to 'phan-autoload.patch')
| -rw-r--r-- | phan-autoload.patch | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/phan-autoload.patch b/phan-autoload.patch index 98f39a7..e063c5e 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-07-02 07:19:00.000000000 +0200 -+++ ./src/Phan/Bootstrap.php 2020-07-02 07:19:12.412846692 +0200 -@@ -141,22 +141,8 @@ if (extension_loaded('ast')) { - } +--- ./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); } -// Use the composer autoloader @@ -18,26 +18,28 @@ diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php - break; - } -} +-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-07-02 07:19:00.000000000 +0200 -+++ ./src/phan.php 2020-07-02 07:19:12.412846692 +0200 +--- ./src/phan.php.rpm 2020-08-11 10:59:01.000000000 +0200 ++++ ./src/phan.php 2020-08-11 11:05:14.019166382 +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-07-02 07:19:00.000000000 +0200 -+++ ./src/Phan/Plugin/ConfigPluginSet.php 2020-07-02 07:19:12.412846692 +0200 -@@ -903,7 +903,7 @@ final class ConfigPluginSet extends Plug +--- ./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 */ public static function getBuiltinPluginDirectory(): string { @@ -47,16 +49,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-07-02 07:19:00.000000000 +0200 -+++ ./src/prep.php 2020-07-02 07:19:12.412846692 +0200 +--- ./src/prep.php.rpm 2020-08-11 10:59:01.000000000 +0200 ++++ ./src/prep.php 2020-08-11 11:05:14.019166382 +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-07-02 07:19:12.412846692 +0200 -+++ ./src/requirements.php 2020-07-02 07:20:08.066622708 +0200 +--- ./src/requirements.php.rpm 2020-08-11 10:59:01.000000000 +0200 ++++ ./src/requirements.php 2020-08-11 11:05:14.019166382 +0200 @@ -2,11 +2,11 @@ declare(strict_types=1); |