diff --git a/composer.json b/composer.json
index 0dd9ea5..53ca42b 100644
--- a/composer.json
+++ b/composer.json
@@ -24,12 +24,13 @@
         "psr-4": { "ArrayQuery\\Tests\\": "tests/" }
     },
     "require": {
-        "php": "^5.6|^7.0",
+        "php": "^5.6 || ^7.0",
         "doctrine/annotations": "1.2.*",
         "doctrine/instantiator": "1.0.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "~5.7",
+        "friendsofphp/php-cs-fixer": "^2.3",
         "satooshi/php-coveralls": "dev-master"
     }
 }