From ba0c409be448714f271888b3d9e0eb0231e1d21f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Jun 2020 07:39:30 +0200 Subject: update to 3.0.1 allow composer/semver version 3 --- composer.json | 2 +- phan.spec | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 1efd2aa..4e4d4d6 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "ext-filter": "*", "ext-json": "*", "ext-tokenizer": "*", - "composer/semver": "^1.4|^2.0", + "composer/semver": "^1.4|^2.0|^3.0", "composer/xdebug-handler": "^1.3.2", "felixfbecker/advanced-json-rpc": "^3.0.4", "microsoft/tolerant-php-parser": "0.0.20", diff --git a/phan.spec b/phan.spec index 6c942d3..f810471 100644 --- a/phan.spec +++ b/phan.spec @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a2eb629c09952383ae78315d240ce3770670c1a5 +%global gh_commit 6832c5c39593ed9856e9b025b06f646ea01a0d86 %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 %global with_tests 0%{!?_without_tests:1} -%global upstream_version 3.0.0 +%global upstream_version 3.0.1 #global upstream_prever RC2 Name: %{gh_project} @@ -39,7 +39,7 @@ BuildRequires: php(language) >= 7.2 BuildRequires: php-ast >= 1.0.6 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 3) +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(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) @@ -48,7 +48,7 @@ BuildRequires: (php-composer(sabre/event) >= 5.0 with php- BuildRequires: (php-composer(symfony/console) >= 2.8 with php-composer(symfony/console) < 6) # remirepo:15 %else -BuildRequires: php-composer(composer/semver) < 3 +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 @@ -90,7 +90,7 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-filter": "*", # "ext-json": "*", # "ext-tokenizer": "*", -# "composer/semver": "^1.4|^2.0", +# "composer/semver": "^1.4|^2.0|^3.0", # "composer/xdebug-handler": "^1.3.2", # "felixfbecker/advanced-json-rpc": "^3.0.4", # "microsoft/tolerant-php-parser": "0.0.20", @@ -113,7 +113,7 @@ Requires: php-json Recommends: php-ast >= 1.0.6 Suggests: php-igbinary Suggests: php-iconv -Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 3) +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(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) @@ -124,7 +124,7 @@ Requires: (php-composer(symfony/console) >= 2.8 with php- # remirepo:16 %else Requires: php-ast >= 0.1.5 -Requires: php-composer(composer/semver) < 3 +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 @@ -179,6 +179,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Phan\\', __DIR__ . '/Phan'); \Fedora\Autoloader\Dependencies::required([ [ + '%{_datadir}/php/Composer/Semver3/autoload.php', '%{_datadir}/php/Composer/Semver2/autoload.php', '%{_datadir}/php/Composer/Semver/autoload.php', ], @@ -227,7 +228,9 @@ require '%{buildroot}%{_datadir}/php/%{psr0}/Phan/Bootstrap.php'; EOF # NOTICE mosquitto, request and grpc must be disabled -%{_bindir}/phpunit8 -d memory_limit=1G --bootstrap tests/autoload.php --verbose +%{_bindir}/phpunit8 -d memory_limit=1G \ + --filter '^((?!(testGetProjectRelativePathForPath)).)*$' \ + --bootstrap tests/autoload.php --verbose %else @@ -246,6 +249,10 @@ EOF %changelog +* Fri Jun 5 2020 Remi Collet - 3.0.1-1 +- update to 3.0.1 +- allow composer/semver version 3 + * Mon May 11 2020 Remi Collet - 3.0.0-1 - update to 3.0.0 -- cgit