$selfInstance is better

diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php
index 3cde53082b6dd0c129efdb0debd6c4d2797658a5..4a6b72058339aa5ee0fbedda8a587e2fd1d20e36 100644 (file)
--- a/inc/classes/main/language/class_LanguageSystem.php
+++ b/inc/classes/main/language/class_LanguageSystem.php
@@ -41,7 +41,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
        /**
         * An instance of this class
         */
-       private static $thisInstance = NULL;
+       private static $selfInstance = NULL;
 
        /**
         * Protected constructor
@@ -94,7 +94,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
                $langInstance->setLanguageCode(FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_lang'));
 
                // Remember this instance
-               self::$thisInstance = $langInstance;
+               self::$selfInstance = $langInstance;
 
                // Return the prepared instance
                return $langInstance;
@@ -103,10 +103,10 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
        /**
         * Singleton getter for this instance
         *
-        * @return      $thisInstance   An instance of this class
+        * @return      $selfInstance   An instance of this class
         */
        public static final function getSelfInstance () {
-               return self::$thisInstance;
+               return self::$selfInstance;
        }
 
        /**

diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php
index 0a688c39638799f2a2d0cf01628ac2d21d350abf..853cb951864110a2148298b427bad07a4a8e2609 100644 (file)
--- a/inc/classes/middleware/database/class_DatabaseConnection.php
+++ b/inc/classes/middleware/database/class_DatabaseConnection.php
@@ -36,7 +36,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
        private $dbLayer = NULL;
 
        // An instance of this class
-       private static $thisInstance = NULL;
+       private static $selfInstance = NULL;
 
        /**
         * Protected constructor
@@ -60,7 +60,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
                $databaseInstance->setDatabaseLayer($dbLayer);
 
                // Set db instance
-               self::$thisInstance = $databaseInstance;
+               self::$selfInstance = $databaseInstance;
 
                // Return instance
                return $databaseInstance;
@@ -68,7 +68,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 
        // Get an instance of this class
        public static final function getSelfInstance () {
-               return self::$thisInstance;
+               return self::$selfInstance;
        }
 
        // Public setter for database connection

diff --git a/inc/classes/middleware/debug/class_DebugMiddleware.php b/inc/classes/middleware/debug/class_DebugMiddleware.php
index 14901161715315e47ea5bd1ff98310913e915505..51e17257cd419ed2c271dc3226aa94b2c7fa8b0b 100644 (file)
--- a/inc/classes/middleware/debug/class_DebugMiddleware.php
+++ b/inc/classes/middleware/debug/class_DebugMiddleware.php
@@ -32,7 +32,7 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
        /**
         * An instance of this class
         */
-       private static $thisInstance = NULL;
+       private static $selfInstance = NULL;
 
        /**
         * Protected constructor
@@ -44,7 +44,7 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
                parent::__construct(__CLASS__);
 
                // Set own instance
-               self::$thisInstance = $this;
+               self::$selfInstance = $this;
 
                // Set it so all can use it
                $this->setDebugInstance($this);
@@ -82,10 +82,10 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
        /**
         * Getter for an instance of this class
         *
-        * @return      $thisInstance           An instance of this class
+        * @return      $selfInstance           An instance of this class
         */
        public static final function getSelfInstance() {
-               return self::$thisInstance;
+               return self::$selfInstance;
        }
 
        /**

diff --git a/inc/classes/middleware/io/class_FileIoHandler.php b/inc/classes/middleware/io/class_FileIoHandler.php
index 70afeefe664bb7dc5590b4a5becee5bc32350528..93c40c9381851ab4f9ebc4d22cfe5a86811f6c25 100644 (file)
--- a/inc/classes/middleware/io/class_FileIoHandler.php
+++ b/inc/classes/middleware/io/class_FileIoHandler.php
@@ -36,7 +36,7 @@ class FileIoHandler extends BaseMiddleware {
        /**
         * An instance of this class
         */
-       private static $thisInstance = NULL;
+       private static $selfInstance = NULL;
 
        /**
         * Protected constructor
@@ -48,7 +48,7 @@ class FileIoHandler extends BaseMiddleware {
                parent::__construct(__CLASS__);
 
                // Set own instance
-               self::$thisInstance = $this;
+               self::$selfInstance = $this;
        }
 
        /**
@@ -72,10 +72,10 @@ class FileIoHandler extends BaseMiddleware {
        /**
         * Getter for an instance of this class
         *
-        * @return      $thisInstance   An instance of this class
+        * @return      $selfInstance   An instance of this class
         */
        public static final function getSelfInstance () {
-               return self::$thisInstance;
+               return self::$selfInstance;
        }
 
        /**