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
|
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
@@ -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 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
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
diff -up ./src/requirements.php.rpm ./src/requirements.php
--- ./src/requirements.php.rpm 2017-03-16 11:48:32.604583610 +0100
+++ ./src/requirements.php 2017-03-16 11:48:37.237605505 +0100
@@ -11,6 +11,6 @@ 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.'
);
|
