From b2ec40be6c72916226c4e7d2fe50015f17d8cbbe Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 18 Nov 2017 09:35:06 +0100 Subject: v0.10.2 for PHP 7.1 --- phan-autoload.patch | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'phan-autoload.patch') diff --git a/phan-autoload.patch b/phan-autoload.patch index 3931483..cca1b77 100644 --- a/phan-autoload.patch +++ b/phan-autoload.patch @@ -1,17 +1,16 @@ diff -up ./src/codebase.php.rpm ./src/codebase.php ---- ./src/codebase.php.rpm 2017-10-21 03:57:26.000000000 +0200 -+++ ./src/codebase.php 2017-10-21 09:10:09.657338342 +0200 -@@ -11,14 +11,8 @@ $internal_const_name_list = array_keys(a +--- ./src/codebase.php.rpm 2017-11-18 09:30:04.518656417 +0100 ++++ ./src/codebase.php 2017-11-18 09:30:26.764775627 +0100 +@@ -6,13 +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. -- require_once __DIR__ . '/../vendor/autoload.php'; --} --else { +- require_once __DIR__ . '/../vendor/autoload.php'; +-} else { - // This is the path to autoload.php when Phan is installed globally. -- require_once __DIR__ . '/../../../autoload.php'; +- require_once __DIR__ . '/../../../autoload.php'; -} +// Use the fedora autoloader +require_once __DIR__ . '/autoload.php'; @@ -19,8 +18,8 @@ diff -up ./src/codebase.php.rpm ./src/codebase.php use Phan\CodeBase; diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php ---- ./src/Phan/Bootstrap.php.rpm 2017-10-21 03:57:26.000000000 +0200 -+++ ./src/Phan/Bootstrap.php 2017-10-21 09:10:09.658338347 +0200 +--- ./src/Phan/Bootstrap.php.rpm 2017-11-18 06:29:19.000000000 +0100 ++++ ./src/Phan/Bootstrap.php 2017-11-18 09:30:04.519656422 +0100 @@ -10,16 +10,8 @@ ini_set("memory_limit", '-1'); define('CLASS_DIR', __DIR__ . '/../'); set_include_path(get_include_path().PATH_SEPARATOR.CLASS_DIR); @@ -41,24 +40,24 @@ 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 2017-10-21 03:57:26.000000000 +0200 -+++ ./src/phan.php 2017-10-21 09:10:09.658338347 +0200 +--- ./src/phan.php.rpm 2017-11-18 06:29:19.000000000 +0100 ++++ ./src/phan.php 2017-11-18 09:30:04.519656422 +0100 @@ -1,3 +1,4 @@ +#!/usr/bin/env php