update to 0.12.13

raise dependency on microsoft/tolerant-php-parser 0.0.11
raise dependency on composer/xdebug-handler 1.1

3 files changed, 32 insertions, 27 deletions

diff --git a/composer.json b/composer.json
index addc08f..e8fbe38 100644
--- a/composer.json
+++ b/composer.json
@@ -25,9 +25,9 @@
         "php": "^7.0.0",
         "ext-ast": "^0.1.5",
         "composer/semver": "^1.4",
-        "composer/xdebug-handler": "^1.0",
+        "composer/xdebug-handler": "^1.1",
         "felixfbecker/advanced-json-rpc": "^3.0",
-        "microsoft/tolerant-php-parser": "0.0.11",
+        "microsoft/tolerant-php-parser": "0.0.12",
         "sabre/event": "^5.0",
         "symfony/console": "^2.3|^3.0|~4.0"
     },
diff --git a/phan-autoload.patch b/phan-autoload.patch
index 1dd1bce..044c80c 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	2018-03-26 18:08:29.958424915 +0200
-+++ ./src/codebase.php	2018-03-26 18:11:26.037413842 +0200
+--- ./src/codebase.php.rpm	2018-06-17 00:53:03.000000000 +0200
++++ ./src/codebase.php	2018-06-19 06:28:58.191506085 +0200
 @@ -6,13 +6,8 @@ $internal_interface_name_list = get_decl
  $internal_trait_name_list = get_declared_traits();
  $internal_function_name_list = get_defined_functions()['internal'];
@@ -18,16 +18,16 @@ diff -up ./src/codebase.php.rpm ./src/codebase.php
  use Composer\XdebugHandler\XdebugHandler;
  use Phan\CodeBase;
 diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php
---- ./src/Phan/Bootstrap.php.rpm	2018-03-24 22:51:39.000000000 +0100
-+++ ./src/Phan/Bootstrap.php	2018-03-26 18:08:29.958424915 +0200
+--- ./src/Phan/Bootstrap.php.rpm	2018-06-19 06:28:58.191506085 +0200
++++ ./src/Phan/Bootstrap.php	2018-06-19 06:30:20.622986230 +0200
 @@ -12,16 +12,8 @@ ini_set("memory_limit", '-1');
  define('CLASS_DIR', __DIR__ . '/../');
- set_include_path(get_include_path().PATH_SEPARATOR.CLASS_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
+-    __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);
@@ -40,24 +40,24 @@ 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	2018-03-24 22:51:39.000000000 +0100
-+++ ./src/phan.php	2018-03-26 18:08:29.958424915 +0200
+--- ./src/phan.php.rpm	2018-06-17 00:53:03.000000000 +0200
++++ ./src/phan.php	2018-06-19 06:28:58.191506085 +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	2018-03-24 22:51:39.000000000 +0100
-+++ ./src/prep.php	2018-03-26 18:08:29.958424915 +0200
+--- ./src/prep.php.rpm	2018-06-17 00:53:03.000000000 +0200
++++ ./src/prep.php	2018-06-19 06:28:58.191506085 +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	2018-03-26 18:08:29.958424915 +0200
-+++ ./src/requirements.php	2018-03-26 18:09:31.960754285 +0200
+--- ./src/requirements.php.rpm	2018-06-17 00:53:03.000000000 +0200
++++ ./src/requirements.php	2018-06-19 06:28:58.191506085 +0200
 @@ -6,8 +6,8 @@ assert(
  );
  
diff --git a/phan.spec b/phan.spec
index 0718588..8f9f84a 100644
--- a/phan.spec
+++ b/phan.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    1982905515eb017554483b53635c454f37b18dc4
+%global gh_commit    2271dfffa67141e5af9b951fb3cff906856a8224
 %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:        0.12.12
+Version:        0.12.13
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A static analyzer for PHP
 
@@ -36,20 +36,20 @@ BuildRequires:  php(language) >= 7.0.0
 BuildRequires:  php-ast >= 0.1.5
 %if 0%{?fedora} >= 27
 BuildRequires:  (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 2)
