refs #1609 : new singleton implementation added for PHP 5.3/4.

Needlworks · Oct 3, 2012 · 1367660 · 1367660
1 parent 1921b98
commit 1367660
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 24 deletions.
diff --git a/framework/boot/10-CoreClasses.php b/framework/boot/10-CoreClasses.php
@@ -4,28 +4,62 @@
 /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 /// Singleton implementation.
-abstract class Singleton {
-	private static $instances = array();
-
-	protected function __construct() {
+if(version_compare(PHP_VERSION, '5.3.0','>=')) { // >= 5.3 Singleton implementation 
+	class Singleton {
+		// If your model support higher than PHP 5.3, you do not implement getInstance method.
+		// However, models for prior to PHP 5.3 should have getInstance method. 
+		// See below (<5.3 Compatible singleton implementation) 
+		private static $instances;
+
+		public function __construct() {
+			$c = get_class($this);
+			if(isset(self::$instances[$c])) {
+				throw new Exception('You can not create more than one copy of a singleton.');
+			} else {
+				self::$instances[$c] = $this;
+			}
+		}
+		public static function _getInstance($p = null) {
+			$c = get_called_class();
+			if (!isset(self::$instances[$c])) {
+				$args = func_get_args();
+				$reflection_object = new ReflectionClass($c);
+				self::$instances[$c] = $reflection_object->newInstanceArgs($args);
+			}
+			return self::$instances[$c];
+		}
+		public static function getInstance() {
+			return self::_getInstance();
+		}
+		public function __clone() {
+			throw new Exception('You can not clone a singleton.');
+		}
 	}
+} else { //  < 5.3 Compatible Singleton implementation.
+	class Singleton {
+		private static $instances = array();
 
-	final protected static function _getInstance($className) {
-		if (!array_key_exists($className, self::$instances)) {
-			self::$instances[$className] = new $className();
+		protected function __construct() {
 		}
-		return self::$instances[$className];
-	}
 
-	/*
-	// You should implement this method to the final class. (An example is below.)
-	// This is mainly because "late static bindings" is supported after PHP 5.3.
+		final protected static function _getInstance($className) {
+			if (!array_key_exists($className, self::$instances)) {
+				self::$instances[$className] = new $className();
+			}
+			return self::$instances[$className];
+		}
 
-	public static function getInstance() {
-		return self::_getInstance(__CLASS__);
+		/*
+		// If your model support prior to PHP 5.3, you should implement this method to the final class. 
+		// (An example is below.)
+		// This is mainly because "late static bindings" is supported after PHP 5.3.
+
+		public static function getInstance() {
+			return self::_getInstance(__CLASS__);
+		}
+		*/
+		public static function getInstance(){}
 	}
-	*/
-	abstract public static function getInstance();
 }
 
 /// String manipulation class

diff --git a/framework/model/Config.php b/framework/model/Config.php
@@ -10,8 +10,8 @@ public static function getInstance() {
 		return self::_getInstance(__CLASS__);
 	}
 
-	protected function __construct($id = 'textcube') {
-		$this->__basicConfigLoader($id);
+	public function __construct() {
+		$this->__basicConfigLoader('textcube');
 	}
 
 	private function __basicConfigLoader($id) {

diff --git a/framework/model/Context.php b/framework/model/Context.php
@@ -5,7 +5,7 @@
 
 final class Model_Context extends Singleton
 {
-	private static $__property, $__namespace;
+	private $__property, $__namespace;
 	public static function getInstance() {
 		return self::_getInstance(__CLASS__);
 	}

diff --git a/framework/model/LegacySupport.php b/framework/model/LegacySupport.php
@@ -10,10 +10,6 @@ public static function getInstance() {
 		return self::_getInstance(__CLASS__);
 	}
 
-	protected function __construct() {
-
-	}
-
 	public function addSupport($parameters) {
 		if(!is_array($parameters)) {
 			$parameters = array($parameters);

diff --git a/framework/model/URIHandler.php b/framework/model/URIHandler.php
@@ -13,7 +13,7 @@ public static function getInstance() {
 		return self::_getInstance(__CLASS__);
 	}
 
-	protected function __construct() {
+	public function __construct() {
 		$this->__URIInterpreter();
 		$this->context = Model_Context::getInstance();
 	}