Merge pull request #19 from yupmin/feature/fix-for-laravel57

Fix for Redis manager in Laravel 5.7

Author: cyrossignol

.gitignore

@@ -8,3 +8,4 @@ docker-compose.override.yml
 phpcs.xml
 phpspec.yml
 phpunit.xml
+/.idea

src/Configuration/Loader.php

@@ -243,6 +243,16 @@ public function getApplicationVersion()
         return \Illuminate\Foundation\Application::VERSION;
     }
 
+    /**
+     * Get the current Laravel or Lumen application.
+     *
+     * @return \Illuminate\Contracts\Foundation\Application
+     */
+    public function getApplication()
+    {
+        return $this->app;
+    }
+
     /**
      * Fetch the specified application configuration value.
      *

src/Manager/VersionedManagerFactory.php

@@ -59,10 +59,16 @@ public static function make(ConfigurationLoader $config)
     public function makeInstance()
     {
         $class = $this->getVersionedRedisSentinelManagerClass();
+        $app = $this->config->getApplication();
         $config = $this->config->get('database.redis-sentinel', [ ]);
         $driver = Arr::pull($config, 'client', 'predis');
 
-        return new RedisSentinelManager(new $class($driver, $config));
+        if (version_compare($this->config->getApplicationVersion(), '5.6') <= 0) {
+            return new RedisSentinelManager(new $class($driver, $config));
+        }
+
+        return new RedisSentinelManager(new $class($app, $driver, $config));
+
     }
 
     /**