From 12969e0ac7a77009f3670b833e0d4780cb567240 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 2 Jul 2020 07:24:24 +0200
Subject: update to 3.0.4

---
 phan-autoload.patch | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'phan-autoload.patch')

diff --git a/phan-autoload.patch b/phan-autoload.patch
index 719ab99..98f39a7 100644
--- a/phan-autoload.patch
+++ b/phan-autoload.patch
@@ -1,7 +1,7 @@
 diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php
---- ./src/Phan/Bootstrap.php.rpm	2020-05-04 10:28:21.581423051 +0200
-+++ ./src/Phan/Bootstrap.php	2020-05-04 10:30:07.345999193 +0200
-@@ -135,22 +135,8 @@ if (extension_loaded('ast')) {
+--- ./src/Phan/Bootstrap.php.rpm	2020-07-02 07:19:00.000000000 +0200
++++ ./src/Phan/Bootstrap.php	2020-07-02 07:19:12.412846692 +0200
+@@ -141,22 +141,8 @@ if (extension_loaded('ast')) {
      }
  }
  
@@ -27,17 +27,17 @@ diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php
  define('EXIT_SUCCESS', 0);
  define('EXIT_FAILURE', 1);
 diff -up ./src/phan.php.rpm ./src/phan.php
---- ./src/phan.php.rpm	2020-05-04 10:26:34.000000000 +0200
-+++ ./src/phan.php	2020-05-04 10:28:21.581423051 +0200
+--- ./src/phan.php.rpm	2020-07-02 07:19:00.000000000 +0200
++++ ./src/phan.php	2020-07-02 07:19:12.412846692 +0200
 @@ -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	2020-05-04 10:26:34.000000000 +0200
-+++ ./src/Phan/Plugin/ConfigPluginSet.php	2020-05-04 10:28:21.581423051 +0200
-@@ -820,7 +820,7 @@ final class ConfigPluginSet extends Plug
+--- ./src/Phan/Plugin/ConfigPluginSet.php.rpm	2020-07-02 07:19:00.000000000 +0200
++++ ./src/Phan/Plugin/ConfigPluginSet.php	2020-07-02 07:19:12.412846692 +0200
+@@ -903,7 +903,7 @@ final class ConfigPluginSet extends Plug
       */
      public static function getBuiltinPluginDirectory(): string
      {
@@ -47,22 +47,23 @@ diff -up ./src/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPlugi
  
      private function ensurePluginsExist(): void
 diff -up ./src/prep.php.rpm ./src/prep.php
---- ./src/prep.php.rpm	2020-05-04 10:26:34.000000000 +0200
-+++ ./src/prep.php	2020-05-04 10:28:21.581423051 +0200
+--- ./src/prep.php.rpm	2020-07-02 07:19:00.000000000 +0200
++++ ./src/prep.php	2020-07-02 07:19:12.412846692 +0200
 @@ -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	2020-05-04 10:26:34.000000000 +0200
-+++ ./src/requirements.php	2020-05-04 10:28:21.581423051 +0200
-@@ -10,10 +10,10 @@ if ((int)phpversion()[0] < 7) {
-     exit(1);
- }
+--- ./src/requirements.php.rpm	2020-07-02 07:19:12.412846692 +0200
++++ ./src/requirements.php	2020-07-02 07:20:08.066622708 +0200
+@@ -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.'
-- 
cgit