From a19a6694c1dc93be74365e3f1c1f1071d74ad763 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Mar 2018 18:17:07 +0200 Subject: update to 0.12.3 add dependency on composer/xdebug-handler raise dependency on microsoft/tolerant-php-parser 0.0.10 --- composer.json | 3 ++- phan-autoload.patch | 28 ++++++++++++++-------------- phan.spec | 43 ++++++++++++++++++++++++++++--------------- 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index 73cb632..c0aaf78 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,9 @@ "php": "^7.0.0", "ext-ast": "^0.1.5", "composer/semver": "^1.4", + "composer/xdebug-handler": "1.0.0", "felixfbecker/advanced-json-rpc": "^3.0", - "microsoft/tolerant-php-parser": "0.0.9", + "microsoft/tolerant-php-parser": "0.0.10", "sabre/event": "^5.0", "symfony/console": "^2.3|^3.0|~4.0" }, diff --git a/phan-autoload.patch b/phan-autoload.patch index cca1b77..1dd1bce 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-11-18 09:30:04.518656417 +0100 -+++ ./src/codebase.php 2017-11-18 09:30:26.764775627 +0100 +--- ./src/codebase.php.rpm 2018-03-26 18:08:29.958424915 +0200 ++++ ./src/codebase.php 2018-03-26 18:11:26.037413842 +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']; @@ -15,12 +15,12 @@ diff -up ./src/codebase.php.rpm ./src/codebase.php +// Use the fedora autoloader +require_once __DIR__ . '/autoload.php'; + use Composer\XdebugHandler\XdebugHandler; use Phan\CodeBase; - diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php ---- ./src/Phan/Bootstrap.php.rpm 2017-11-18 06:29:19.000000000 +0100 -+++ ./src/Phan/Bootstrap.php 2017-11-18 09:30:04.519656422 +0100 -@@ -10,16 +10,8 @@ ini_set("memory_limit", '-1'); +--- ./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 +@@ -12,16 +12,8 @@ ini_set("memory_limit", '-1'); define('CLASS_DIR', __DIR__ . '/../'); set_include_path(get_include_path().PATH_SEPARATOR.CLASS_DIR); @@ -40,25 +40,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-11-18 06:29:19.000000000 +0100 -+++ ./src/phan.php 2017-11-18 09:30:04.519656422 +0100 +--- ./src/phan.php.rpm 2018-03-24 22:51:39.000000000 +0100 ++++ ./src/phan.php 2018-03-26 18:08:29.958424915 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/env php = 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(felixfbecker/advanced-json-rpc) >= 3.0 with php-composer(felixfbecker/advanced-json-rpc) < 4) -BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.9 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) +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(felixfbecker/advanced-json-rpc) >= 3.0 with php-composer(felixfbecker/advanced-json-rpc) < 4) +BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.10 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(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.9 +BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.10 BuildRequires: php-composer(sabre/event) < 6 BuildRequires: php-composer(sabre/event) >= 5.0 BuildRequires: php-composer(symfony/console) < 4 @@ -75,6 +78,7 @@ BuildRequires: php-composer(fedora/autoloader) # "php": "^7.0.0", # "ext-ast": "^0.1.5", # "composer/semver": "^1.4", +# "composer/xdebug-handler": "1.0.0", # "felixfbecker/advanced-json-rpc": "^3.0", # "microsoft/tolerant-php-parser": "0.0.9", # "sabre/event": "^5.0", @@ -82,19 +86,22 @@ BuildRequires: php-composer(fedora/autoloader) 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(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.9 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) +Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 2) +Requires: (php-composer(composer/xdebug-handler) >= 1.0.0 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.10 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.0 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.9 +Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.10 Requires: php-composer(sabre/event) < 6 Requires: php-composer(sabre/event) >= 5.0 Requires: php-composer(symfony/console) < 4 @@ -140,6 +147,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Phan\\', __DIR__ . '/Phan'); \Fedora\Autoloader\Dependencies::required([ '%{_datadir}/php/Composer/Semver/autoload.php', + '%{_datadir}/php/Composer/XdebugHandler/autoload.php', '%{_datadir}/php/AdvancedJsonRpc3/autoload.php', '%{_datadir}/php/Microsoft/PhpParser/autoload.php', '%{_datadir}/php/Sabre/Event5/autoload.php', @@ -197,6 +205,11 @@ EOF %changelog +* Mon Mar 26 2018 Remi Collet - 0.12.3-1 +- update to 0.12.3 +- add dependency on composer/xdebug-handler +- raise dependency on microsoft/tolerant-php-parser 0.0.10 + * Sat Mar 3 2018 Remi Collet - 0.12.2-1 - Update to 0.12.2 -- cgit