Updated composer requirements for Sulu 2.0

.travis.yml

@@ -1,22 +1,34 @@
 sudo: false
+dist: trusty
 
 language: php
 
 cache:
   directories:
-    - $HOME/.composer/cache
-    - downloads
+    - "$HOME/.composer/cache/files"
 
 matrix:
   include:
     - php: 5.5
-    - php: 7.0
+      env:
+        - ENABLE_SWAP=true
+    - php: 7.3
 
-before_script:
+before_install:
+  - | # enable swap
+    if [[ $ENABLE_SWAP == 'true' ]]; then
+        sudo fallocate -l 4G /swapfile
+        sudo chmod 600 /swapfile
+        sudo mkswap /swapfile
+        sudo swapon /swapfile
+        sudo sysctl vm.swappiness=10
+    fi
   - echo "memory_limit=4096M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+before_script:
   - phpenv config-rm xdebug.ini
   - composer self-update
-  - composer install  --prefer-dist --no-interaction
+  - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --prefer-dist --no-interaction
 
 script:
   - vendor/bin/phpunit

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG for Sulu
 ==================
 
+* 1.4.0-RC1
+    * ENHANCEMENT #- Updated composer requirement for sulu 2.0
+
+* 1.3.2
+    * ENHANCEMENT #- Add conflict for liip/theme-bundle
+
 * 1.3.1
     * ENHANCEMENT #- Updated sulu requirement
 

composer.json

@@ -13,7 +13,7 @@
     "require": {
         "php": "~5.5 || ~7.0",
         "liip/theme-bundle": "~1.4",
-        "sulu/sulu": "^1.5"
+        "sulu/sulu": "^1.5 || ^2.0 || dev-develop"
     },
     "require-dev": {
         "jackalope/jackalope-jackrabbit": "~1.2",