diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php --- ./src/Phan/Bootstrap.php.rpm 2021-05-20 08:05:36.000000000 +0200 +++ ./src/Phan/Bootstrap.php 2021-05-20 08:08:31.358343779 +0200 @@ -104,20 +104,6 @@ EOT fwrite(STDERR, "For more information, see https://github.com/phan/phan/wiki/Getting-Started#installing-dependencies" . PHP_EOL); } -// Use the composer autoloader -$found_autoloader = false; -foreach ([ - dirname(__DIR__, 2) . '/vendor/autoload.php', // autoloader is in this project (we're in src/Phan and want vendor/autoload.php) - dirname(__DIR__, 5) . '/vendor/autoload.php', // autoloader is in parent project (we're in vendor/phan/phan/src/Phan/Bootstrap.php and want autoload.php - dirname(__DIR__, 4) . '/autoload.php', // autoloader is in parent project (we're in non-standard-vendor/phan/phan/src/Phan/Bootstrap.php and want non-standard-vendor/autoload.php - ] as $file) { - if (file_exists($file)) { - require_once($file); - $found_autoloader = true; - break; - } -} - if (extension_loaded('ast')) { // Warn if the php-ast version is too low. $ast_version = (string)phpversion('ast'); @@ -169,11 +155,9 @@ if (extension_loaded('ast')) { } unset($ast_version); } -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 2021-05-20 08:05:36.000000000 +0200 +++ ./src/phan.php 2021-05-20 08:06:58.598558870 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/env php