summaryrefslogtreecommitdiffstats
path: root/phan-autoload.patch
blob: 4ea6d9eba6aa9413b9d1b05711de3ecb9dbf9853 (plain)
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
diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php
--- ./src/Phan/Bootstrap.php.rpm	2019-02-19 07:22:34.639868164 +0100
+++ ./src/Phan/Bootstrap.php	2019-02-19 07:25:01.412126803 +0100
@@ -14,21 +14,8 @@ ini_set("memory_limit", '-1');
 define('CLASS_DIR', __DIR__ . '/../');
 set_include_path(get_include_path() . PATH_SEPARATOR . CLASS_DIR);
 
-// 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
-    ] as $file) {
-    if (file_exists($file)) {
-        require_once($file);
-        $found_autoloader = true;
-        break;
-    }
-}
-if (!$found_autoloader) {
-    fwrite(STDERR, "Could not locate the autoloader\n");
-}
+// 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	2019-02-19 07:20:58.000000000 +0100
+++ ./src/phan.php	2019-02-19 07:22:34.639868164 +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/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPluginSet.php
--- ./src/Phan/Plugin/ConfigPluginSet.php.rpm	2019-02-19 07:20:58.000000000 +0100
+++ ./src/Phan/Plugin/ConfigPluginSet.php	2019-02-19 07:22:34.640868166 +0100
@@ -739,7 +739,7 @@ final class ConfigPluginSet extends Plug
     public static function normalizePluginPath(string $plugin_file_name) : string
     {
         if (\preg_match('@^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$@', $plugin_file_name) > 0) {
-            return dirname(__DIR__, 3) . '/.phan/plugins/' . $plugin_file_name . '.php';
+            return dirname(__DIR__, 2) . '/plugins/' . $plugin_file_name . '.php';
         }
         return $plugin_file_name;
     }
diff -up ./src/prep.php.rpm ./src/prep.php
--- ./src/prep.php.rpm	2019-02-19 07:20:58.000000000 +0100
+++ ./src/prep.php	2019-02-19 07:22:34.640868166 +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	2019-02-19 07:20:58.000000000 +0100
+++ ./src/requirements.php	2019-02-19 07:22:34.640868166 +0100
@@ -8,10 +8,10 @@ if ((int)phpversion()[0] < 7) {
     exit(1);
 }
 
-if (!(file_exists(__DIR__ . '/../vendor/autoload.php') || file_exists(__DIR__ . '/../../../autoload.php'))) {
+if (!(file_exists(__DIR__ . '/autoload.php'))) {
     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);
 }