From 80f1e98c7ff65da999ea5e2b13d71a9c2db190a0 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Tue, 7 Jul 2020 16:01:57 +1200
Subject: [PATCH] Update travis, linting

---
 .travis.yml              | 48 +++++++++++++++++++++++++---------------
 src/IFramePage.php       |  1 +
 tests/IFramePageTest.php |  1 +
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 93655bf..d6cdbe0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,52 @@
 language: php
 
-dist: trusty
+dist: xenial
 
-env:
-  global:
-    - COMPOSER_ROOT_VERSION=2.0.x-dev
+services:
+  - mysql
+  - postgresql
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
 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=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
     - php: 7.1
-      env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1 PDO=1
     - php: 7.2
-      env: DB=PGSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1
+      env: DB=PGSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
     - php: 7.3
-      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=4.5.x-dev PHPUNIT_TEST=1
+    - php: 7.4
+      env: DB=MYSQL INSTALLER_VERSION=4.6.x-dev PHPUNIT_TEST=1
+    - php: 7.4
+      env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1
 
 before_script:
+  # Extra $PATH
+  - export PATH=~/.composer/vendor/bin:$PATH
+
   # Init PHP
   - phpenv rehash
-  - phpenv config-rm xdebug.ini
-  - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - phpenv config-rm xdebug.ini || true
+  - echo 'memory_limit = 4G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - echo 'always_populate_raw_post_data = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
-  # Install composer dependencies
+  # Install composer requirements
+  # sminnee/phpunit-mock-objects is a fix for running phpunit 5 on php 7.4+
   - composer validate
-  - composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION"
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi
+  - composer require --no-update silverstripe/installer:$INSTALLER_VERSION sminnee/phpunit-mock-objects:^3 silverstripe/recipe-testing:^1
+  - 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:
-  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
+  # Run tests
+  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs -s src tests *.php; 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 [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests; fi
 
 after_success:
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml -F php; fi
diff --git a/src/IFramePage.php b/src/IFramePage.php
index b8ed365..bd11733 100644
--- a/src/IFramePage.php
+++ b/src/IFramePage.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace SilverStripe\IFrame;
 
 use Page;
diff --git a/tests/IFramePageTest.php b/tests/IFramePageTest.php
index fbe0ed7..1d0c461 100644
--- a/tests/IFramePageTest.php
+++ b/tests/IFramePageTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace SilverStripe\IFrame\Tests;
 
 use SilverStripe\Core\Config\Config;