Merge pull request #29 from ElementareTeilchen/upgrade

Add compatability with Flow 6.0 / Neos 5.0
neos · Oct 31, 2019 · d9bc90b · d9bc90b
2 parents 2e179e7 + ca05aff
commit d9bc90b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: php
 matrix:
   include:
-    - php: 7.1
+    - php: 7.2
 sudo: false
 before_install:
-  - export NEOS_TARGET_VERSION=4.1
+  - export NEOS_TARGET_VERSION=5.0
   - cd ..
   - git clone https://github.com/neos/neos-base-distribution.git -b ${NEOS_TARGET_VERSION}
   - cd neos-base-distribution

diff --git a/composer.json b/composer.json
@@ -15,14 +15,14 @@
   "type": "neos-package",
   "license": "MIT",
   "require": {
-    "php": "^7.0",
+    "php": "^7.1",
     "ext-exif": "*",
     "ext-mbstring": "*",
 
-    "neos/flow": "^4.0 || ^5.0 || dev-master",
-    "neos/media": "^3.0 || ^4.0 || dev-master",
+    "neos/flow": "^4.0 || ^5.0 || ^6.0 || dev-master",
+    "neos/media": "^3.0 || ^4.0 || ^5.0 || dev-master",
     "neos/metadata": "^2.0 || dev-master",
-    "neos/utility-mediatypes": "^4.0 || ^5.0 || dev-master"
+    "neos/utility-mediatypes": "^4.0 || ^5.0 || ^6.0 || dev-master"
   },
   "autoload": {
     "psr-4": {