From 0478ae1b88ff522f2da020d355a16b5fce673ef7 Mon Sep 17 00:00:00 2001
From: mak001 <mak001001@gmail.com>
Date: Thu, 28 Sep 2017 10:01:31 -0500
Subject: [PATCH] Updated the travis.yml   - Removes xdebug config   -
 scrutinizer no longer relies on codecov submission to submit

---
 .travis.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fe44bb..12c6d7e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,13 +58,16 @@ matrix:
         - LANG=JS
         - LINT=1
 
-
+  # Only because sqlite module doesn't seem to work for 4
   allow_failures:
     - php: 7.0
       env: DB=SQLITE
 
 before_script:
-  # only install composer stuff if PHP
+  # Removes xdebug (speeds up php tests, coverage is done with phpdbg instead)
+  phpenv config-rm xdebug.ini
+
+  # Only install composer stuff if PHP
   - |
     if [[ $LANG == PHP ]]; then
       phpenv rehash
@@ -74,19 +77,19 @@ before_script:
       composer update --no-suggest --prefer-dist
     fi
 
-  #we need an extra package if it is PGSQL
+  # Needs an extra package if it is PGSQL
   - |
     if [[ $DB == PGSQL ]]; then
       composer require silverstripe/postgresql 2.0.x-dev
     fi
 
-  #we need an extra package if it is SQLITE
+  # Needs an extra package if it is SQLITE
   - |
     if [[ $DB == SQLITE ]]; then
       composer require silverstripe/sqlite3 2.1.x-dev
     fi
 
-#Execute tests with or without coverage
+# Execute tests with or without coverage
 script:
   # php without coverage and without linting
   - |
@@ -100,6 +103,7 @@ script:
       phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml && wget https://scrutinizer-ci.com/ocular.phar;
     fi
 
+  # php with linting
   - |
     if [[ $LANG == PHP ]] && [[ $LINT == 1 ]]; then
       composer run-script lint
@@ -117,6 +121,7 @@ script:
       npm run test:coverage;
     fi
 
+  # javascript with linting
   - |
     if [[ $LANG == JS ]] && [[ $LINT == 1 ]]; then
       npm run lint
@@ -128,7 +133,8 @@ after_success:
   # php with coverage
   - |
     if [[ $LANG == PHP ]] && [[ $COVERAGE == 1 ]]; then
-      bash <(curl -s https://codecov.io/bash) -f coverage.xml -t $CODECOV_TOKEN && travis_retry php ocular.phar code-coverage:upload --format=php-clover --access-token=$SCRUT_TOKEN coverage.xml;
+      bash <(curl -s https://codecov.io/bash) -f coverage.xml -t $CODECOV_TOKEN -F php
+      travis_retry php ocular.phar code-coverage:upload --format=php-clover --access-token=$SCRUT_TOKEN coverage.xml;
     fi
 
   #javascript with coverage