From 764e64ab99f750f3f2c737d43934669fe8f77c92 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 24 Nov 2020 20:42:41 +0000
Subject: [PATCH] =?UTF-8?q?Issue=20#3180207=20by=20andypost,=20alexpott,?=
=?UTF-8?q?=20G=C3=A1bor=20Hojtsy,=20Mixologic,=20xjm,=20catch:=20Update?=
=?UTF-8?q?=20laminas-diactoros,=20laminas-escaper=20and=20laminas-feed=20?=
=?UTF-8?q?for=20PHP=208=20compatibility?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
composer.lock | 82 ++++++++++---------
.../Metapackage/CoreRecommended/composer.json | 6 +-
2 files changed, 47 insertions(+), 41 deletions(-)
diff --git a/composer.lock b/composer.lock
index 2d3defd071d9..407538c482d1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1105,21 +1105,21 @@
},
{
"name": "laminas/laminas-diactoros",
- "version": "2.4.1",
+ "version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-diactoros.git",
- "reference": "36ef09b73e884135d2059cc498c938e90821bb57"
+ "reference": "4ff7400c1c12e404144992ef43c8b733fd9ad516"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/36ef09b73e884135d2059cc498c938e90821bb57",
- "reference": "36ef09b73e884135d2059cc498c938e90821bb57",
+ "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/4ff7400c1c12e404144992ef43c8b733fd9ad516",
+ "reference": "4ff7400c1c12e404144992ef43c8b733fd9ad516",
"shasum": ""
},
"require": {
"laminas/laminas-zendframework-bridge": "^1.0",
- "php": "^7.1",
+ "php": "^7.3 || ~8.0.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0"
},
@@ -1138,10 +1138,11 @@
"ext-dom": "*",
"ext-gd": "*",
"ext-libxml": "*",
- "http-interop/http-factory-tests": "^0.5.0",
+ "http-interop/http-factory-tests": "^0.8.0",
"laminas/laminas-coding-standard": "~1.0.0",
- "php-http/psr7-integration-tests": "^1.0",
- "phpunit/phpunit": "^7.5.18"
+ "php-http/psr7-integration-tests": "^1.1",
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpunit/phpunit": "^9.1"
},
"type": "library",
"extra": {
@@ -1200,40 +1201,40 @@
"type": "community_bridge"
}
],
- "time": "2020-09-03T14:29:41+00:00"
+ "time": "2020-11-18T18:39:28+00:00"
},
{
"name": "laminas/laminas-escaper",
- "version": "2.6.1",
+ "version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-escaper.git",
- "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70"
+ "reference": "5e04bc5ae5990b17159d79d331055e2c645e5cc5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70",
- "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70",
+ "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/5e04bc5ae5990b17159d79d331055e2c645e5cc5",
+ "reference": "5e04bc5ae5990b17159d79d331055e2c645e5cc5",
"shasum": ""
},
"require": {
"laminas/laminas-zendframework-bridge": "^1.0",
- "php": "^5.6 || ^7.0"
+ "php": "^7.3 || ~8.0.0"
},
"replace": {
- "zendframework/zend-escaper": "self.version"
+ "zendframework/zend-escaper": "^2.6.1"
},
"require-dev": {
"laminas/laminas-coding-standard": "~1.0.0",
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+ "phpunit/phpunit": "^9.3",
+ "psalm/plugin-phpunit": "^0.12.2",
+ "vimeo/psalm": "^3.16"
},
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6.x-dev",
- "dev-develop": "2.7.x-dev"
- }
+ "suggest": {
+ "ext-iconv": "*",
+ "ext-mbstring": "*"
},
+ "type": "library",
"autoload": {
"psr-4": {
"Laminas\\Escaper\\": "src/"
@@ -1257,20 +1258,26 @@
"rss": "https://github.com/laminas/laminas-escaper/releases.atom",
"source": "https://github.com/laminas/laminas-escaper"
},
- "time": "2019-12-31T16:43:30+00:00"
+ "funding": [
+ {
+ "url": "https://funding.communitybridge.org/projects/laminas-project",
+ "type": "community_bridge"
+ }
+ ],
+ "time": "2020-11-17T21:26:43+00:00"
},
{
"name": "laminas/laminas-feed",
- "version": "2.12.3",
+ "version": "2.13.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-feed.git",
- "reference": "3c91415633cb1be6f9d78683d69b7dcbfe6b4012"
+ "reference": "fb89aac1984222227f37792dd193d34829a0762f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/3c91415633cb1be6f9d78683d69b7dcbfe6b4012",
- "reference": "3c91415633cb1be6f9d78683d69b7dcbfe6b4012",
+ "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/fb89aac1984222227f37792dd193d34829a0762f",
+ "reference": "fb89aac1984222227f37792dd193d34829a0762f",
"shasum": ""
},
"require": {
@@ -1279,7 +1286,10 @@
"laminas/laminas-escaper": "^2.5.2",
"laminas/laminas-stdlib": "^3.2.1",
"laminas/laminas-zendframework-bridge": "^1.0",
- "php": "^5.6 || ^7.0"
+ "php": "^7.3 || ~8.0.0"
+ },
+ "conflict": {
+ "laminas/laminas-servicemanager": "<3.3"
},
"replace": {
"zendframework/zend-feed": "^2.12.0"
@@ -1289,10 +1299,12 @@
"laminas/laminas-coding-standard": "~1.0.0",
"laminas/laminas-db": "^2.8.2",
"laminas/laminas-http": "^2.7",
- "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+ "laminas/laminas-servicemanager": "^3.3",
"laminas/laminas-validator": "^2.10.1",
- "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20",
- "psr/http-message": "^1.0.1"
+ "phpunit/phpunit": "^9.3",
+ "psalm/plugin-phpunit": "^0.13.0",
+ "psr/http-message": "^1.0.1",
+ "vimeo/psalm": "^4.1"
},
"suggest": {
"laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
@@ -1303,12 +1315,6 @@
"psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.12.x-dev",
- "dev-develop": "2.13.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Laminas\\Feed\\": "src/"
@@ -1338,7 +1344,7 @@
"type": "community_bridge"
}
],
- "time": "2020-08-18T13:45:04+00:00"
+ "time": "2020-11-18T21:02:52+00:00"
},
{
"name": "laminas/laminas-stdlib",
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index f818987ea489..d089a1c78ae3 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -17,9 +17,9 @@
"guzzlehttp/guzzle": "6.5.5",
"guzzlehttp/promises": "1.4.0",
"guzzlehttp/psr7": "1.7.0",
- "laminas/laminas-diactoros": "2.4.1",
- "laminas/laminas-escaper": "2.6.1",
- "laminas/laminas-feed": "2.12.3",
+ "laminas/laminas-diactoros": "2.5.0",
+ "laminas/laminas-escaper": "2.7.0",
+ "laminas/laminas-feed": "2.13.0",
"laminas/laminas-stdlib": "3.3.0",
"laminas/laminas-zendframework-bridge": "1.1.1",
"masterminds/html5": "2.7.4",
--
GitLab