diff -up ./src/codebase.php.rpm ./src/codebase.php --- ./src/codebase.php.rpm 2016-11-24 16:15:15.615092571 +0100 +++ ./src/codebase.php 2016-11-24 16:15:23.848136345 +0100 @@ -7,14 +7,8 @@ $internal_trait_name_list = get_declared $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 { - // This is the path to autoload.php when Phan is installed globally. - require_once __DIR__ . '/../../../autoload.php'; -} +// Use the fedora autoloader +require_once __DIR__ . '/autoload.php'; use Phan\CodeBase; diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php --- ./src/Phan/Bootstrap.php.rpm 2016-11-24 16:12:00.366054438 +0100 +++ ./src/Phan/Bootstrap.php 2016-11-24 16:16:28.316479122 +0100 @@ -11,16 +11,8 @@ ini_set("memory_limit", '-1'); define('CLASS_DIR', __DIR__ . '/../'); set_include_path(get_include_path().PATH_SEPARATOR.CLASS_DIR); -// Use the composer autoloader -foreach ([ - __DIR__.'/../../vendor/autoload.php', // autoloader is in this project - __DIR__.'/../../../../../vendor/autoload.php', // autoloader is in parent project - ] as $file) { - if (file_exists($file)) { - require_once($file); - break; - } -} +// 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 2016-11-24 16:08:41.223995606 +0100 +++ ./src/phan.php 2016-11-24 16:11:41.311953128 +0100 @@ -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 @@ -13,7 +14,7 @@ require_once(__DIR__ . '/requirements.ph // own $code_base = require_once(__DIR__ . '/codebase.php'); -require_once(__DIR__ . '/Phan/Bootstrap.php'); +require_once(__DIR__ . '/Bootstrap.php'); use Phan\CLI; use Phan\CodeBase; diff -up ./src/prep.php.rpm ./src/prep.php --- ./src/prep.php.rpm 2016-11-24 16:08:59.122090771 +0100 +++ ./src/prep.php 2016-11-24 16:11:34.003914271 +0100 @@ -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 @@ -7,7 +8,7 @@ gc_disable(); // Check the environment to make sure Phan can run successfully require_once(__DIR__ . '/requirements.php'); -require_once(__DIR__ . '/Phan/Bootstrap.php'); +require_once(__DIR__ . '/Bootstrap.php'); use Phan\CLI; use Phan\Prep; diff -up ./src/requirements.php.rpm ./src/requirements.php --- ./src/requirements.php.rpm 2016-11-24 16:15:45.623252123 +0100 +++ ./src/requirements.php 2016-11-24 16:16:13.253399032 +0100 @@ -11,7 +11,7 @@ assert( ); assert( - file_exists(__DIR__ . '/../vendor/autoload.php') || file_exists(__DIR__ . '/../../../autoload.php'), + file_exists(__DIR__ . '/autoload.php'), 'Autoloader not found. Make sure you run `composer install` before running Phan. See https://github.com/etsy/phan#getting-it-running for more details.' );