From d09df080ae8bd7b492c2299382eb5690dc3ef633 Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Tue, 5 Nov 2019 14:17:50 +1300
Subject: [PATCH] Travis config update, remove branch aliases

---
 .travis.yml   | 24 ++++++++++++++++--------
 composer.json |  5 +----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0d0a49f..bef51e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,24 @@
 language: php
 
+dist: xenial
+
+services:
+  - mysql
+  - postgresql
+
 env:
   global:
-    - COMPOSER_ROOT_VERSION="4.0.x-dev"
+    - COMPOSER_ROOT_VERSION="4.x-dev"
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
-    - php: 7.0
-      env: DB=PGSQL PHPUNIT_TEST=1
     - php: 7.1
+      env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.1
+      env: DB=PGSQL PHPUNIT_TEST=1
+    - php: 7.2
+      env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
+    - php: 7.3
       env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
 
 before_script:
@@ -18,9 +26,9 @@ before_script:
   - phpenv config-rm xdebug.ini
 
   - composer validate
-  - composer require --no-update silverstripe/recipe-cms:1.0.x-dev silverstripe/userforms:5.0.x-dev
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi
-  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
+  - composer require --no-update silverstripe/recipe-cms:^4 silverstripe/userforms:^5
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
+  - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:
   - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
diff --git a/composer.json b/composer.json
index 65dc733..8c4f600 100644
--- a/composer.json
+++ b/composer.json
@@ -21,10 +21,7 @@
     "extra": {
         "expose": [
             "images"
-        ],
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        }
+        ]
     },
     "autoload": {
         "psr-4": {