Merge pull request #52 from SpacePossum/master_conflicts

composer.json - add missing conflict with PHPUnit below 6
GeckoPackages · Jan 24, 2018 · 83550fa · 83550fa
2 parents 19fa0f0 + 4e682b1
commit 83550fa
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -8,6 +8,9 @@
     "require": {
         "php": "^7.0"
     },
+    "conflict": {
+        "phpunit/phpunit": "<6.0"
+    },
     "require-dev": {
         "phpunit/phpunit": "^6.0"
     },
@@ -28,6 +31,6 @@
     "suggest": {
         "ext-dom": "When testing with xml.",
         "ext-libxml": "When testing with xml.",
-        "phpunit/phpunit" : "This is an extension for it so make sure you have it some way."
+        "phpunit/phpunit" : "This is an extension for PHPUnit so make sure you have that in some way."
     }
 }