Merge d430d52 into f2e88d2

overblog · Jan 23, 2021 · 124152f · 124152f
2 parents f2e88d2 + d430d52
commit 124152f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: php
 
-dist: trusty
+dist: bionic
 sudo: false
 
 git:
@@ -24,6 +24,8 @@ matrix:
           env: SYMFONY_VERSION=4.4.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
         - php: 7.4snapshot
           env: SYMFONY_VERSION=5.0.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
+        - php: 8.0
+          env: SYMFONY_VERSION=5.0.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
         - php: nightly
           env: COMPOSER_UPDATE_FLAGS=--ignore-platform-reqs
     allow_failures:

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     },
     "require": {
         "php": ">=7.2",
-        "overblog/dataloader-php": "^0.5.0",
+        "overblog/dataloader-php": "^0.5.0 || ^0.6.0",
         "symfony/dependency-injection": "^4.3 || ^5.0"
     },
     "require-dev": {