From e8b9d6f24bbe41ac529b998e761e45c47506885f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Wed, 3 Jul 2019 14:02:58 +0200
Subject: [PATCH] Revert travis changes & add a version check to predis tests

---
 .travis.yml                     | 5 ++---
 tests/BootstrapsTenancyTest.php | 8 ++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea8e9e77..94a09dd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 env:
   - LARAVEL_VERSION="5.7.*" TESTBENCH_VERSION="~3.7" REDIS_DRIVER=phpredis
   - LARAVEL_VERSION="5.8.*" TESTBENCH_VERSION="~3.8" REDIS_DRIVER=phpredis
-  - LARAVEL_VERSION="5.8.*" TESTBENCH_VERSION="~3.8" REDIS_DRIVER=predis
 
 language: php
 php:
@@ -12,10 +11,10 @@ services:
   - redis-server
 
 before_install:
-  - if [[ "$REDIS_DRIVER" = "phpredis" ]]; then echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
+  - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 install:
-  - composer require "laravel/framework:$LARAVEL_VERSION" "orchestra/testbench:$TESTBENCH_VERSION"
+  - travis_retry composer require "laravel/framework:$LARAVEL_VERSION" "orchestra/testbench:$TESTBENCH_VERSION"
   - travis_retry composer install --no-interaction
 
 before_script:
diff --git a/tests/BootstrapsTenancyTest.php b/tests/BootstrapsTenancyTest.php
index c6c22d2a..a3751a1c 100644
--- a/tests/BootstrapsTenancyTest.php
+++ b/tests/BootstrapsTenancyTest.php
@@ -35,6 +35,10 @@ class BootstrapsTenancyTest extends TestCase
     /** @test */
     public function predis_is_supported()
     {
+        if (app()->version() < 'v5.8.27') {
+            $this->markTestSkipped();
+        }
+
         Config::set('database.redis.client', 'predis');
         Redis::setDriver('predis');
         Config::set('tenancy.redis.tenancy', false);
@@ -46,6 +50,10 @@ class BootstrapsTenancyTest extends TestCase
     /** @test */
     public function predis_is_not_supported_without_disabling_redis_multitenancy()
     {
+        if (app()->version() < 'v5.8.27') {
+            $this->markTestSkipped();
+        }
+
         Config::set('database.redis.client', 'predis');
         Redis::setDriver('predis');
         Config::set('tenancy.redis.tenancy', true);