update to 1.0.4

add the upstream plugins
raise dependency on felixfbecker/advanced-json-rpc 3.0.3

3 files changed, 28 insertions, 8 deletions

diff --git a/composer.json b/composer.json
index eea3fe9..c1675f3 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "ext-json": "*",
         "composer/semver": "^1.4",
         "composer/xdebug-handler": "^1.3",
-        "felixfbecker/advanced-json-rpc": "^3.0",
+        "felixfbecker/advanced-json-rpc": "^3.0.3",
         "microsoft/tolerant-php-parser": "0.0.13",
         "sabre/event": "^5.0",
         "symfony/console": "^2.3|^3.0|~4.0"
diff --git a/phan-autoload.patch b/phan-autoload.patch
index 287e348..14642fd 100644
--- a/phan-autoload.patch
+++ b/phan-autoload.patch
@@ -71,3 +71,15 @@ diff -up ./src/requirements.php.rpm ./src/requirements.php
      );
      exit(1);
  }
+diff -up ./src/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPluginSet.php
+--- ./src/Phan/Plugin/ConfigPluginSet.php.rpm	2018-09-10 15:46:45.304166390 +0200
++++ ./src/Phan/Plugin/ConfigPluginSet.php	2018-09-10 15:47:16.265325009 +0200
+@@ -687,7 +687,7 @@ final class ConfigPluginSet extends Plug
+                 // E.g. 'AlwaysReturnPlugin' becomes /path/to/phan/.phan/plugins/AlwaysReturnPlugin.php
+                 // (Useful when using phan.phar, etc.)
+                 if (\preg_match('@^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$@', $plugin_file_name) > 0) {
+-                    $plugin_file_name = __DIR__ . '/../../../.phan/plugins/' . $plugin_file_name . '.php';
++                    $plugin_file_name = '/usr/share/php/Phan/plugins/' . $plugin_file_name . '.php';
+                 }
+ 
+                 try {
diff --git a/phan.spec b/phan.spec
index 7160d2e..9a62142 100644
--- a/phan.spec
+++ b/phan.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    b92c6a497e79f25f04af649f0fd677993888f88e
+%global gh_commit    d1573162443915fca6e7cd4add15af77ab168525
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phan
 #global gh_date      20150820
@@ -19,7 +19,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           %{gh_project}
-Version:        1.0.3
+Version:        1.0.4
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A static analyzer for PHP
 
@@ -38,7 +38,7 @@ BuildRequires:  php-ast >= 0.1.5
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires:  (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 2)
 BuildRequires:  (php-composer(composer/xdebug-handler) >= 1.3          with php-composer(composer/xdebug-handler) < 2)
-BuildRequires:  (php-composer(felixfbecker/advanced-json-rpc) >= 3.0   with php-composer(felixfbecker/advanced-json-rpc) <  4)
+BuildRequires:  (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.3 with php-composer(felixfbecker/advanced-json-rpc) <  4)
 BuildRequires:  (php-composer(microsoft/tolerant-php-parser) >= 0.0.13 with php-composer(microsoft/tolerant-php-parser) <  1)
 BuildRequires:  (php-composer(sabre/event) >= 5.0                      with php-composer(sabre/event) <  6)
 BuildRequires:  (php-composer(symfony/console) >= 2.8                  with php-composer(symfony/console) <  5)
@@ -49,7 +49,7 @@ BuildRequires:  php-composer(composer/semver) >= 1.4
 BuildRequires:  php-composer(composer/xdebug-handler) < 2
 BuildRequires:  php-composer(composer/xdebug-handler) >= 1.3
 BuildRequires:  php-composer(felixfbecker/advanced-json-rpc) <  4
-BuildRequires:  php-composer(felixfbecker/advanced-json-rpc) >= 3.0
+BuildRequires:  php-composer(felixfbecker/advanced-json-rpc) >= 3.0.3
 BuildRequires:  php-composer(microsoft/tolerant-php-parser) <  1
 BuildRequires:  php-composer(microsoft/tolerant-php-parser) >= 0.0.13
 BuildRequires:  php-composer(sabre/event) <  6
@@ -83,7 +83,7 @@ BuildRequires:  php-composer(fedora/autoloader)
 #        "ext-json": "*",
 #        "composer/semver": "^1.4",
 #        "composer/xdebug-handler": "^1.3",
-#        "felixfbecker/advanced-json-rpc": "^3.0",
+#        "felixfbecker/advanced-json-rpc": "^3.0.3",
 #        "microsoft/tolerant-php-parser": "0.0.13",
 #        "sabre/event": "^5.0",
 #        "symfony/console": "~2.3|~3.0|~4.0"
@@ -95,7 +95,7 @@ Requires:       php-json
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:       (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 2)
 Requires:       (php-composer(composer/xdebug-handler) >= 1.3          with php-composer(composer/xdebug-handler) < 2)
-Requires:       (php-composer(felixfbecker/advanced-json-rpc) >= 3.0   with php-composer(felixfbecker/advanced-json-rpc) <  4)
+Requires:       (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.3 with php-composer(felixfbecker/advanced-json-rpc) <  4)
 Requires:       (php-composer(nikic/php-parser) >= 3.1.1               with php-composer(nikic/php-parser) <  4)
 Requires:       (php-composer(microsoft/tolerant-php-parser) >= 0.0.13 with php-composer(microsoft/tolerant-php-parser) <  1)
 Requires:       (php-composer(sabre/event) >= 5.0                      with php-composer(sabre/event) <  6)
@@ -107,7 +107,7 @@ Requires:       php-composer(composer/semver) >= 1.4
 Requires:       php-composer(composer/xdebug-handler) < 2
 Requires:       php-composer(composer/xdebug-handler) >= 1.3
 Requires:       php-composer(felixfbecker/advanced-json-rpc) <  4
-Requires:       php-composer(felixfbecker/advanced-json-rpc) >= 3.0
+Requires:       php-composer(felixfbecker/advanced-json-rpc) >= 3.0.3
 Requires:       php-composer(microsoft/tolerant-php-parser) <  1
 Requires:       php-composer(microsoft/tolerant-php-parser) >= 0.0.13
 Requires:       php-composer(sabre/event) <  6
@@ -178,6 +178,9 @@ chmod +x src/phan.php
 mkdir -p   %{buildroot}%{_datadir}/php/
 cp -pr src %{buildroot}%{_datadir}/php/%{psr0}
 
+: Plugins
+cp -pr .phan/plugins %{buildroot}%{_datadir}/php/%{psr0}/plugins
+
 : Commands
 mkdir -p %{buildroot}%{_bindir}
 ln -s ../share/php/%{psr0}/phan.php %{buildroot}%{_bindir}/phan
@@ -211,6 +214,11 @@ EOF
 
 
 %changelog
+* Mon Sep 10 2018 Remi Collet <remi@remirepo.net> - 1.0.4-1
+- update to 1.0.4
+- add the upstream plugins
+- raise dependency on felixfbecker/advanced-json-rpc 3.0.3
+
 * Sat Sep  8 2018 Remi Collet <remi@remirepo.net> - 1.0.3-1
 - update to 1.0.3