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

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

diff --git a/.travis.yml b/.travis.yml
index e7773f0..852b5a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,34 @@
 language: php
-dist: trusty
+
+dist: xenial
+
+services:
+  - mysql
+  - postgresql
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
-    - php: 7.0
-      env: DB=PGSQL INSTALLER_VERSION=4.2.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL INSTALLER_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 INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
     - php: 7.3
-      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
-    - php: 7.3
-      env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
 
 before_script:
   - phpenv rehash
   - phpenv config-rm xdebug.ini
   - composer validate
-  - composer require silverstripe/installer:"$INSTALLER_VERSION" ezyang/htmlpurifier:* --no-update
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi
-  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
+  - composer require silverstripe/installer:^4 ezyang/htmlpurifier:* --no-update
+  - 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 [[ $PHPCS_TEST ]]; then vendor/bin/phpcs 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
 
 after_success:
   - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
diff --git a/composer.json b/composer.json
index 08e7aae..773a537 100644
--- a/composer.json
+++ b/composer.json
@@ -25,9 +25,6 @@
         "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        },
         "expose": [
             "css",
             "javascript",