Singleton instance must depend on requested token

andrey-yantsen · andrey-yantsen · commit d50267c48b08 · 2016-02-05T22:45:55.000+03:00
diff --git a/lib/Mixpanel.php b/lib/Mixpanel.php
@@ -124,10 +124,10 @@ class Mixpanel extends Base_MixpanelBase {
 
 
     /**
-     * An instance of the Mixpanel class (for singleton use)
-     * @var Mixpanel
+     * Instances' list of the Mixpanel class (for singleton use, splitted by token)
+     * @var Mixpanel[]
      */
-    private static $_instance;
+    private static $_instances = array();
     
 
     /**
@@ -149,10 +149,10 @@ public function __construct($token, $options = array()) {
      * @return Mixpanel
      */
     public static function getInstance($token, $options = array()) {
-        if(!isset(self::$_instance)) {
-            self::$_instance = new Mixpanel($token, $options);
+        if(!isset(self::$_instances[$token])) {
+            self::$_instances[$token] = new Mixpanel($token, $options);
         }
-        return self::$_instance;
+        return self::$_instances[$token];
     }
 
 
