Merge branch '2.0' into 2.1

Author: yukoff

.travis.yml

@@ -11,7 +11,7 @@ cache:
 before_script:
   - composer self-update
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/config:${SYMFONY_VERSION} symfony/dependency-injection:${SYMFONY_VERSION} symfony/event-dispatcher:${SYMFONY_VERSION} symfony/http-kernel:${SYMFONY_VERSION} symfony/framework-bundle:${SYMFONY_VERSION}; fi;
-  - if [ "SYMFONY_EVENT_DISPATCHER_VERSION" != "" ]; then composer require --no-update symfony/event-dispatcher:${SYMFONY_EVENT_DISPATCHER_VERSION}; fi;
+  - if [ "$SYMFONY_EVENT_DISPATCHER_VERSION" != "" ]; then composer require --no-update symfony/event-dispatcher:${SYMFONY_EVENT_DISPATCHER_VERSION}; fi;
   - composer install --no-interaction --prefer-source --dev
 
 script: phpunit --verbose

composer.json

@@ -23,7 +23,7 @@
         "twig/twig": "^1.11|^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.0,<5.4",
+        "phpunit/phpunit": "^4.8||^5.0,<5.4",
         "symfony/framework-bundle": ">=2.7,<4"
     },
     "autoload": {