Merge branch 'qa/326' into develop

Forward port #326
zfcampus · Nov 28, 2019 · 01bae70 · 01bae70
2 parents debdbb6 + f5d7b0e
commit 01bae70
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 77 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -45,6 +45,7 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - LEGACY_DEPS="symfony/console symfony/yaml"
         - CS_CHECK=true
         - TEST_COVERAGE=true
     - php: 7.1

diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "doctrine/doctrine-orm-module": "^1.1 || ^2.1.3",
         "doctrine/mongodb-odm": "^1.0",
         "phpunit/phpunit": "^5.7.27 || ^6.5.13 || ^7.5.2",
-        "symfony/yaml": "^2.3 || ^3.0 || ^4.0",
+        "symfony/yaml": "^2.3 || ^3.0 || ^4.0 || ^5.0",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-form": "^2.9.2",
         "zendframework/zend-i18n": "^2.7.3",