merge

Author: eugene-matvejev

composer.json

@@ -35,6 +35,6 @@
     },
     "require-dev": {
         "composer/composer": "^1.1",
-        "phpunit/phpunit": "^5.3"
+        "phpunit/phpunit": "^4.8 || ^5.3"
     }
 }