summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rw-r--r--phan.spec26
2 files changed, 15 insertions, 13 deletions
diff --git a/composer.json b/composer.json
index f503287..7f74d62 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
"ext-json": "*",
"ext-tokenizer": "*",
"composer/semver": "^1.4|^2.0|^3.0",
- "composer/xdebug-handler": "^1.3.2",
+ "composer/xdebug-handler": "^2.0.0",
"felixfbecker/advanced-json-rpc": "^3.0.4",
"microsoft/tolerant-php-parser": "0.0.23",
"netresearch/jsonmapper": "^1.6.0|^2.0|^3.0",
diff --git a/phan.spec b/phan.spec
index 89ffa8a..16c1ee6 100644
--- a/phan.spec
+++ b/phan.spec
@@ -10,14 +10,14 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 95171b8a89ff2433e7ebc27d8a133743f7d78d3b
+%global gh_commit 37d1ffa99abaf034bd35f43ea7bbc468cb430a3f
%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 4.0.3
+%global upstream_version 4.0.4
#global upstream_prever RC2
Name: %{gh_project}
@@ -40,19 +40,18 @@ BuildRequires: php-ast >= 1.0.10
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 4)
-BuildRequires: (php-composer(composer/xdebug-handler) >= 1.3.2 with php-composer(composer/xdebug-handler) < 2)
+BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0.0 with php-composer(composer/xdebug-handler) < 3)
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.23 with php-composer(microsoft/tolerant-php-parser) < 0.1)
BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 4)
BuildRequires: (php-composer(sabre/event) >= 5.0.3 with php-composer(sabre/event) < 6)
BuildRequires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6)
BuildRequires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2)
-# remirepo:14
+# remirepo:13
%else
BuildRequires: php-composer(composer/semver) < 4
BuildRequires: php-composer(composer/semver) >= 1.4
-BuildRequires: php-composer(composer/xdebug-handler) < 2
-BuildRequires: php-composer(composer/xdebug-handler) >= 1.3.2
+BuildRequires: php-composer-xdebug-handler2
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
@@ -90,7 +89,7 @@ BuildRequires: php-composer(fedora/autoloader)
# "ext-json": "*",
# "ext-tokenizer": "*",
# "composer/semver": "^1.4|^2.0|^3.0",
-# "composer/xdebug-handler": "^1.3.2",
+# "composer/xdebug-handler": "^2.0.0",
# "felixfbecker/advanced-json-rpc": "^3.0.4",
# "microsoft/tolerant-php-parser": "0.0.23",
# "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0",
@@ -114,7 +113,7 @@ Recommends: php-ast >= 1.0.10
Suggests: php-igbinary
Suggests: php-iconv
Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 4)
-Requires: (php-composer(composer/xdebug-handler) >= 1.3.2 with php-composer(composer/xdebug-handler) < 2)
+Requires: (php-composer(composer/xdebug-handler) >= 2.0.0 with php-composer(composer/xdebug-handler) < 3)
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.23 with php-composer(microsoft/tolerant-php-parser) < 0.1)
@@ -122,13 +121,12 @@ Requires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-
Requires: (php-composer(sabre/event) >= 5.0.3 with php-composer(sabre/event) < 6)
Requires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6)
Requires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2)
-# remirepo:15
+# remirepo:14
%else
Requires: php-ast >= 1.0.10
Requires: php-composer(composer/semver) < 4
Requires: php-composer(composer/semver) >= 1.4
-Requires: php-composer(composer/xdebug-handler) < 2
-Requires: php-composer(composer/xdebug-handler) >= 1.3.2
+Requires: php-composer-xdebug-handler2
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
@@ -183,7 +181,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
'%{_datadir}/php/Composer/Semver2/autoload.php',
'%{_datadir}/php/Composer/Semver/autoload.php',
],
- '%{_datadir}/php/Composer/XdebugHandler/autoload.php',
+ '%{_datadir}/php/Composer/XdebugHandler2/autoload.php',
'%{_datadir}/php/AdvancedJsonRpc3/autoload.php',
'%{_datadir}/php/Microsoft/PhpParser/autoload.php',
'%{_datadir}/php/netresearch/jsonmapper/autoload.php',
@@ -251,6 +249,10 @@ EOF
%changelog
+* Thu Apr 15 2021 Remi Collet <remi@remirepo.net> - 4.0.4-1
+- update to 4.0.4
+- raise dependency on composer/xdebug-handler 2.0.0
+
* Wed Feb 3 2021 Remi Collet <remi@remirepo.net> - 4.0.3-1
- update to 4.0.3