PHP 5-ish method of storing singleton instances.

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php b/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php
index dcc3695..8da395c 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Cache.php
@@ -37,6 +37,13 @@
 class Horde_Imap_Client_Cache
 {
     /**
+     * Singleton instances.
+     *
+     * @var array
+     */
+    static protected $_instances = array();
+
+    /**
      * The configuration params.
      *
      * @var array
@@ -88,14 +95,13 @@ class Horde_Imap_Client_Cache
      */
     static public function singleton($params = array())
     {
-        static $instance = array();
-
+        ksort($params);
         $sig = hash('md5', serialize($params));
-        if (!isset($instance[$sig])) {
-            $instance[$sig] = new Horde_Imap_Client_Cache($params);
+        if (!isset(self::$_instances[$sig])) {
+            self::$_instances[$sig] = new Horde_Imap_Client_Cache($params);
         }
 
-        return $instance[$sig];
+        return self::$_instances[$sig];
     }
 
     /**