From 4c01c443dd87080afbf7c0569ac820dd321b033e Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Wed, 30 Aug 2017 22:03:58 +0100
Subject: [PATCH] [5.5] Fixed Travis (#20856)

* Upgraded mockery

* Fixed travis file
---
 .travis.yml   | 19 ++++++-------------
 composer.json |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 99e0fa566556..7d48e602f13e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,21 @@
 language: php
 
-php:
-  - 7.0.21
-  - 7.1
-  - 7.2
-
 env:
   global:
-    - setup=basic
+    - setup=stable
 
 matrix:
-  allow_failures:
-    - php: 7.2
   fast_finish: true
   include:
     - php: 7.0.21
-      env: setup=lowest
     - php: 7.0.21
-      env: setup=stable
-    - php: 7.1
       env: setup=lowest
     - php: 7.1
-      env: setup=stable
+    - php: 7.1
+      env: setup=lowest
+    - php: 7.2
+    - php: 7.2
+      env: setup=lowest
 
 sudo: false
 
@@ -40,7 +34,6 @@ before_install:
   - travis_retry composer self-update
 
 install:
-  - if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-dist --no-suggest; fi
   - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --no-suggest; fi
   - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable --no-suggest; fi
 
diff --git a/composer.json b/composer.json
index 7c19563649bf..22382fe19332 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,7 @@
         "aws/aws-sdk-php": "~3.0",
         "doctrine/dbal": "~2.5",
         "filp/whoops": "^2.1.4",
-        "mockery/mockery": "~0.9.4",
+        "mockery/mockery": "~1.0",
         "orchestra/testbench-core": "3.5.*",
         "pda/pheanstalk": "~3.0",
         "phpunit/phpunit": "~6.0",