summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--composer.json2
-rw-r--r--phan-autoload.patch24
-rw-r--r--phan.spec21
4 files changed, 35 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index 1ab5c4f..fc9aa8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+clog
package-*.xml
*.tgz
*.tar.gz
diff --git a/composer.json b/composer.json
index 68be4d8..daf6f91 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,9 @@
"require": {
"php": "~7.0.0 || ~7.1.0 || ~7.2.0",
"ext-ast": "^0.1.4",
+ "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 c10a2d7..2d8e88d 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 22:02:32.000000000 +0200
-+++ ./src/codebase.php 2017-09-25 09:30:54.398808581 +0200
+--- ./src/codebase.php.rpm 2017-10-21 04:26:51.000000000 +0200
++++ ./src/codebase.php 2017-10-21 08:59:16.643898735 +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 22:02:32.000000000 +0200
-+++ ./src/Phan/Bootstrap.php 2017-09-25 09:30:54.398808581 +0200
+--- ./src/Phan/Bootstrap.php.rpm 2017-10-21 04:26:51.000000000 +0200
++++ ./src/Phan/Bootstrap.php 2017-10-21 08:59:16.643898735 +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 22:02:32.000000000 +0200
-+++ ./src/phan.php 2017-09-25 09:30:54.398808581 +0200
+--- ./src/phan.php.rpm 2017-10-21 04:26:51.000000000 +0200
++++ ./src/phan.php 2017-10-21 08:59:16.643898735 +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 22:02:32.000000000 +0200
-+++ ./src/prep.php 2017-09-25 09:30:54.399808587 +0200
+--- ./src/prep.php.rpm 2017-10-21 04:26:51.000000000 +0200
++++ ./src/prep.php 2017-10-21 08:59:16.643898735 +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:30:54.399808587 +0200
-+++ ./src/requirements.php 2017-09-25 09:31:59.525193144 +0200
-@@ -11,6 +11,6 @@ assert(
+--- ./src/requirements.php.rpm 2017-10-21 08:59:16.643898735 +0200
++++ ./src/requirements.php 2017-10-21 09:00:37.774326072 +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 26b7f3e..abdbac3 100644
--- a/phan.spec
+++ b/phan.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 9a559221a31526ff2f09947800cd6cc4ba592ac9
+%global gh_commit af93901dba4cb00f7d6a2cd4c2a862d774a8b3b4
%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.8.8
+Version: 0.8.9
Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
Summary: A static analyzer for PHP
@@ -31,10 +31,14 @@ BuildArch: noarch
%if %{with_tests}
BuildRequires: php(language) >= 7.0
BuildRequires: php-ast
+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(symfony/console) < 4
BuildRequires: php-composer(symfony/console) >= 2.8
+BuildRequires: php-composer(sabre/event) < 6
+BuildRequires: php-composer(sabre/event) >= 5.0
BuildRequires: php-reflection
BuildRequires: php-dom
BuildRequires: php-filter
@@ -59,14 +63,20 @@ BuildRequires: php-composer(fedora/autoloader)
# From composer.json, "require": {
# "php": "~7.0.0 || ~7.1.0 || ~7.2.0",
# "ext-ast": "^0.1.4",
+# "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.0
Requires: php-ast
+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(symfony/console) < 4
Requires: php-composer(symfony/console) >= 2.3
+Requires: php-composer(sabre/event) < 6
+Requires: php-composer(sabre/event) >= 5.0
# From phpcompatinfo report for 0.8.4
Requires: php-cli
Requires: php-reflection
@@ -107,7 +117,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',
@@ -161,6 +173,11 @@ EOF
%changelog
+* Sat Oct 21 2017 Remi Collet <remi@remirepo.net> - 0.8.9-1
+- Update to 0.8.9
+- 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.8.8-1
- Update to 0.8.8
- add dependency on nikic/php-parser 3.1.1