From 11a66f02281c6c0e8f4d3b08bc420d1de302dd11 Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Mon, 4 Nov 2019 13:29:07 +1300
Subject: [PATCH] Travis config update, remove branch aliases

---
 .travis.yml   | 36 ++++++++++++++++++++++++------------
 composer.json |  3 ---
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d7642da..d1f52ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,51 @@
 language: php
 
-dist: trusty
+dist: xenial
+
+services:
+  - mysql
+  - postgresql
+  - xvfb
+
+addons:
+  apt:
+    packages:
+      - tidy
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION=2.0.x-dev
-    - TRAVIS_NODE_VERSION="6"
+    - COMPOSER_ROOT_VERSION=2.x-dev
+    - TRAVIS_NODE_VERSION="10"
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
-    - php: 7.0
+    - php: 7.1
+      env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.1
       env: DB=PGSQL PHPUNIT_TEST=1
-    - php: 7.1
+    - php: 7.2
       env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
-    - php: 7.1
-      env: DB=MYSQL NPM_TEST=1
+    - php: 7.3
+      env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.3
+      env: DB=MYSQL PHPCS_TEST=1 NPM_TEST=1
 
 before_script:
   - phpenv rehash
   - phpenv config-rm xdebug.ini
 
   - composer validate
-  - composer require --no-update silverstripe/recipe-cms:4.3.x-dev silverstripe/admin:1.3.x-dev
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi
+  - composer require --no-update silverstripe/recipe-cms:^4 silverstripe/admin:^1
+  - 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
 
   # Install NPM dependencies
   - if [[ $NPM_TEST ]]; then nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION && npm install -g yarn && yarn install --network-concurrency 1 && (cd vendor/silverstripe/admin && yarn install --network-concurrency 1) && yarn run build; fi
 
 script:
+  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist src/ tests/ *.php; fi
   - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
   - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
-  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ *.php; fi
   - if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi
   - if [[ $NPM_TEST ]]; then git diff --name-status --relative=client; fi
   - if [[ $NPM_TEST ]]; then yarn run test; fi
diff --git a/composer.json b/composer.json
index 7802dfa..e38de55 100644
--- a/composer.json
+++ b/composer.json
@@ -33,9 +33,6 @@
         }
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        },
         "expose": [
             "client/dist"
         ]