From b5bd1e69b5ce8cbaf2eb2601d9bf6229f95e5938 Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Fri, 6 Nov 2020 12:37:54 +1300
Subject: [PATCH] MNT Fix travis matrix

---
 .travis.yml | 12 +++++++-----
 behat.yml   |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b18e5a..390581c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,17 +17,17 @@ env:
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=PGSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
+      env: DB=PGSQL INSTALLER_VERSION=~4.4.0@dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev BEHAT_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev BEHAT_TEST=1
     - php: 7.2
-      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev PHPUNIT_TEST=1
     - php: 7.2
       env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1
     - php: 7.3
-      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev PHPUNIT_TEST=1
 
 before_script:
   # Extra $PATH
@@ -37,6 +37,8 @@ before_script:
   - phpenv rehash
   - phpenv config-rm xdebug.ini
   - echo 'memory_limit=3G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  # install $COMPOSER_VERSION if defined, otherwise use Composer v1 with PHP <= 7.3, Composer v2 for >= 7.3
+  - if [ $COMPOSER_VERSION ] ; then composer self-update --$COMPOSER_VERSION ; elif [ $(php -r 'echo (int) version_compare(phpversion(), "7.3.0", "<=");') = "1" ] ; then composer self-update --1; else composer self-update --2; fi
 
   # Install composer
   - composer validate
diff --git a/behat.yml b/behat.yml
index 38e7b19..0cc5f06 100644
--- a/behat.yml
+++ b/behat.yml
@@ -2,7 +2,7 @@ default:
   suites:
     subsites:
       paths:
-        - %paths.modules.subsites%/tests/behat/features
+        - '%paths.modules.subsites%/tests/behat/features'
       contexts:
         - SilverStripe\Framework\Tests\Behaviour\FeatureContext
         - SilverStripe\Framework\Tests\Behaviour\CmsFormsContext
@@ -13,7 +13,7 @@ default:
         - SilverStripe\CMS\Tests\Behaviour\ThemeContext
         - SilverStripe\CMS\Tests\Behaviour\FixtureContext:
             # Note: double indent for args is intentional
-            - %paths.modules.subsites%/tests/behat/features/files/
+            - '%paths.modules.subsites%/tests/behat/features/files/'
 
   extensions:
     SilverStripe\BehatExtension\MinkExtension:
@@ -25,5 +25,5 @@ default:
       browser_name: chrome
 
     SilverStripe\BehatExtension\Extension:
-      screenshot_path: %paths.base%/artifacts/screenshots
+      screenshot_path: '%paths.base%/artifacts/screenshots'
       bootstrap_file: "vendor/silverstripe/cms/tests/behat/serve-bootstrap.php"