Merge pull request #55 from SpacePossum/2_0_conflict

Add conflict to composer.json
GeckoPackages · Feb 5, 2018 · a06beb8 · a06beb8
2 parents bcb43fd + 14c0607
commit a06beb8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -8,6 +8,9 @@
     "require": {
         "php": "^5.3.6 || ^7.0"
     },
+    "conflict": {
+        "phpunit/phpunit": ">=6.0"
+    },
     "require-dev": {
         "phpunit/phpunit": "^4.8.35 || ^5.4.3"
     },
@@ -23,6 +26,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."
     }
 }