diff options
| -rw-r--r-- | composer.json | 11 | ||||
| -rw-r--r-- | php-doctrine-persistence2.spec | 26 |
2 files changed, 20 insertions, 17 deletions
diff --git a/composer.json b/composer.json index 175a404..b264f63 100644 --- a/composer.json +++ b/composer.json @@ -21,23 +21,24 @@ ], "require": { "php": "^7.1 || ^8.0", - "doctrine/annotations": "^1.0", "doctrine/cache": "^1.11 || ^2.0", "doctrine/collections": "^1.0", "doctrine/event-manager": "^1.0", - "psr/cache": "^1.0|^2.0|^3.0", + "psr/cache": "^1.0 || ^2.0 || ^3.0", "doctrine/deprecations": "^0.5.3" }, "require-dev": { "composer/package-versions-deprecated": "^1.11", - "phpstan/phpstan": "0.12.84", + "phpstan/phpstan": "1.2.0", + "doctrine/annotations": "^1.0", "doctrine/coding-standard": "^6.0 || ^9.0", "doctrine/common": "^3.0", "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0", - "symfony/cache": "^4.4|^5.0", - "vimeo/psalm": "4.7.0" + "symfony/cache": "^4.4 || ^5.0 || ^6.0", + "vimeo/psalm": "4.13.1" }, "conflict": { + "doctrine/annotations": "<1.0 || >=2.0", "doctrine/common": "<2.10@dev" }, "autoload": { diff --git a/php-doctrine-persistence2.spec b/php-doctrine-persistence2.spec index bc8ac4b..574bb76 100644 --- a/php-doctrine-persistence2.spec +++ b/php-doctrine-persistence2.spec @@ -8,7 +8,7 @@ # %global bootstrap 0 -%global gh_commit 5e7bdbbfe9811c06e1f745d1c166647d5c47d6ee +%global gh_commit f8af155c1e7963f3d2b4415097d55757bbaa53d8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project persistence @@ -27,7 +27,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 2.2.3 +Version: 2.3.0 Release: 1%{?dist} Summary: Doctrine Persistence abstractions @@ -45,12 +45,13 @@ BuildRequires: php-pcre BuildRequires: php-spl # From composer.json # "composer/package-versions-deprecated": "^1.11", -# "phpstan/phpstan": "^0.12", +# "phpstan/phpstan": "1.2.0", +# "doctrine/annotations": "^1.0", # "doctrine/coding-standard": "^6.0 || ^8.0", # "doctrine/common": "^3.0", # "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0", -# "symfony/cache": "^4.4", -# "vimeo/psalm": "^4.3.1" +# "symfony/cache": "^4.4 || ^5.0 || ^6.0", +# "vimeo/psalm": "4.13.1" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 2) @@ -59,7 +60,7 @@ BuildRequires: (php-composer(doctrine/collections) >= 1.0 with php-composer( BuildRequires: (php-composer(doctrine/event-manager) >= 1.0 with php-composer(doctrine/event-manager) < 2) BuildRequires: (php-composer(doctrine/common) >= 3.0 with php-composer(doctrine/common) < 4) BuildRequires: (php-composer(doctrine/deprecations) >= 0.5.3 with php-composer(doctrine/deprecations) < 1) -BuildRequires: (php-composer(symfony/cache) >= 4.4 with php-composer(symfony/cache) < 5) +BuildRequires: (php-composer(symfony/cache) >= 4.4 with php-composer(symfony/cache) < 6) BuildRequires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2) # remirepo:10 %else @@ -78,25 +79,22 @@ BuildRequires: phpunit9 # From composer.json # "php": "^7.1 || ^8.0" -# "doctrine/annotations": "^1.0", # "doctrine/cache": "^1.11 || ^2.0", # "doctrine/collections": "^1.0", # "doctrine/event-manager": "^1.0", -# "psr/cache": "^1.0|^2.0|^3.0", +# "psr/cache": "^1.0 || ^2.0 || ^3.0", # "doctrine/deprecations": "^0.5.3" 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/cache) >= 1.11 with php-composer(doctrine/cache) < 3) Requires: (php-composer(doctrine/collections) >= 1.0 with php-composer(doctrine/collections) < 2) Requires: (php-composer(doctrine/event-manager) >= 1.0 with php-composer(doctrine/event-manager) < 2) Requires: (php-composer(doctrine/deprecations) >= 0.5.3 with php-composer(doctrine/deprecations) < 1) # ignore v2 and v3 Requires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2) -# remirepo:8 +# remirepo:7 %else -Requires: php-doctrine-annotations >= 1.0 Requires: php-doctrine-cache >= 1.0 Requires: php-doctrine-collections >= 1.0 Requires: php-doctrine-event-manager >= 1.0 @@ -182,7 +180,7 @@ find tests -type f -exec grep -q PHPStan {} \; -delete -print : Run test suite ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -197,6 +195,7 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -206,6 +205,9 @@ exit $ret %changelog +* Mon Jan 10 2022 Remi Collet <remi@remirepo.net> - 2.3.0-1 +- update to 2.3.0 + * Fri Oct 29 2021 Remi Collet <remi@remirepo.net> - 2.2.3-1 - update to 2.2.3 |