From 0b74576c00847d0f76236a4e6a25d183d652401c Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Thu, 21 Nov 2019 14:08:29 +1300
Subject: [PATCH] Update branch alias and travis

---
 .travis.yml   | 9 ++++-----
 composer.json | 3 +++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ebb86ce4..8f18fcd33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ addons:
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION=4.5.x-dev
+    - COMPOSER_ROOT_VERSION=4.6.x-dev
 
 matrix:
   fast_finish: true
@@ -69,10 +69,10 @@ before_script:
 # Install composer dependencies
   - composer validate
   - mkdir ./public
-  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.2.x-dev --no-update; fi
+  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.4.x-dev --no-update; fi
   - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.2.x-dev --no-update; fi
-  - composer require silverstripe/recipe-testing:^1 silverstripe/recipe-core:4.5.x-dev silverstripe/admin:1.5.x-dev silverstripe/versioned:1.5.x-dev --no-update
-  - if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.5.x-dev --no-update; fi
+  - composer require silverstripe/recipe-testing:^1 silverstripe/recipe-core:4.6.x-dev silverstripe/admin:1.6.x-dev silverstripe/versioned:1.6.x-dev --no-update
+  - if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.6.x-dev --no-update; fi
   - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
   - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
@@ -89,4 +89,3 @@ script:
 
 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 24a5a8e4f..57983eec6 100644
--- a/composer.json
+++ b/composer.json
@@ -61,6 +61,9 @@
         "psr/container-implementation": "1.0.0"
     },
     "extra": {
+        "branch-alias": {
+            "4.x-dev": "4.6.x-dev"
+        },
         "expose": [
             "client/images",
             "client/styles"