1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php
--- ./src/Phan/Bootstrap.php.rpm 2021-01-05 09:16:26.831115023 +0100
+++ ./src/Phan/Bootstrap.php 2021-01-05 09:17:54.795753041 +0100
@@ -102,20 +102,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');
@@ -162,11 +148,9 @@ if (extension_loaded('ast')) {
unset($did_warn);
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-01-05 09:15:30.000000000 +0100
+++ ./src/phan.php 2021-01-05 09:16:26.832115019 +0100
@@ -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 2021-01-05 09:15:30.000000000 +0100
+++ ./src/Phan/Plugin/ConfigPluginSet.php 2021-01-05 09:16:26.832115019 +0100
@@ -904,7 +904,7 @@ final class ConfigPluginSet extends Plug
*/
public static function getBuiltinPluginDirectory(): string
{
- return \dirname(__DIR__, 3) . '/.phan/plugins';
+ return \dirname(__DIR__, 2) . '/plugins/';
}
private function ensurePluginsExist(): void
diff -up ./src/prep.php.rpm ./src/prep.php
--- ./src/prep.php.rpm 2021-01-05 09:15:30.000000000 +0100
+++ ./src/prep.php 2021-01-05 09:16:26.832115019 +0100
@@ -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 2021-01-05 09:15:30.000000000 +0100
+++ ./src/requirements.php 2021-01-05 09:16:26.832115019 +0100
@@ -2,11 +2,11 @@
declare(strict_types=1);
-if (!(file_exists(__DIR__ . '/../vendor/autoload.php') || file_exists(__DIR__ . '/../../../autoload.php'))) {
+if (!(file_exists(__DIR__ . '/autoload.php'))) {
// @phan-suppress-next-line PhanPluginRemoveDebugCall
fwrite(
STDERR,
- 'Autoloader not found. Make sure you run `composer install` before running Phan. See https://github.com/phan/phan#getting-started for more details.'
+ 'Autoloader not found.'
);
exit(1);
}
|
