From 3167ac53e796ab8e7539195cbb7c1a96bba84cfa Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sat, 2 Feb 2019 01:19:19 +0300
Subject: [PATCH] Flextype Core: Cache - code fixes and refactoring according
 to Scrutinizer Tests.

---
 flextype/Cache.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/flextype/Cache.php b/flextype/Cache.php
index 26839490..afd9720a 100755
--- a/flextype/Cache.php
+++ b/flextype/Cache.php
@@ -115,8 +115,10 @@ class Cache
     public static function getCacheDriver()
     {
         // Try to set default cache driver name
+        $driver_name = Cache::setDefaultCacheDriverName(Registry::get('settings.cache.driver'));
+
         // Set cache driver
-        return Cache::setCacheDriver(Cache::setDefaultCacheDriverName(Registry::get('settings.cache.driver')));
+        return Cache::setCacheDriver($driver_name);
     }
 
     protected static function setCacheDriver(string $driver_name)
@@ -138,7 +140,7 @@ class Cache
                 $driver = Cache::setSQLite3CacheDriver();
             break;
             case 'zend':
-                $driver = setZendDataCacheDriver();
+                $driver = Cache::setZendDataCacheDriver();
             break;
             case 'redis':
                 $driver = Cache::setRedisCacheDriver();