From 3720bd7d4a4bfe47d413b4bc0262fd3523e900f1 Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Fri, 9 Dec 2016 08:42:18 +0800
Subject: [PATCH 1/2] MDL-57328 core: Run tests with php 7.1

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

diff --git a/.travis.yml b/.travis.yml
index a0d38454f77..6140fe30a14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ language: php
 
 php:
     # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
-    - 7.0
+    - 7.1
     - 5.6
 
 services:
@@ -23,7 +23,7 @@ env:
     # Although we want to run these jobs and see failures as quickly as possible, we also want to get the slowest job to
     # start first so that the total run time is not too high.
     #
-    # We only run MySQL on PHP 7.0, so run that first.
+    # We only run MySQL on PHP 7.1, so run that first.
     # CI Tests should be second-highest in priority as these only take <= 60 seconds to run under normal circumstances.
     # Postgres is significantly is pretty reasonable in its run-time.
 
@@ -47,22 +47,22 @@ matrix:
 
     include:
           # Run grunt/npm install on lowest supported npm version
-        - php: 7
+        - php: 7.1
           env: DB=none     TASK=GRUNT   NVM_VERSION='4'
           # Run grunt/npm install on highest version ('node' is an alias for the latest node.js version.)
-        - php: 7
+        - php: 7.1
           env: DB=none     TASK=GRUNT   NVM_VERSION='node'
 
     exclude:
         # MySQL - it's just too slow.
-        # Exclude it on all versions except for 7.0
+        # Exclude it on all versions except for 7.1
 
         - env: DB=mysqli   TASK=PHPUNIT
           php: 5.6
 
         # Moodle 2.7 is not compatible with PHP 7 for the upgrade test.
         - env: DB=pgsql    TASK=UPGRADE
-          php: 7.0
+          php: 7.1
 
 cache:
     directories:

From 189d6ea896d941d8b66b00c49d6aba32f73b18bd Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Fri, 9 Dec 2016 10:20:28 +0800
Subject: [PATCH 2/2] MDL-57328 core: Remove xdebug extension, so test run
 faster

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6140fe30a14..818381ed40f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,9 +70,6 @@ cache:
       - $HOME/.npm
 
 install:
-    # Disable xdebug. We aren't generating code coverage, and it has a huge impact upon test performance.
-    - rm /home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
-
     - >
         if [ "$TASK" = 'PHPUNIT' ];
         then
@@ -99,6 +96,7 @@ install:
         fi
 
 before_script:
+    - phpenv config-rm xdebug.ini
     - >
       if [ "$TASK" = 'PHPUNIT' -o "$TASK" = 'UPGRADE' ];
       then