Merge branch '1.0' into 1.1

* 1.0: Use PHPUnit ^6.5
Sylius · Mar 16, 2018 · b426c8b · b426c8b
2 parents 1fab707 + f8a6fd4
commit b426c8b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "lakion/mink-debug-extension": "^1.2.3",
         "phpspec/phpspec": "^3.2",
         "phpstan/phpstan-shim": "^0.9.2",
-        "phpunit/phpunit": "^5.6",
+        "phpunit/phpunit": "^6.5",
         "se/selenium-server-standalone": "^2.52",
         "sylius-labs/coding-standard": "^1.0",
         "symplify/easy-coding-standard": "^2.4"