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

---
 .travis.yml   | 29 ++++++++++++++++++++---------
 composer.json |  9 ++-------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9feef33..358dae2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,38 @@
 language: php
 
+dist: xenial
+
+services:
+  - mysql
+  - postgresql
+
+addons:
+  apt:
+    packages:
+      - tidy
+
 env:
   global:
-    - COMPOSER_ROOT_VERSION="2.0.x-dev"
+    - COMPOSER_ROOT_VERSION="2.x-dev"
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
-    - php: 7.0
-      env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.1
+      env: DB=PGSQL PHPUNIT_TEST=1
     - php: 7.2
-      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
+    - php: 7.3
+      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
 
 before_script:
   - phpenv rehash
   - phpenv config-rm xdebug.ini
 
   - composer validate
-  - composer require --no-update silverstripe/recipe-core:"$RECIPE_VERSION"
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi
+  - composer require --no-update silverstripe/recipe-core:^4
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:
diff --git a/composer.json b/composer.json
index 7e565a4..83db1aa 100644
--- a/composer.json
+++ b/composer.json
@@ -15,19 +15,14 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "^4.0",
-        "silverstripe/versioned": "^1.0",
+        "silverstripe/framework": "^4",
+        "silverstripe/versioned": "^1",
         "guzzlehttp/guzzle": "^6.3.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
         "squizlabs/php_codesniffer": "^3.0"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.2.x-dev"
-        }
-    },
     "autoload": {
         "psr-4": {
             "SilverStripe\\EnvironmentCheck\\": "src/",