Adding a getter and setter for cache registry

cakephp · Apr 24, 2017 · cefe650 · cefe650
1 parent 5759d1e
commit cefe650
Showing 1 changed file with 31 additions and 8 deletions.
diff --git a/src/Cache/Cache.php b/src/Cache/Cache.php
@@ -106,24 +106,47 @@ class Cache
      */
     protected static $_registry;
 
+    /**
+     * Returns the Cache Registry instance used for creating and using cache adapters.
+     *
+     * @return \Cake\Core\ObjectRegistry
+     */
+    public static function getRegistry()
+    {
+        if (!static::$_registry) {
+            static::$_registry = new CacheRegistry();
+        }
+
+        return static::$_registry;
+    }
+
+    /**
+     * Returns the Cache Registry instance used for creating and using cache adapters.
+     * Also allows for injecting of a new registry instance.
+     *
+     * @param \Cake\Core\ObjectRegistry|null $registry Injectable registry object.
+     * @return \Cake\Core\ObjectRegistry
+     */
+    public static function setRegistry(ObjectRegistry $registry)
+    {
+        static::$_registry = $registry;
+    }
+
     /**
      * Returns the Cache Registry instance used for creating and using cache adapters.
      * Also allows for injecting of a new registry instance.
      *
+     * @deprecated Use getRegistry() and setRegistry() instead.
      * @param \Cake\Core\ObjectRegistry|null $registry Injectable registry object.
      * @return \Cake\Core\ObjectRegistry
      */
     public static function registry(ObjectRegistry $registry = null)
     {
         if ($registry) {
-            static::$_registry = $registry;
+            static::setRegistry($registry);
         }
 
-        if (!static::$_registry) {
-            static::$_registry = new CacheRegistry();
-        }
-
-        return static::$_registry;
+        return static::getRegistry();
     }
 
     /**
@@ -135,7 +158,7 @@ public static function registry(ObjectRegistry $registry = null)
      */
     protected static function _buildEngine($name)
     {
-        $registry = static::registry();
+        $registry = static::getRegistry();
 
         if (empty(static::$_config[$name]['className'])) {
             throw new InvalidArgumentException(
@@ -174,7 +197,7 @@ public static function engine($config)
             return new NullEngine();
         }
 
-        $registry = static::registry();
+        $registry = static::getRegistry();
 
         if (isset($registry->{$config})) {
             return $registry->{$config};