diff options
| author | Remi Collet <remi@remirepo.net> | 2023-07-28 09:17:52 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-07-28 09:17:52 +0200 |
| commit | 3ec25266bb26d7272f770f4cec17cd729257e38e (patch) | |
| tree | 0ebdebfe06c6c87a38553d824d6e47f77363a091 | |
| parent | 65dcee198fdc47a42be59e4b64bf5becebe29863 (diff) | |
allow doctrine/annotations v2
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-doctrine-reflection.spec | 25 |
2 files changed, 17 insertions, 10 deletions
diff --git a/composer.json b/composer.json index f9d53b7..693a2c5 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "require": { "php": "^7.1 || ^8.0", "ext-tokenizer": "*", - "doctrine/annotations": "^1.0" + "doctrine/annotations": "^1.0 || ^2.0" }, "require-dev": { "doctrine/coding-standard": "^9", diff --git a/php-doctrine-reflection.spec b/php-doctrine-reflection.spec index eb4f3f8..0285672 100644 --- a/php-doctrine-reflection.spec +++ b/php-doctrine-reflection.spec @@ -1,14 +1,14 @@ # remirepo/fedora spec file for php-doctrine-reflection # -# Copyright (c) 2018-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2018-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 1034e5e71f89978b80f9c1570e7226f6c3b9b6fb +%global gh_commit 6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project reflection @@ -26,7 +26,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project} -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Additional reflection functionality @@ -51,7 +51,7 @@ BuildRequires: php-tokenizer # "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 2) +BuildRequires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 3) BuildRequires: (php-composer(doctrine/common) >= 3.3 with php-composer(doctrine/common) < 4) # remirepo:4 %else @@ -64,11 +64,11 @@ BuildRequires: phpunit9 >= 9.5 # From composer.json # "php": "^7.1 || ^8.0" -# "doctrine/annotations": "^1.0" +# "doctrine/annotations": "^1.0 || ^2.0" Requires: php(language) >= 7.1 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 2) +Requires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 3) # remirepo:3 %else Requires: php-doctrine-annotations >= 1.0 @@ -109,7 +109,10 @@ cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Annotations/autoload.php', + [ + '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Annotations2/autoload.php', + '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Annotations/autoload.php', + ], ]); EOF @@ -138,7 +141,7 @@ find tests -type f -exec grep -q PHPStan {} \; -delete -print : Run test suite ret=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -161,6 +164,10 @@ exit $ret %changelog +* Fri Jul 28 2023 Remi Collet <remi@remirepo.net> - 1.2.4-1 +- update to 1.2.4 (no change) +- allow doctrine/annotations v2 + * Wed Jun 1 2022 Remi Collet <remi@remirepo.net> - 1.2.3-1 - update to 1.2.3 |