From 5a8a6069f98de3d52376af0cea123182ee4f6c05 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 20 Oct 2020 08:05:09 +0200
Subject: update to 1.2.1 re-add dependency on phpunitgoodpractices/polyfill

---
 composer.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index b0b86d4..005ecff 100644
--- a/composer.json
+++ b/composer.json
@@ -16,10 +16,8 @@
         "php": "^5.5 || ^7.0 || ^8.0",
         "ext-dom": "*",
         "ext-libxml": "*",
-        "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0 || ^8.0 || ^9.0"
-    },
-    "conflict": {
-        "hhvm": "*"
+        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.0 || ^9.0",
+        "phpunitgoodpractices/polyfill": "^1.4"
     },
     "require-dev": {
         "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
-- 
cgit