Changed global cache tag to proper prefix

Author: lcharette

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Fix for `merge` bundling rule (#660)
 - Fix for undefined variable exception under strict mode in `ufAlerts` (#809)
 - Fix for site cache reset upon login (#828)
+- Changed global cache tag to proper prefix
 
 ## v4.1.15-alpha
 - Refactor `Password` into a instantiable `Hasher` class, service, and `Password` facade (#827)
@@ -34,7 +35,7 @@
 - Change "remember me" text
 - Improve table tool buttons
 - Twig extensions now implement `Twig_Extension_GlobalsInterface` as required by https://twig.symfony.com/doc/2.x/advanced.html#id1 (#788)
-- Display element based on permissions for group list/info pages 
+- Display element based on permissions for group list/info pages
 - Factor the admin user creation out of migrations and into its own Bakery command (See #778)
 - Bakery `clear-cache` command now clears Twig and router cache (Fix #750)
 - Add Russian translations
@@ -365,7 +366,7 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 - Use Laravel's Schema interface to create tables and default rows, instead of constructing them with SQL
 
 ## v0.3.1.20
-- Added `pushAlert()`,`clearAlerts()` in `public/js/userfrosting.js` and updated `flashAlerts()` 
+- Added `pushAlert()`,`clearAlerts()` in `public/js/userfrosting.js` and updated `flashAlerts()`
 - Revert changes to User::fresh() but leave comment regarding upgrading Eloquent
 
 ## v0.3.1.19
@@ -492,7 +493,7 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 - [Theming](https://v3.userfrosting.com/components/#theming)
 - [Plugins](https://v3.userfrosting.com/components/#plugins)
 
-## v0.2.1 
+## v0.2.1
 - Implemented db-driven menu system.  Menu items are pulled from the database, and can be modified via plugins.
 - Implemented backend templating of forms and tables via [Bootsole](https://github.com/alexweissman/bootsole).
 
@@ -529,7 +530,7 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 - Included better functions for sanitizing user input, validating user ip, generating csrf (cross-site request forgery) tokens - thanks to contributor @r3wt
 
 ## v0.1.3
-- Root account (user id = 1) : created upon installation, cannot be deleted or disabled. 
+- Root account (user id = 1) : created upon installation, cannot be deleted or disabled.
 - Special color scheme for when logged in as root user.
 - Installer now guides user through creation of root account
 - Moved common JS and CSS includes to "includes.php"

app/sprinkles/account/src/Database/Models/User.php

@@ -210,11 +210,11 @@ public static function exists($value, $identifier = 'user_name', $checkDeleted =
     /**
      * Return a cache instance specific to that user
      *
-     * @return Illuminate\Contracts\Cache\Store
+     * @return \Illuminate\Contracts\Cache\Store
      */
     public function getCache()
     {
-        return static::$ci->cache->tags([static::$ci->config['cache.prefix'], '_u'.$this->id]);
+        return static::$ci->cache->tags('_u'.$this->id);
     }
 
     /**

app/sprinkles/core/src/Alert/CacheAlertStream.php

@@ -50,12 +50,12 @@ public function __construct($messagesKey, MessageTranslator $translator = null,
     /**
      *    Get the messages from this message stream.
      *
-     *    @return array An array of messages, each of which is itself an array containing "type" and "message" fields.
+     *    @return array An array of messages, each of which is itself an array containing 'type' and 'message' fields.
      */
     public function messages()
     {
-        if ($this->cache->tags([$this->config['cache.prefix'], "_s".session_id()])->has($this->messagesKey)) {
-            return $this->cache->tags([$this->config['cache.prefix'], "_s".session_id()])->get($this->messagesKey) ?: [];
+        if ($this->cache->tags('_s'.session_id())->has($this->messagesKey)) {
+            return $this->cache->tags('_s'.session_id())->get($this->messagesKey) ?: [];
         } else {
             return [];
         }
@@ -68,7 +68,7 @@ public function messages()
      */
     public function resetMessageStream()
     {
-        $this->cache->tags([$this->config['cache.prefix'], "_s".session_id()])->forget($this->messagesKey);
+        $this->cache->tags('_s'.session_id())->forget($this->messagesKey);
     }
 
     /**
@@ -79,6 +79,6 @@ public function resetMessageStream()
      */
     protected function saveMessages($messages)
     {
-        $this->cache->tags([$this->config['cache.prefix'], "_s".session_id()])->forever($this->messagesKey, $messages);
+        $this->cache->tags('_s'.session_id())->forever($this->messagesKey, $messages);
     }
 }

app/sprinkles/core/src/ServicesProvider/ServicesProvider.php

@@ -159,15 +159,18 @@ public function register(ContainerInterface $container)
                 $path = $c->locator->findResource('cache://', true, true);
                 $cacheStore = new TaggableFileStore($path);
             } elseif ($config['cache.driver'] == 'memcached') {
-                $cacheStore = new MemcachedStore($config['cache.memcached']);
+                // We need to inject the prefix in the memcached config
+                $config = array_merge($config['cache.memcached'], ['prefix' => $config['cache.prefix']]);
+                $cacheStore = new MemcachedStore($config);
             } elseif ($config['cache.driver'] == 'redis') {
-                $cacheStore = new RedisStore($config['cache.redis']);
+                // We need to inject the prefix in the redis config
+                $config = array_merge($config['cache.redis'], ['prefix' => $config['cache.prefix']]);
+                $cacheStore = new RedisStore($config);
             } else {
                 throw new \Exception("Bad cache store type '{$config['cache.driver']}' specified in configuration file.");
             }
 
-            $cache = $cacheStore->instance();
-            return $cache->tags($config['cache.prefix']);
+            return $cacheStore->instance();
         };
 
         /**