Merge branch 'develop'

michaelspiss · Apr 20, 2017 · e380e08 · e380e08
2 parents c49b342 + 6333bb7
commit e380e08
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Multiton.php b/src/Multiton.php
@@ -10,13 +10,14 @@ trait Multiton {
 
     /**
      * @param $identifier
-     * @return Multiton
+     * @return static
      */
     final public static function getInstance($identifier) {
-        if(!isset(self::$_instances[$identifier])) {
-            self::$_instances[$identifier] = new self($identifier);
+        $class_name = get_called_class();
+        if(!isset(self::$_instances[$class_name][$identifier])) {
+            self::$_instances[$class_name][$identifier] = new $class_name($identifier);
         }
-        return self::$_instances[$identifier];
+        return self::$_instances[$class_name][$identifier];
     }
 
     /**