diff -up ./src/codebase.php.rpm ./src/codebase.php --- ./src/codebase.php.rpm 2017-09-24 22:02:32.000000000 +0200 +++ ./src/codebase.php 2017-09-25 09:30:54.398808581 +0200 @@ -11,14 +11,8 @@ $internal_const_name_list = array_keys(a $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 2017-09-24 22:02:32.000000000 +0200 +++ ./src/Phan/Bootstrap.php 2017-09-25 09:30:54.398808581 +0200 @@ -10,16 +10,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 2017-09-24 22:02:32.000000000 +0200 +++ ./src/phan.php 2017-09-25 09:30:54.398808581 +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/prep.php.rpm ./src/prep.php --- ./src/prep.php.rpm 2017-09-24 22:02:32.000000000 +0200 +++ ./src/prep.php 2017-09-25 09:30:54.399808587 +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 2017-09-25 09:30:54.399808587 +0200 +++ ./src/requirements.php 2017-09-25 09:31:59.525193144 +0200 @@ -11,6 +11,6 @@ assert( ); assert( - file_exists(__DIR__ . '/../vendor/autoload.php') || file_exists(__DIR__ . '/../../../autoload.php'), - 'Autoloader not found. Make sure you run `composer install` before running Phan. See https://github.com/phan/phan#getting-it-running for more details.' + file_exists(__DIR__ . '/autoload.php'), + 'Autoloader not found.' );