diff options
| author | Remi Collet <remi@remirepo.net> | 2020-06-29 08:55:34 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-06-29 08:55:34 +0200 |
| commit | eabb9da4f66c0edcf65577fff2b32ac2de6fc264 (patch) | |
| tree | 13f586b41d48981dabceea03f35f5f59291706f6 | |
| parent | 9b14d228d959a2bd0a16fcf6acdce194baed9e88 (diff) | |
update to 1.3.0
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | php-phpdocumentor-type-resolver1.spec | 23 |
2 files changed, 9 insertions, 19 deletions
diff --git a/composer.json b/composer.json index b9b327e..242ecbe 100644 --- a/composer.json +++ b/composer.json @@ -10,12 +10,11 @@ } ], "require": { - "php": "^7.2", + "php": "^7.2 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "mockery/mockery": "~1", - "ext-tokenizer": "^7.2" + "ext-tokenizer": "*" }, "autoload": { "psr-4": { diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec index 41c0e3e..6dd7b2e 100644 --- a/php-phpdocumentor-type-resolver1.spec +++ b/php-phpdocumentor-type-resolver1.spec @@ -10,8 +10,8 @@ %global github_owner phpDocumentor %global github_name TypeResolver -%global github_version 1.2.0 -%global github_commit 30441f2752e493c639526b215ed81d54f369d693 +%global github_version 1.3.0 +%global github_commit e878a14a65245fbe78f8080eba03b47c3b705651 %global composer_vendor phpdocumentor %global composer_project type-resolver @@ -20,11 +20,8 @@ # Install in reflection-common tree %global ns_major 2 -# "php": "^7.2" +# "php": "^7.2 || ^8.0" %global php_min_ver 7.2 -# "mockery/mockery": "^1" -%global mockery_min_ver 1 -%global mockery_max_ver 2 # "phpdocumentor/reflection-common": "^2.0" %global reflection_common_min_ver 2.0 %global reflection_common_max_ver 3 @@ -57,11 +54,9 @@ BuildRequires: phpunit8 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) -BuildRequires: (php-composer(mockery/mockery) >= %{mockery_min_ver} with php-composer(mockery/mockery) < %{mockery_max_ver}) -# remirepo:4 +# remirepo:3 %else BuildRequires: php-phpdocumentor-reflection-common2 >= %{reflection_common_min_ver} -BuildRequires: php-mockery >= %{mockery_min_ver} %endif ## phpcompatinfo (computed from version 1.0.0) BuildRequires: php-reflection @@ -142,15 +137,8 @@ cat <<'BOOTSTRAP' | tee bootstrap.php require '%{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php'; \Fedora\Autoloader\Autoload::addPsr4('phpDocumentor\\Reflection\\', __DIR__.'/tests/unit'); - -\Fedora\Autoloader\Dependencies::required([ - '%{phpdir}/Mockery1/autoload.php', -]); BOOTSTRAP -: Adjust listener path -sed 's#vendor/mockery/mockery/library/Mockery#%{phpdir}/Mockery1#' phpunit.xml.dist > phpunit.xml - : Upstream tests RETURN_CODE=0 for cmdarg in php php72 php73 php74 php80; do @@ -182,6 +170,9 @@ exit $RETURN_CODE %changelog +* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 1.3.0-1 +- update to 1.3.0 + * Tue Jun 23 2020 Remi Collet <remi@remirepo.net> - 1.2.0-1 - update to 1.2.0 |