From a0ff3ec9e173f8b259a8dff0d8194ea40ab6bc99 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 24 Feb 2020 09:41:46 +0100
Subject: v1.7.0 from Fedora

---
 composer.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index b6002ef..34350b2 100644
--- a/composer.json
+++ b/composer.json
@@ -18,13 +18,10 @@
         "symfony/polyfill-ctype": "^1.8"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.6",
-        "sebastian/version": "^1.0.1"
+        "phpunit/phpunit": "^4.8.36 || ^7.5.13"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3-dev"
-        }
+    "conflict": {
+        "vimeo/psalm": "<3.6.0"
     },
     "autoload": {
         "psr-4": {
-- 
cgit