summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rw-r--r--phan-autoload.patch28
-rw-r--r--phan.spec19
3 files changed, 27 insertions, 22 deletions
diff --git a/composer.json b/composer.json
index f5ef395..4fd5f9d 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
"composer/xdebug-handler": "^1.3.2",
"felixfbecker/advanced-json-rpc": "^3.0.4",
"microsoft/tolerant-php-parser": "0.0.20",
- "netresearch/jsonmapper": "^1.6.0|^2.0",
+ "netresearch/jsonmapper": ">=1.6.0",
"sabre/event": "^5.0",
"symfony/console": "^2.3|^3.0|^4.0|^5.0",
"symfony/polyfill-mbstring": "^1.11.0"
diff --git a/phan-autoload.patch b/phan-autoload.patch
index 98f39a7..e063c5e 100644
--- a/phan-autoload.patch
+++ b/phan-autoload.patch
@@ -1,8 +1,8 @@
diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php
---- ./src/Phan/Bootstrap.php.rpm 2020-07-02 07:19:00.000000000 +0200
-+++ ./src/Phan/Bootstrap.php 2020-07-02 07:19:12.412846692 +0200
-@@ -141,22 +141,8 @@ if (extension_loaded('ast')) {
- }
+--- ./src/Phan/Bootstrap.php.rpm 2020-08-11 11:05:14.019166382 +0200
++++ ./src/Phan/Bootstrap.php 2020-08-11 11:06:23.713091459 +0200
+@@ -142,24 +142,8 @@ if (extension_loaded('ast')) {
+ unset($ast_version);
}
-// Use the composer autoloader
@@ -18,26 +18,28 @@ diff -up ./src/Phan/Bootstrap.php.rpm ./src/Phan/Bootstrap.php
- break;
- }
-}
+-unset($file);
-if (!$found_autoloader) {
- fwrite(STDERR, "Could not locate the autoloader\n");
-}
+-unset($found_autoloader);
+// Use the fedora autoloader
+require_once __DIR__ . '/../autoload.php';
define('EXIT_SUCCESS', 0);
define('EXIT_FAILURE', 1);
diff -up ./src/phan.php.rpm ./src/phan.php
---- ./src/phan.php.rpm 2020-07-02 07:19:00.000000000 +0200
-+++ ./src/phan.php 2020-07-02 07:19:12.412846692 +0200
+--- ./src/phan.php.rpm 2020-08-11 10:59:01.000000000 +0200
++++ ./src/phan.php 2020-08-11 11:05:14.019166382 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
<?php
declare(strict_types=1);
diff -up ./src/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPluginSet.php
---- ./src/Phan/Plugin/ConfigPluginSet.php.rpm 2020-07-02 07:19:00.000000000 +0200
-+++ ./src/Phan/Plugin/ConfigPluginSet.php 2020-07-02 07:19:12.412846692 +0200
-@@ -903,7 +903,7 @@ final class ConfigPluginSet extends Plug
+--- ./src/Phan/Plugin/ConfigPluginSet.php.rpm 2020-08-11 10:59:01.000000000 +0200
++++ ./src/Phan/Plugin/ConfigPluginSet.php 2020-08-11 11:05:14.019166382 +0200
+@@ -904,7 +904,7 @@ final class ConfigPluginSet extends Plug
*/
public static function getBuiltinPluginDirectory(): string
{
@@ -47,16 +49,16 @@ diff -up ./src/Phan/Plugin/ConfigPluginSet.php.rpm ./src/Phan/Plugin/ConfigPlugi
private function ensurePluginsExist(): void
diff -up ./src/prep.php.rpm ./src/prep.php
---- ./src/prep.php.rpm 2020-07-02 07:19:00.000000000 +0200
-+++ ./src/prep.php 2020-07-02 07:19:12.412846692 +0200
+--- ./src/prep.php.rpm 2020-08-11 10:59:01.000000000 +0200
++++ ./src/prep.php 2020-08-11 11:05:14.019166382 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
<?php
declare(strict_types=1);
diff -up ./src/requirements.php.rpm ./src/requirements.php
---- ./src/requirements.php.rpm 2020-07-02 07:19:12.412846692 +0200
-+++ ./src/requirements.php 2020-07-02 07:20:08.066622708 +0200
+--- ./src/requirements.php.rpm 2020-08-11 10:59:01.000000000 +0200
++++ ./src/requirements.php 2020-08-11 11:05:14.019166382 +0200
@@ -2,11 +2,11 @@
declare(strict_types=1);
diff --git a/phan.spec b/phan.spec
index eb2686d..031c136 100644
--- a/phan.spec
+++ b/phan.spec
@@ -10,14 +10,14 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit b04358cfb5a9ead1c587c08fdbe84283f8c46c01
+%global gh_commit d9ee6bd18aa993b4f8d35245b9c24fbd27e204f3
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner phan
#global gh_date 20150820
%global gh_project phan
%global psr0 Phan
%bcond_without tests
-%global upstream_version 3.1.0
+%global upstream_version 3.1.1
#global upstream_prever RC2
Name: %{gh_project}
@@ -43,7 +43,7 @@ BuildRequires: (php-composer(composer/semver) >= 1.4 with php-
BuildRequires: (php-composer(composer/xdebug-handler) >= 1.3.2 with php-composer(composer/xdebug-handler) < 2)
BuildRequires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 with php-composer(felixfbecker/advanced-json-rpc) < 4)
BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.20 with php-composer(microsoft/tolerant-php-parser) < 0.1)
-BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 3)
+BuildRequires: php-composer(netresearch/jsonmapper) >= 1.6
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) < 6)
# remirepo:15
@@ -56,7 +56,6 @@ BuildRequires: php-composer(felixfbecker/advanced-json-rpc) < 4
BuildRequires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4
BuildRequires: php-composer(microsoft/tolerant-php-parser) < 0.1
BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.18
-BuildRequires: php-composer(netresearch/jsonmapper) < 3
BuildRequires: php-composer(netresearch/jsonmapper) >= 1.6
BuildRequires: php-composer(sabre/event) < 6
BuildRequires: php-composer(sabre/event) >= 5.0
@@ -93,7 +92,7 @@ BuildRequires: php-composer(fedora/autoloader)
# "composer/xdebug-handler": "^1.3.2",
# "felixfbecker/advanced-json-rpc": "^3.0.4",
# "microsoft/tolerant-php-parser": "0.0.20",
-# "netresearch/jsonmapper": "^1.6.0|^2.0",
+# "netresearch/jsonmapper": ">=1.6.0",
# "sabre/event": "^5.0",
# "symfony/console": "^2.3|^3.0|~4.0|^5.0",
# "symfony/polyfill-mbstring": "^1.11.0"
@@ -117,7 +116,7 @@ Requires: (php-composer(composer/xdebug-handler) >= 1.3.2 with php-
Requires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 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.20 with php-composer(microsoft/tolerant-php-parser) < 0.1)
-Requires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 3)
+Requires: php-composer(netresearch/jsonmapper) >= 1.6
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) < 6)
# remirepo:16
@@ -131,7 +130,6 @@ Requires: php-composer(felixfbecker/advanced-json-rpc) < 4
Requires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4
Requires: php-composer(microsoft/tolerant-php-parser) < 0.1
Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.18
-Requires: php-composer(netresearch/jsonmapper) < 3
Requires: php-composer(netresearch/jsonmapper) >= 1.6
Requires: php-composer(sabre/event) < 6
Requires: php-composer(sabre/event) >= 5.0
@@ -228,8 +226,9 @@ EOF
# NOTICE mosquitto, request and grpc must be disabled
# testHash failing on bigendian
+# testConstantsDocumented was written for php-ast 1.0.6 and php <=7.4
%{_bindir}/phpunit8 -d memory_limit=1G \
- --filter '^((?!(testGetProjectRelativePathForPath|testHash)).)*$' \
+ --filter '^((?!(testGetProjectRelativePathForPath|testHash|testConstantsDocumented)).)*$' \
--bootstrap tests/autoload.php --verbose
@@ -249,6 +248,10 @@ EOF
%changelog
+* Tue Aug 11 2020 Remi Collet <remi@remirepo.net> - 3.1.1-1
+- update to 3.1.1
+- allow netresearch/jsonmapper 3.0
+
* Fri Jul 17 2020 Remi Collet <remi@remirepo.net> - 3.1.0-1
- update to 3.1.0