From 4c1f463daa2295ea497dee303ba26ebca12b8eda Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 Nov 2021 08:38:42 +0100 Subject: update to 2.5.0 allow psr/cache v2 and v3 --- composer.json | 5 ++++- php-symfony-contracts2.spec | 21 +++++++++++++++------ src/Cache/composer.json | 2 +- src/Deprecation/composer.json | 2 +- src/EventDispatcher/composer.json | 2 +- src/HttpClient/composer.json | 2 +- src/Service/composer.json | 8 ++++++-- src/Translation/composer.json | 2 +- 8 files changed, 30 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index b71a48d..f70b8b7 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,9 @@ "require-dev": { "symfony/polyfill-intl-idn": "^1.10" }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, "replace": { "symfony/cache-contracts": "self.version", "symfony/deprecation-contracts": "self.version", @@ -49,7 +52,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" } } } diff --git a/php-symfony-contracts2.spec b/php-symfony-contracts2.spec index 9470ded..5719b74 100644 --- a/php-symfony-contracts2.spec +++ b/php-symfony-contracts2.spec @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 8434102b404d119dcaf98c8fe19a2655573ac17a +%global gh_commit 1f4c95d47bddf0c1579779d4b85602c923ed2f1c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner symfony %global gh_project contracts @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 2.4.0 +Version: 2.5.0 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A set of abstractions extracted out of the Symfony, version %{major} @@ -47,7 +47,7 @@ BuildRequires: php-zlib # "symfony/polyfill-intl-idn": "^1.10" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >=8 -BuildRequires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2) +BuildRequires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 4) BuildRequires: (php-composer(psr/container) >= 1.1 with php-composer(psr/container) < 2) BuildRequires: (php-composer(psr/event-dispatcher) >= 1.0 with php-composer(psr/event-dispatcher) < 2) # remirepo:5 @@ -80,7 +80,7 @@ Requires: php(language) >= 7.2.5 # "symfony/translation-implementation": "" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >=8 -Requires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2) +Requires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 4) Requires: (php-composer(psr/container) >= 1.1 with php-composer(psr/container) < 2) Requires: (php-composer(psr/event-dispatcher) >= 1.0 with php-composer(psr/event-dispatcher) < 2) # remirepo:5 @@ -138,7 +138,11 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/Psr/Cache/autoload.php', + [ + '%{php_home}/Psr/Cache3/autoload.php', + '%{php_home}/Psr/Cache2/autoload.php', + '%{php_home}/Psr/Cache/autoload.php', + ], '%{php_home}/Psr/Container/autoload.php', '%{php_home}/Psr/EventDispatcher/autoload.php', __DIR__ . '/Deprecation/function.php', @@ -161,10 +165,11 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php - 2.5.0-1 +- update to 2.5.0 +- allow psr/cache v2 and v3 + * Mon Apr 19 2021 Remi Collet - 2.4.0-1 - update to 2.4.0 - raise dependency on psr/container 1.1 diff --git a/src/Cache/composer.json b/src/Cache/composer.json index 0f69892..9f45e17 100644 --- a/src/Cache/composer.json +++ b/src/Cache/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/Deprecation/composer.json b/src/Deprecation/composer.json index 3884889..cc7cc12 100644 --- a/src/Deprecation/composer.json +++ b/src/Deprecation/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/EventDispatcher/composer.json b/src/EventDispatcher/composer.json index 9f6dc41..660df81 100644 --- a/src/EventDispatcher/composer.json +++ b/src/EventDispatcher/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/HttpClient/composer.json b/src/HttpClient/composer.json index 2633785..b76cab8 100644 --- a/src/HttpClient/composer.json +++ b/src/HttpClient/composer.json @@ -27,7 +27,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/Service/composer.json b/src/Service/composer.json index 353413f..e680798 100644 --- a/src/Service/composer.json +++ b/src/Service/composer.json @@ -17,7 +17,11 @@ ], "require": { "php": ">=7.2.5", - "psr/container": "^1.1" + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { "symfony/service-implementation": "" @@ -28,7 +32,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/Translation/composer.json b/src/Translation/composer.json index 00e27f8..65fe243 100644 --- a/src/Translation/composer.json +++ b/src/Translation/composer.json @@ -27,7 +27,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", -- cgit