diff --git a/composer.lock b/composer.lock
index 98de0ee7b85383c3d53e0463e77eff4f04a3c67a..0e69a4fb942a8f09b60ef18a92641e004abd31a3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -456,7 +456,7 @@
"dist": {
"type": "path",
"url": "core",
- "reference": "b092a4793dbb192acafca8b27ce6ab418214fb01"
+ "reference": "cef36daf34260d19cf7e32dac3b60e9bfd9b7010"
},
"require": {
"asm89/stack-cors": "^1.1",
@@ -478,7 +478,7 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"guzzlehttp/guzzle": "^6.5.2",
- "laminas/laminas-diactoros": "^1.8",
+ "laminas/laminas-diactoros": "^2.1",
"laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1",
"pear/archive_tar": "^1.4.9",
@@ -990,39 +990,48 @@
},
{
"name": "laminas/laminas-diactoros",
- "version": "1.8.7",
+ "version": "2.2.2",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-diactoros.git",
- "reference": "1c2dce9d2822030d5dcfd50b709708830429c89a"
+ "reference": "95178c4751d737cdf9ab0a9f70a42754ac860e7b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/1c2dce9d2822030d5dcfd50b709708830429c89a",
- "reference": "1c2dce9d2822030d5dcfd50b709708830429c89a",
+ "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/95178c4751d737cdf9ab0a9f70a42754ac860e7b",
+ "reference": "95178c4751d737cdf9ab0a9f70a42754ac860e7b",
"shasum": ""
},
"require": {
"laminas/laminas-zendframework-bridge": "^1.0",
- "php": "^5.6 || ^7.0",
+ "php": "^7.1",
+ "psr/http-factory": "^1.0",
"psr/http-message": "^1.0"
},
+ "conflict": {
+ "phpspec/prophecy": "<1.9.0"
+ },
"provide": {
+ "psr/http-factory-implementation": "1.0",
"psr/http-message-implementation": "1.0"
},
"replace": {
"zendframework/zend-diactoros": "self.version"
},
"require-dev": {
+ "ext-curl": "*",
"ext-dom": "*",
"ext-libxml": "*",
- "laminas/laminas-coding-standard": "~1.0",
+ "http-interop/http-factory-tests": "^0.5.0",
+ "laminas/laminas-coding-standard": "~1.0.0",
"php-http/psr7-integration-tests": "dev-master",
- "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7"
+ "phpunit/phpunit": "^7.5.18"
},
"type": "library",
"extra": {
"branch-alias": {
+ "dev-master": "2.1.x-dev",
+ "dev-develop": "2.2.x-dev",
"dev-release-1.8": "1.8.x-dev"
}
},
@@ -1061,7 +1070,7 @@
"psr",
"psr-7"
],
- "time": "2019-12-31T16:41:30+00:00"
+ "time": "2020-01-07T19:39:26+00:00"
},
{
"name": "laminas/laminas-escaper",
@@ -1231,16 +1240,16 @@
},
{
"name": "laminas/laminas-zendframework-bridge",
- "version": "1.0.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-zendframework-bridge.git",
- "reference": "32d7095e436a31b8d98e485a5c63d70df74915a8"
+ "reference": "0fb9675b84a1666ab45182b6c5b29956921e818d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/32d7095e436a31b8d98e485a5c63d70df74915a8",
- "reference": "32d7095e436a31b8d98e485a5c63d70df74915a8",
+ "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/0fb9675b84a1666ab45182b6c5b29956921e818d",
+ "reference": "0fb9675b84a1666ab45182b6c5b29956921e818d",
"shasum": ""
},
"require": {
@@ -1279,7 +1288,7 @@
"laminas",
"zf"
],
- "time": "2019-12-31T15:24:03+00:00"
+ "time": "2020-01-07T22:58:31+00:00"
},
{
"name": "masterminds/html5",
@@ -1609,6 +1618,58 @@
],
"time": "2017-02-14T16:28:37+00:00"
},
+ {
+ "name": "psr/http-factory",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-factory.git",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0.0",
+ "psr/http-message": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interfaces for PSR-7 HTTP message factories",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "psr",
+ "psr-17",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "time": "2019-04-30T12:38:16+00:00"
+ },
{
"name": "psr/http-message",
"version": "1.0.1",
@@ -4041,9 +4102,6 @@
"ext-zip": "Enabling the zip extension allows you to unzip archives",
"ext-zlib": "Allow gzip compression of HTTP requests"
},
- "bin": [
- "bin/composer"
- ],
"type": "library",
"extra": {
"branch-alias": {
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index b905a11d801abc992459b735692893be7bde2f38..5aa4be3b523c11b4e701de54845469b33263320d 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -18,17 +18,18 @@
"guzzlehttp/guzzle": "6.5.2",
"guzzlehttp/promises": "v1.3.1",
"guzzlehttp/psr7": "1.6.1",
- "laminas/laminas-diactoros": "1.8.7",
+ "laminas/laminas-diactoros": "2.2.2",
"laminas/laminas-escaper": "2.6.1",
"laminas/laminas-feed": "2.12.0",
"laminas/laminas-stdlib": "3.2.1",
- "laminas/laminas-zendframework-bridge": "1.0.0",
+ "laminas/laminas-zendframework-bridge": "1.0.1",
"masterminds/html5": "2.7.0",
"pear/archive_tar": "1.4.9",
"pear/console_getopt": "v1.4.2",
"pear/pear-core-minimal": "v1.10.9",
"pear/pear_exception": "v1.0.0",
"psr/container": "1.0.0",
+ "psr/http-factory": "1.0.1",
"psr/http-message": "1.0.1",
"psr/log": "1.1.0",
"ralouphie/getallheaders": "3.0.3",
diff --git a/core/composer.json b/core/composer.json
index 948685415dcb56287c8cb956c1bf40f8ae57148a..342aebcc7ff1d2b6c36fab3586eaf7bedeed0521 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -42,7 +42,7 @@
"egulias/email-validator": "^2.0",
"masterminds/html5": "^2.1",
"symfony/psr-http-message-bridge": "^1.2.0",
- "laminas/laminas-diactoros": "^1.8",
+ "laminas/laminas-diactoros": "^2.1",
"composer/semver": "^1.0",
"asm89/stack-cors": "^1.1",
"pear/archive_tar": "^1.4.9",