From dca5b114674c6b87cfc03639432158547590eddc Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Tue, 1 Dec 2020 15:44:11 +1300
Subject: [PATCH] MNT Travis shared config, use sminnee/phpunit

---
 .travis.yml    | 51 +++-----------------------------------------------
 composer.json  |  2 +-
 package.json   |  3 ++-
 phpcs.xml.dist |  3 +++
 4 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 70ddf8c..785d9ea 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,49 +1,4 @@
-language: php
+version: ~> 1.0
 
-dist: xenial
-
-services:
-  - mysql
-  - postgresql
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-matrix:
-  include:
-    - php: 5.6
-      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
-    - php: 7.1
-      env: DB=MYSQL INSTALLER_VERSION=4.5.x-dev PHPUNIT_COVERAGE_TEST=1
-    - php: 7.2
-      env: DB=PGSQL INSTALLER_VERSION=4.6.x-dev PHPUNIT_TEST=1 NPM_TEST=1
-    - php: 7.3
-      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:
-# Init PHP
-  - phpenv rehash
-  - phpenv config-rm xdebug.ini
-  - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-
-# Install composer dependencies
-  - composer validate
-  - composer require --no-update silverstripe/installer:$INSTALLER_VERSION silverstripe/widgets:^2
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
-  # Fix for running phpunit 5 on php 7.4+
-  - composer require --no-update sminnee/phpunit-mock-objects:^3
-  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
-  - if [[ $NPM_TEST ]]; then nvm install && nvm use && npm install -g yarn && yarn install --network-concurrency 1 && (cd vendor/silverstripe/admin && yarn install --network-concurrency 1) && yarn run build; fi
-
-script:
-  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests/; fi
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml tests/; fi
-  - if [[ $PHPCS_TEST ]]; then composer run-script lint; fi
-  - if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi
-  - if [[ $NPM_TEST ]]; then git diff --name-status --relative=client; fi
-
-after_success:
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
+import:
+  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-npm.yml
diff --git a/composer.json b/composer.json
index ff36aa5..4990dd2 100755
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "silverstripe/asset-admin": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "sminnee/phpunit": "^5.7",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
diff --git a/package.json b/package.json
index cb235e0..6cd7787 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "lint": "yarn lint-js && yarn lint-sass",
     "lint-js": "eslint client/src",
     "lint-js-fix": "eslint client/src --fix",
-    "lint-sass": "sass-lint client/src"
+    "lint-sass": "sass-lint client/src",
+    "test": "true"
   },
   "repository": {
     "type": "git",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index f588513..71b0f22 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -2,6 +2,9 @@
 <ruleset name="SilverStripe">
     <description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
 
+    <file>src</file>
+    <file>tests</file>
+
     <!-- base rules are PSR-2 -->
     <rule ref="PSR2" >
         <!-- Current exclusions -->