From 665f13366e2b3ef3e795596672a630fbc2958a11 Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Fri, 6 Nov 2020 08:57:55 +1300
Subject: [PATCH 1/2] MNT Shared travis configs

---
 .travis.yml    | 43 +++++++++++--------------------------------
 phpcs.xml.dist |  3 +++
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2138189..738520d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,19 @@
-language: php
+# https://docs.travis-ci.com/user/build-config-imports/
+version: ~> 1.0
 
-dist: trusty
+import:
+  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs.yml
 
 env:
   global:
     - COMPOSER_ROOT_VERSION="3.7.x-dev"
+    - REQUIRE_EXTRA="symbiote/silverstripe-queuedjobs:^4.0"
 
-matrix:
+jobs:
   include:
-    - php: 7.1
-      env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
-    - php: 7.1
-      env: DB=PGSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1
-    - php: 7.2
-      env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1
     - php: 7.3
-      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 SUBSITES=1
-    - php: 7.3
-      env: DB=MYSQL INSTALLER_VERSION=4.6.x-dev PHPUNIT_TEST=1
-
-before_script:
-  - phpenv rehash
-  - phpenv config-rm xdebug.ini
-  - echo 'memory_limit=2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-
-  - composer validate
-  - composer require symbiote/silverstripe-queuedjobs:^4.0 --no-update
-  - if [[ $SUBSITES ]]; then composer require silverstripe/subsites:2.3.x-dev --no-update; fi
-  - if [[ $DB == "PGSQL" ]]; then composer require silverstripe/postgresql:2.3.x-dev --no-update; fi
-  - composer require silverstripe/installer "$INSTALLER_VERSION" --no-update
-  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
-
-script:
-  - 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; fi
-
-after_success:
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
+      env:  # SUBSITES
+        - DB=MYSQL
+        - REQUIRE_INSTALLER=4.x-dev
+        - PHPUNIT_TEST=1
+        - REQUIRE_EXTRA="symbiote/silverstripe-queuedjobs:^4.0 silverstripe/subsites:2.3.x-dev"
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index d413415..048657c 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 -->

From 8465c448259b3483b64bd8312c59147d66bbb08c Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Fri, 6 Nov 2020 10:13:19 +1300
Subject: [PATCH 2/2] DEP use sminnee/phpunit fork

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

diff --git a/.travis.yml b/.travis.yml
index 738520d..3037b52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
-# https://docs.travis-ci.com/user/build-config-imports/
 version: ~> 1.0
 
 import:
-  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs.yml
+  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
 
 env:
   global:
diff --git a/composer.json b/composer.json
index 2d21742..2f2dc18 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
     },
     "require-dev": {
         "silverstripe/cms": "^4.0",
-        "phpunit/phpunit": "^5.7",
+        "sminnee/phpunit": "^5.7",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "autoload": {