From 6fb6e5f71ca74d8cad62b4e5816f9ef30192a954 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Mon, 24 Jun 2019 07:38:41 +0800
Subject: [PATCH] Improve Travis CI build process (#4394)

---
 .travis.yml                           | 35 ++++++++++++++++++++++++---
 composer.json                         |  6 +++--
 modules/backend/controllers/Index.php |  4 ++-
 phpcs.xml                             | 16 ++++++++++++
 phpunit.xml                           | 19 ++++++++++++++-
 5 files changed, 73 insertions(+), 7 deletions(-)
 create mode 100644 phpcs.xml

diff --git a/.travis.yml b/.travis.yml
index bac7f1100..d1184faba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,39 @@ matrix:
 
 sudo: false
 
+if: type = pull_request OR (type = push AND (branch = develop OR branch = master))
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
 install:
-  - composer self-update
-  - travis_retry composer install --no-interaction --prefer-source
+  - travis_retry composer install --no-interaction --no-progress --no-suggest
 
 before_script: git reset --hard HEAD
 
-script: vendor/bin/phpunit
+stages:
+  - test
+  - code quality
+  - code coverage
+
+script:
+  - ./vendor/bin/parallel-lint --exclude vendor --exclude storage --exclude tests/fixtures/plugins/testvendor/goto/Plugin.php .
+  - ./vendor/bin/phpunit
+
+jobs:
+  include:
+    - stage: code coverage
+      if: type = push AND (branch = develop OR branch = master)
+      php: 7.1
+      script:
+        - ./vendor/bin/phpunit --testsuite "October CMS Test Suite" --coverage-clover=coverage.xml
+        - bash <(curl -s https://codecov.io/bash)
+    - stage: code quality
+      if: type = pull_request
+      php: 7.1
+      script: ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git diff-tree --no-commit-id --name-only -r ${TRAVIS_COMMIT_RANGE/.../..})
+    - stage: code quality
+      if: type = push AND (branch = develop OR branch = master)
+      php: 7.1
+      script: ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git diff-tree --no-commit-id --name-only -r $TRAVIS_COMMIT)
diff --git a/composer.json b/composer.json
index 39af52963..dc03babb0 100644
--- a/composer.json
+++ b/composer.json
@@ -42,9 +42,11 @@
     },
     "require-dev": {
         "fzaninotto/faker": "~1.7",
-        "phpunit/phpunit": "~5.7",
+        "phpunit/phpunit": "~6.5",
         "phpunit/phpunit-selenium": "~1.2",
-        "meyfa/phpunit-assert-gd": "1.1.0"
+        "meyfa/phpunit-assert-gd": "1.1.0",
+        "squizlabs/php_codesniffer": "3.*",
+        "jakub-onderka/php-parallel-lint": "^1.0"
     },
     "autoload-dev": {
         "classmap": [
diff --git a/modules/backend/controllers/Index.php b/modules/backend/controllers/Index.php
index 28f7289c1..75a18eb3a 100644
--- a/modules/backend/controllers/Index.php
+++ b/modules/backend/controllers/Index.php
@@ -71,7 +71,9 @@ class Index extends Controller
     protected function checkPermissionRedirect()
     {
         if (!$this->user->hasAccess('backend.access_dashboard')) {
-            $true = function () { return true; };
+            $true = function () {
+                return true;
+            };
             if ($first = array_first(BackendMenu::listMainMenuItems(), $true)) {
                 return Redirect::intended($first->url);
             }
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000000000..3ffeebc67
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset name="October CMS">
+    <description>The coding standard for October CMS.</description>
+    <rule ref="PSR2">
+        <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
+    </rule>
+
+    <file>bootstrap/</file>
+    <file>config/</file>
+    <file>modules/</file>
+    <file>tests</file>
+
+    <exclude-pattern>vendor/</exclude-pattern>
+    <exclude-pattern>storage/</exclude-pattern>
+    <exclude-pattern>plugins/</exclude-pattern>
+</ruleset>
diff --git a/phpunit.xml b/phpunit.xml
index d75f4e0df..08cd19d58 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -18,9 +18,26 @@
             <directory>./vendor/october/rain/tests</directory>
         </testsuite>
     </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./modules/</directory>
+
+            <exclude>
+                <file>./modules/backend/routes.php</file>
+                <file>./modules/cms/routes.php</file>
+                <file>./modules/system/routes.php</file>
+
+                <directory suffix=".php">./modules/backend/database</directory>
+                <directory suffix=".php">./modules/cms/database</directory>
+                <directory suffix=".php">./modules/system/database</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+
     <php>
         <env name="APP_ENV" value="testing" />
         <env name="CACHE_DRIVER" value="array" />
         <env name="SESSION_DRIVER" value="array" />
     </php>
-</phpunit>
\ No newline at end of file
+</phpunit>