[6.x] Fixed code that depended on getenv (#30924)

* Fixed code that depended on getenv * Update InteractsWithRedis.php * Apply fixes from StyleCI (#30925)
laravel · Dec 25, 2019 · a7db749 · a7db749
1 parent 2bde5b7
commit a7db749
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Foundation\Application;
 use Illuminate\Redis\RedisManager;
+use Illuminate\Support\Env;
 
 trait InteractsWithRedis
 {
@@ -30,8 +31,8 @@ trait InteractsWithRedis
     public function setUpRedis()
     {
         $app = $this->app ?? new Application;
-        $host = getenv('REDIS_HOST') ?: '127.0.0.1';
-        $port = getenv('REDIS_PORT') ?: 6379;
+        $host = Env::get('REDIS_HOST', '127.0.0.1');
+        $port = Env::get('REDIS_PORT', 6379);
 
         if (! extension_loaded('redis')) {
             $this->markTestSkipped('The redis extension is not installed. Please install the extension to enable '.__CLASS__);
@@ -63,7 +64,7 @@ public function setUpRedis()
         try {
             $this->redis['phpredis']->connection()->flushdb();
         } catch (Exception $e) {
-            if ($host === '127.0.0.1' && $port === 6379 && getenv('REDIS_HOST') === false) {
+            if ($host === '127.0.0.1' && $port === 6379 && Env::get('REDIS_HOST') === null) {
                 static::$connectionFailedOnceWithDefaultsSkip = true;
                 $this->markTestSkipped('Trying default host/port failed, please set environment variable REDIS_HOST & REDIS_PORT to enable '.__CLASS__);
             }

diff --git a/tests/Redis/RedisConnectionTest.php b/tests/Redis/RedisConnectionTest.php
@@ -554,8 +554,8 @@ public function connections()
             'phpredis' => $this->redis['phpredis']->connection(),
         ];
 
-        $host = getenv('REDIS_HOST') ?: '127.0.0.1';
-        $port = getenv('REDIS_PORT') ?: 6379;
+        $host = env('REDIS_HOST', '127.0.0.1');
+        $port = env('REDIS_PORT', 6379);
 
         $prefixedPhpredis = new RedisManager(new Application, 'phpredis', [
             'cluster' => false,