From ccdc145b40fd4348eceeaf216e7d3f5f53fc9743 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 22 Jan 2020 16:55:03 +0100
Subject: update to 2.2.2 rename to php-laminas-diactoros2 install to
 /usr/share/php/Laminas/Diactoros2 raise dependency on PHP 7.1 add dependency
 on psr/http-factory switch to phpunit7

---
 composer.json | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index abbcd34..a1b5660 100644
--- a/composer.json
+++ b/composer.json
@@ -22,24 +22,33 @@
     },
     "extra": {
         "branch-alias": {
+            "dev-master": "2.1.x-dev",
+            "dev-develop": "2.2.x-dev",
             "dev-release-1.8": "1.8.x-dev"
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1",
         "laminas/laminas-zendframework-bridge": "^1.0",
+        "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0"
     },
     "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"
     },
     "provide": {
+        "psr/http-factory-implementation": "1.0",
         "psr/http-message-implementation": "1.0"
     },
+    "conflict": {
+        "phpspec/prophecy": "<1.9.0"
+    },
     "autoload": {
         "files": [
             "src/functions/create_uploaded_file.php",
@@ -66,11 +75,7 @@
     "autoload-dev": {
         "psr-4": {
             "LaminasTest\\Diactoros\\": "test/"
-        },
-        "files": [
-            "test/TestAsset/Functions.php",
-            "test/TestAsset/SapiResponse.php"
-        ]
+        }
     },
     "scripts": {
         "check": [
-- 
cgit