-BuildRequires:  (php-composer(composer/xdebug-handler) >= 1.0.0        with php-composer(composer/xdebug-handler) < 2)
+BuildRequires:  (php-composer(composer/xdebug-handler) >= 1.1          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(microsoft/tolerant-php-parser) >= 0.0.11 with php-composer(microsoft/tolerant-php-parser) <  1)
+BuildRequires:  (php-composer(microsoft/tolerant-php-parser) >= 0.0.12 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)
 %else
 BuildRequires:  php-composer(composer/semver) < 2
 BuildRequires:  php-composer(composer/semver) >= 1.4
 BuildRequires:  php-composer(composer/xdebug-handler) < 2
-BuildRequires:  php-composer(composer/xdebug-handler) >= 1.0.0
+BuildRequires:  php-composer(composer/xdebug-handler) >= 1.1
 BuildRequires:  php-composer(felixfbecker/advanced-json-rpc) <  4
 BuildRequires:  php-composer(felixfbecker/advanced-json-rpc) >= 3.0
 BuildRequires:  php-composer(microsoft/tolerant-php-parser) <  1
-BuildRequires:  php-composer(microsoft/tolerant-php-parser) >= 0.0.11
+BuildRequires:  php-composer(microsoft/tolerant-php-parser) >= 0.0.12
 BuildRequires:  php-composer(sabre/event) <  6
 BuildRequires:  php-composer(sabre/event) >= 5.0
 BuildRequires:  php-composer(symfony/console) <  4
@@ -78,30 +78,30 @@ BuildRequires:  php-composer(fedora/autoloader)
 #        "php": "^7.0.0",
 #        "ext-ast": "^0.1.5",
 #        "composer/semver": "^1.4",
-#        "composer/xdebug-handler": "^1.0",
+#        "composer/xdebug-handler": "^1.1",
 #        "felixfbecker/advanced-json-rpc": "^3.0",
-#        "microsoft/tolerant-php-parser": "0.0.11",
+#        "microsoft/tolerant-php-parser": "0.0.12",
 #        "sabre/event": "^5.0",
 #        "symfony/console": "~2.3|~3.0|~4.0"
 Requires:       php(language) >= 7.0.0
 Requires:       php-ast >= 0.1.5
 %if 0%{?fedora} >= 27
 Requires:       (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 2)
-Requires:       (php-composer(composer/xdebug-handler) >= 1.0          with php-composer(composer/xdebug-handler) < 2)
+Requires:       (php-composer(composer/xdebug-handler) >= 1.1          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(nikic/php-parser) >= 3.1.1               with php-composer(nikic/php-parser) <  4)
-Requires:       (php-composer(microsoft/tolerant-php-parser) >= 0.0.11 with php-composer(microsoft/tolerant-php-parser) <  1)
+Requires:       (php-composer(microsoft/tolerant-php-parser) >= 0.0.12 with php-composer(microsoft/tolerant-php-parser) <  1)
 Requires:       (php-composer(sabre/event) >= 5.0                      with php-composer(sabre/event) <  6)
 Requires:       (php-composer(symfony/console) >= 2.8                  with php-composer(symfony/console) <  5)
 %else
 Requires:       php-composer(composer/semver) < 2
 Requires:       php-composer(composer/semver) >= 1.4
 Requires:       php-composer(composer/xdebug-handler) < 2
-Requires:       php-composer(composer/xdebug-handler) >= 1.0
+Requires:       php-composer(composer/xdebug-handler) >= 1.1
 Requires:       php-composer(felixfbecker/advanced-json-rpc) <  4
 Requires:       php-composer(felixfbecker/advanced-json-rpc) >= 3.0
 Requires:       php-composer(microsoft/tolerant-php-parser) <  1
-Requires:       php-composer(microsoft/tolerant-php-parser) >= 0.0.11
+Requires:       php-composer(microsoft/tolerant-php-parser) >= 0.0.12
 Requires:       php-composer(sabre/event) <  6
 Requires:       php-composer(sabre/event) >= 5.0
 Requires:       php-composer(symfony/console) <  4
@@ -205,6 +205,11 @@ EOF
 
 
 %changelog
+* Tue Jun 19 2018 Remi Collet <remi@remirepo.net> - 0.12.13-1
+- update to 0.12.13
+- raise dependency on microsoft/tolerant-php-parser 0.0.11
+- raise dependency on composer/xdebug-handler 1.1
+
 * Mon Jun 11 2018 Remi Collet <remi@remirepo.net> - 0.12.12-1
 - update to 0.12.12