Merge c42c785 into 99f1182

laravel-doctrine · Feb 27, 2018 · f4ad96f · f4ad96f
2 parents 99f1182 + c42c785
commit f4ad96f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 before_script:
   - travis_retry composer self-update

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
   ],
   "require": {
     "php": ">=5.5.0",
-    "doctrine/orm": "2.5.*",
+    "doctrine/orm": "2.5.*|2.6.*",
     "doctrine/inflector": "^1.1"
   },
   "require-dev": {