From f1027ffd1fa27063abe658d4fe7527df645a74eb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 21 Oct 2017 09:13:31 +0200
Subject: Update to 0.10.1 add dependency on felixfbecker/advanced-json-rpc 2.0
 add dependency on sabre/event 5.0

---
 composer.json       |  2 ++
 phan-autoload.patch | 24 +++++++++++++-----------
 phan.spec           | 21 +++++++++++++++++++--
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index ec5ab06..6bdfc5f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,9 @@
     "require": {
         "php": "~7.1.0 || ~7.2.0",
         "ext-ast": "^0.1.5",
+        "felixfbecker/advanced-json-rpc": "^2.0",
         "nikic/PHP-Parser": "~3.1.1",
+        "sabre/event": "^5.0",
         "symfony/console": "~2.3|~3.0"
     },
     "require-dev": {
diff --git a/phan-autoload.patch b/phan-autoload.patch
index e748d7c..3931483 100644
--- a/phan-autoload.patch
+++ b/phan-autoload.patch
@@ -1,6 +1,6 @@
 diff -up ./src/codebase.php.rpm ./src/codebase.php
---- ./src/codebase.php.rpm	2017-09-24 21:13:44.000000000 +0200
-+++ ./src/codebase.php	2017-09-25 09:44:35.834811157 +0200
+--- ./src/codebase.php.rpm	2017-10-21 03:57:26.000000000 +0200
++++ ./src/codebase.php	2017-10-21 09:10:09.657338342 +0200
 @@ -11,14 +11,8 @@ $internal_const_name_list = array_keys(a
  $internal_function_name_list = get_defined_functions()['internal'];
  
@@ -19,8 +19,8 @@ diff -up ./src/codebase.php.rpm ./src/codebase.php
  use Phan\CodeBase;
  
 diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php
---- ./src/Phan/Bootstrap.php.rpm	2017-09-24 21:13:44.000000000 +0200
-+++ ./src/Phan/Bootstrap.php	2017-09-25 09:44:35.834811157 +0200
+--- ./src/Phan/Bootstrap.php.rpm	2017-10-21 03:57:26.000000000 +0200
++++ ./src/Phan/Bootstrap.php	2017-10-21 09:10:09.658338347 +0200
 @@ -10,16 +10,8 @@ ini_set("memory_limit", '-1');
  define('CLASS_DIR', __DIR__ . '/../');
  set_include_path(get_include_path().PATH_SEPARATOR.CLASS_DIR);
@@ -41,25 +41,25 @@ 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	2017-09-24 21:13:44.000000000 +0200
-+++ ./src/phan.php	2017-09-25 09:44:35.834811157 +0200
+--- ./src/phan.php.rpm	2017-10-21 03:57:26.000000000 +0200
++++ ./src/phan.php	2017-10-21 09:10:09.658338347 +0200
 @@ -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	2017-09-24 21:13:44.000000000 +0200
-+++ ./src/prep.php	2017-09-25 09:44:35.834811157 +0200
+--- ./src/prep.php.rpm	2017-10-21 03:57:26.000000000 +0200
++++ ./src/prep.php	2017-10-21 09:10:09.658338347 +0200
 @@ -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-09-25 09:44:35.834811157 +0200
-+++ ./src/requirements.php	2017-09-25 09:45:26.546127491 +0200
-@@ -11,6 +11,6 @@ assert(
+--- ./src/requirements.php.rpm	2017-10-21 09:10:09.658338347 +0200
++++ ./src/requirements.php	2017-10-21 09:10:41.040503645 +0200
+@@ -11,8 +11,8 @@ assert(
  );
  
  assert(
@@ -68,3 +68,5 @@ diff -up ./src/requirements.php.rpm ./src/requirements.php
 +    file_exists(__DIR__ . '/autoload.php'),
 +    'Autoloader not found.'
  );
+ 
+ // Automatically restart if xdebug is loaded
diff --git a/phan.spec b/phan.spec
index 62686a0..9e815b7 100644
--- a/phan.spec
+++ b/phan.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    f54b4cd4206f68ed53bbc95910351fba8b6c9ada
+%global gh_commit    2085277ba7b96a00e1351c52012ffc9b103ec769
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phan
 #global gh_date      20150820
@@ -15,7 +15,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           %{gh_project}
-Version:        0.10.0
+Version:        0.10.1
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A static analyzer for PHP
 
@@ -31,8 +31,12 @@ BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-ast >= 0.1.4
+BuildRequires:  php-composer(felixfbecker/advanced-json-rpc) <  3
+BuildRequires:  php-composer(felixfbecker/advanced-json-rpc) >= 2.0
 BuildRequires:  php-composer(nikic/php-parser) <  4
 BuildRequires:  php-composer(nikic/php-parser) >= 3.1.1
+BuildRequires:  php-composer(sabre/event) <  6
+BuildRequires:  php-composer(sabre/event) >= 5.0
 BuildRequires:  php-composer(symfony/console) <  4
 BuildRequires:  php-composer(symfony/console) >= 2.8
 BuildRequires:  php-reflection
@@ -58,12 +62,18 @@ BuildRequires:  php-composer(fedora/autoloader)
 # From composer.json, "require": {
 #        "php": "~7.1.0 || ~7.2.0",
 #        "ext-ast": "^0.1.5",
+#        "felixfbecker/advanced-json-rpc": "^2.0",
 #        "nikic/PHP-Parser": "~3.1.1",
+#        "sabre/event": "^5.0",
 #        "symfony/console": "~2.3|~3.0"
 Requires:       php(language) >= 7.1
 Requires:       php-ast >= 0.1.4
+Requires:       php-composer(felixfbecker/advanced-json-rpc) <  3
+Requires:       php-composer(felixfbecker/advanced-json-rpc) >= 2.0
 Requires:       php-composer(nikic/php-parser) <  4
 Requires:       php-composer(nikic/php-parser) >= 3.1.1
+Requires:       php-composer(sabre/event) <  6
+Requires:       php-composer(sabre/event) >= 5.0
 Requires:       php-composer(symfony/console) <  4
 Requires:       php-composer(symfony/console) >= 2.3
 # From phpcompatinfo report for 0.8.0
@@ -106,7 +116,9 @@ cat << 'EOF' | tee src/autoload.php
 require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Phan\\', __DIR__ . '/Phan');
 \Fedora\Autoloader\Dependencies::required([
+    '%{_datadir}/php/AdvancedJsonRpc/autoload.php',
     '%{_datadir}/php/PhpParser3/autoload.php',
+    '%{_datadir}/php/Sabre/Event5/autoload.php',
     [
         '%{_datadir}/php/Symfony3/Component/Console/autoload.php',
         '%{_datadir}/php/Symfony/Component/Console/autoload.php',
@@ -165,6 +177,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 21 2017 Remi Collet <remi@remirepo.net> - 0.10.1-1
+- Update to 0.10.1
+- add dependency on felixfbecker/advanced-json-rpc 2.0
+- add dependency on sabre/event 5.0
+
 * Mon Sep 25 2017 Remi Collet <remi@remirepo.net> - 0.10.0-1
 - Update to 0.10.0
 - raise dependency on ast 0.1.5
-- 
cgit