diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | phan-autoload.patch | 42 | ||||
| -rw-r--r-- | phan.spec | 21 |
3 files changed, 37 insertions, 28 deletions
diff --git a/composer.json b/composer.json index e8fbe38..3149a78 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "composer/semver": "^1.4", "composer/xdebug-handler": "^1.1", "felixfbecker/advanced-json-rpc": "^3.0", - "microsoft/tolerant-php-parser": "0.0.12", + "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 044c80c..287e348 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-06-17 00:53:03.000000000 +0200 -+++ ./src/codebase.php 2018-06-19 06:28:58.191506085 +0200 +--- ./src/codebase.php.rpm 2018-08-27 03:28:15.000000000 +0200 ++++ ./src/codebase.php 2018-08-27 06:58:20.113887853 +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,8 +18,8 @@ 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-06-19 06:28:58.191506085 +0200 -+++ ./src/Phan/Bootstrap.php 2018-06-19 06:30:20.622986230 +0200 +--- ./src/Phan/Bootstrap.php.rpm 2018-08-27 03:28:15.000000000 +0200 ++++ ./src/Phan/Bootstrap.php 2018-08-27 06:58:20.114887859 +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,32 +40,34 @@ 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-06-17 00:53:03.000000000 +0200 -+++ ./src/phan.php 2018-06-19 06:28:58.191506085 +0200 +--- ./src/phan.php.rpm 2018-08-27 03:28:15.000000000 +0200 ++++ ./src/phan.php 2018-08-27 06:58:20.114887859 +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-06-17 00:53:03.000000000 +0200 -+++ ./src/prep.php 2018-06-19 06:28:58.191506085 +0200 +--- ./src/prep.php.rpm 2018-08-27 03:28:15.000000000 +0200 ++++ ./src/prep.php 2018-08-27 06:58:20.114887859 +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-06-17 00:53:03.000000000 +0200 -+++ ./src/requirements.php 2018-06-19 06:28:58.191506085 +0200 -@@ -6,8 +6,8 @@ assert( - ); +--- ./src/requirements.php.rpm 2018-08-27 06:58:20.114887859 +0200 ++++ ./src/requirements.php 2018-08-27 06:59:57.839473923 +0200 +@@ -8,10 +8,10 @@ if ((int)phpversion()[0] < 7) { + exit(1); + } - assert( -- file_exists(__DIR__ . '/../vendor/autoload.php') || file_exists(__DIR__ . '/../../../autoload.php'), -- 'Autoloader not found. Make sure you run `composer install` before running Phan. See https://github.com/phan/phan#getting-it-running for more details.' -+ file_exists(__DIR__ . '/autoload.php'), -+ 'Autoloader not found.' - ); - - // Fix turkish locales(tr_TR) - strtolower('I') is not 'i', so phan lookup might fail. +-if (!(file_exists(__DIR__ . '/../vendor/autoload.php') || file_exists(__DIR__ . '/../../../autoload.php'))) { ++if (!(file_exists(__DIR__ . '/autoload.php'))) { + fwrite( + STDERR, +- 'Autoloader not found. Make sure you run `composer install` before running Phan. See https://github.com/phan/phan#getting-it-running for more details.' ++ 'Autoloader not found.' + ); + exit(1); + } @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 59f3788233d8a89b440f1e82d9b1378afaf8471b +%global gh_commit 47cd6776f746962a1d2ec986bf6fb90d95b2ce7d %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.15 +Version: 1.0.1 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 BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 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.12 with php-composer(microsoft/tolerant-php-parser) < 1) +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) %else @@ -49,7 +49,7 @@ 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.12 +BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.13 BuildRequires: php-composer(sabre/event) < 6 BuildRequires: php-composer(sabre/event) >= 5.0 BuildRequires: php-composer(symfony/console) < 4 @@ -80,7 +80,7 @@ BuildRequires: php-composer(fedora/autoloader) # "composer/semver": "^1.4", # "composer/xdebug-handler": "^1.1", # "felixfbecker/advanced-json-rpc": "^3.0", -# "microsoft/tolerant-php-parser": "0.0.12", +# "microsoft/tolerant-php-parser": "0.0.13", # "sabre/event": "^5.0", # "symfony/console": "~2.3|~3.0|~4.0" Requires: php(language) >= 7.0.0 @@ -90,7 +90,7 @@ Requires: (php-composer(composer/semver) >= 1.4 with php- 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.12 with php-composer(microsoft/tolerant-php-parser) < 1) +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) Requires: (php-composer(symfony/console) >= 2.8 with php-composer(symfony/console) < 5) %else @@ -101,7 +101,7 @@ 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.12 +Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.13 Requires: php-composer(sabre/event) < 6 Requires: php-composer(sabre/event) >= 5.0 Requires: php-composer(symfony/console) < 4 @@ -205,6 +205,13 @@ EOF %changelog +* Mon Aug 27 2018 Remi Collet <remi@remirepo.net> - 1.0.1-1 +- update to 1.0.1 +- raise dependency on microsoft/tolerant-php-parser 0.0.13 + +* Tue Aug 14 2018 Remi Collet <remi@remirepo.net> - 1.0.0-1 +- update to 1.0.0 + * Mon Jul 23 2018 Remi Collet <remi@remirepo.net> - 0.12.15-1 - update to 0.12.15 |