summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-11-23 08:34:21 +0100
committerRemi Collet <remi@php.net>2021-11-23 08:34:21 +0100
commitf5b78b7bd14a047a61e60b76ff0a500549118201 (patch)
tree9f28cce1cf4a1ae4f2cb44cd25f7b526599a0e45
parent49ae9fdab5d3ac20af17cdd2d6cbea6312c0804c (diff)
update to 1.1.11HEADmaster
allow psr/cache v2 and v3
-rw-r--r--composer.json4
-rw-r--r--php-symfony-contracts.spec23
-rw-r--r--src/Cache/composer.json4
-rw-r--r--src/EventDispatcher/composer.json2
-rw-r--r--src/HttpClient/composer.json2
-rw-r--r--src/Service/composer.json2
-rw-r--r--src/Translation/composer.json2
7 files changed, 24 insertions, 15 deletions
diff --git a/composer.json b/composer.json
index 4ac096e..4cd9ebd 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
],
"require": {
"php": ">=7.1.3",
- "psr/cache": "^1.0",
+ "psr/cache": "^1.0|^2.0|^3.0",
"psr/container": "^1.0"
},
"require-dev": {
@@ -47,7 +47,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-main": "1.1-dev"
}
}
}
diff --git a/php-symfony-contracts.spec b/php-symfony-contracts.spec
index c8c2986..75822e2 100644
--- a/php-symfony-contracts.spec
+++ b/php-symfony-contracts.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 011c20407c4b99d454f44021d023fb39ce23b73d
+%global gh_commit cf2984f7a99bfae197f9c96f5a16a4041ff6ffb1
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner symfony
%global gh_project contracts
@@ -21,7 +21,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{pk_vendor}-%{pk_project}
-Version: 1.1.10
+Version: 1.1.11
Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: A set of abstractions extracted out of the Symfony
@@ -42,7 +42,7 @@ BuildRequires: php-intl
# "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.0 with php-composer(psr/container) < 2)
# remirepo:4
%else
@@ -57,7 +57,7 @@ BuildRequires: php-composer(fedora/autoloader)
# From composer.json, "require": {
# "php": ">=7.1.3"
-# "psr/cache": "^1.0",
+# "psr/cache": "^1.0|^2.0|^3.0",
# "psr/container": "^1.0"
Requires: php(language) >= 7.1.3
# From composer.json, "suggest": {
@@ -69,7 +69,7 @@ Requires: php(language) >= 7.1.3
# "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.0 with php-composer(psr/container) < 2)
Recommends: (php-composer(psr/event-dispatcher) >= 1.0 with php-composer(psr/event-dispatcher) < 2)
# remirepo:5
@@ -122,7 +122,11 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__);
\Fedora\Autoloader\Dependencies::optional([
- '%{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',
]);
@@ -144,10 +148,11 @@ mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Tests\\Fixtures\\', dirname(__DIR__)."/Tests/Fixtures/");
EOF
ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php74 php80 php81; do
if which $cmd; then
$cmd %{phpunit} \
--no-coverage \
@@ -171,6 +176,10 @@ exit $ret
%changelog
+* Tue Nov 23 2021 Remi Collet <remi@remirepo.net> - 1.1.11-1
+- update to 1.1.11
+- allow psr/cache v2 and v3
+
* Wed Sep 9 2020 Remi Collet <remi@remirepo.net> - 1.1.10-1
- update to 1.1.10
diff --git a/src/Cache/composer.json b/src/Cache/composer.json
index 97eabec..7d0735e 100644
--- a/src/Cache/composer.json
+++ b/src/Cache/composer.json
@@ -17,7 +17,7 @@
],
"require": {
"php": ">=7.1.3",
- "psr/cache": "^1.0"
+ "psr/cache": "^1.0|^2.0|^3.0"
},
"suggest": {
"symfony/cache-implementation": ""
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-main": "1.1-dev"
},
"thanks": {
"name": "symfony/contracts",
diff --git a/src/EventDispatcher/composer.json b/src/EventDispatcher/composer.json
index 862c256..9d4bd7b 100644
--- a/src/EventDispatcher/composer.json
+++ b/src/EventDispatcher/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-main": "1.1-dev"
},
"thanks": {
"name": "symfony/contracts",
diff --git a/src/HttpClient/composer.json b/src/HttpClient/composer.json
index 2382aa7..2464d08 100644
--- a/src/HttpClient/composer.json
+++ b/src/HttpClient/composer.json
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-main": "1.1-dev"
},
"thanks": {
"name": "symfony/contracts",
diff --git a/src/Service/composer.json b/src/Service/composer.json
index 58748f3..e3bf920 100644
--- a/src/Service/composer.json
+++ b/src/Service/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-main": "1.1-dev"
},
"thanks": {
"name": "symfony/contracts",
diff --git a/src/Translation/composer.json b/src/Translation/composer.json
index 7a449e0..8fe4b20 100644
--- a/src/Translation/composer.json
+++ b/src/Translation/composer.json
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-main": "1.1-dev"
},
"thanks": {
"name": "symfony/contracts",