tnhfw / tnh-fw

core/classes/EventInfo.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * This class represent the event detail to dispatch to correspond listener
 	 */
-	class EventInfo{
+	class EventInfo {
 		
 		/**
 		 * The event name
@@ -54,7 +54,7 @@ 
 		 */
 		public $stop;
 		
-		public function __construct($name, $payload = array(), $returnBack = false, $stop = false){
+		public function __construct($name, $payload = array(), $returnBack = false, $stop = false) {
 			$this->name = $name;
 			$this->payload = $payload;
 			$this->returnBack = $returnBack;

core/classes/EventDispatcher.php

Spacing +39 added lines, -39 removed lines

@@ -29,7 +29,7 @@ 
 	 * also to dispatch the event
 	 */
 	
-	class EventDispatcher{
+	class EventDispatcher {
 		
 		/**
 		 * The list of the registered listeners
@@ -44,8 +44,8 @@ 
 		 */
 		private $logger;
 
-		public function __construct(){
-			$this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+			$this->logger = & class_loader('Log', 'classes');
 			$this->logger->setLogger('Library::EventDispatcher');
 		}
 
@@ -54,13 +54,13 @@ 
 		 * @param string   $eventName the name of the event to register for
 		 * @param callable $listener  the function or class method to receive the event information after dispatch
 		 */
-		public function addListener($eventName, callable $listener){
-			$this->logger->debug('Adding new event listener for the event name [' .$eventName. '], listener [' .stringfy_vars($listener). ']');
-			if(! isset($this->listeners[$eventName])){
+		public function addListener($eventName, callable $listener) {
+			$this->logger->debug('Adding new event listener for the event name [' . $eventName . '], listener [' . stringfy_vars($listener) . ']');
+			if (!isset($this->listeners[$eventName])) {
 				$this->logger->info('This event does not have the registered event listener before, adding new one');
 				$this->listeners[$eventName] = array();
 			}
-			else{
+			else {
 				$this->logger->info('This event already have the registered listener, add this listener to the list');
 			}
 			$this->listeners[$eventName][] = $listener;
@@ -71,19 +71,19 @@ 
 		 * @param  string   $eventName the event name
 		 * @param  callable $listener  the listener callback
 		 */
-		public function removeListener($eventName, callable $listener){
-			$this->logger->debug('Removing of the event listener, the event name [' .$eventName. '], listener [' .stringfy_vars($listener). ']');
-			if(isset($this->listeners[$eventName])){
+		public function removeListener($eventName, callable $listener) {
+			$this->logger->debug('Removing of the event listener, the event name [' . $eventName . '], listener [' . stringfy_vars($listener) . ']');
+			if (isset($this->listeners[$eventName])) {
 				$this->logger->info('This event have the listeners, check if this listener exists');
-				if(false !== $index = array_search($listener, $this->listeners[$eventName], true)){
-					$this->logger->info('Found the listener at index [' .$index. '] remove it');
+				if (false !== $index = array_search($listener, $this->listeners[$eventName], true)) {
+					$this->logger->info('Found the listener at index [' . $index . '] remove it');
 					unset($this->listeners[$eventName][$index]);
 				}
-				else{
+				else {
 					$this->logger->info('Cannot found this listener in the event listener list');
 				}
 			}
-			else{
+			else {
 				$this->logger->info('This event does not have this listener ignore remove');
 			}
 		}
@@ -93,13 +93,13 @@ 
 		 * remove all listeners for this event
 		 * @param  string $eventName the event name
 		 */
-		public function removeAllListener($eventName = null){
-			$this->logger->debug('Removing of all event listener, the event name [' .$eventName. ']');
-			if($eventName !== null && isset($this->listeners[$eventName])){
+		public function removeAllListener($eventName = null) {
+			$this->logger->debug('Removing of all event listener, the event name [' . $eventName . ']');
+			if ($eventName !== null && isset($this->listeners[$eventName])) {
 				$this->logger->info('The event name is set of exist in the listener just remove all event listener for this event');
 				unset($this->listeners[$eventName]);
 			}
-			else{
+			else {
 				$this->logger->info('The event name is not set or does not exist in the listener, so remove all event listener');
 				$this->listeners = array();
 			}
@@ -110,7 +110,7 @@ 
 		 * @param string $eventName the event name
 		 * @return array the listeners for this event or empty array if this event does not contain any listener
 		 */
-		public function getListeners($eventName){
+		public function getListeners($eventName) {
 			return isset($this->listeners[$eventName]) ? $this->listeners[$eventName] : array();
 		}
 		
@@ -119,21 +119,21 @@ 
 		 * @param  mixed|object $event the event information
 		 * @return void|object if event need return, will return the final EventInfo object.
 		 */	
-		public function dispatch($event){
-			if(! $event || !$event instanceof EventInfo){
+		public function dispatch($event) {
+			if (!$event || !$event instanceof EventInfo) {
 				$this->logger->info('The event is not set or is not an instance of "EventInfo" create the default "EventInfo" object to use instead of.');
 				$event = new EventInfo((string) $event);
 			}			
-			$this->logger->debug('Dispatch to the event listener, the event [' .stringfy_vars($event). ']');
-			if(isset($event->stop) && $event->stop){
+			$this->logger->debug('Dispatch to the event listener, the event [' . stringfy_vars($event) . ']');
+			if (isset($event->stop) && $event->stop) {
 				$this->logger->info('This event need stopped, no need call any listener');
 				return;
 			}
-			if($event->returnBack){
+			if ($event->returnBack) {
 				$this->logger->info('This event need return back, return the result for future use');
 				return $this->dispatchToListerners($event);
 			}
-			else{
+			else {
 				$this->logger->info('This event no need return back the result, just dispatch it');
 				$this->dispatchToListerners($event);
 			}
@@ -144,38 +144,38 @@ 
 		 * @param  object EventInfo $event  the event information
 		 * @return void|object if event need return, will return the final EventInfo instance.
 		 */	
-		private function dispatchToListerners(EventInfo $event){
+		private function dispatchToListerners(EventInfo $event) {
 			$eBackup = $event;
 			$list = $this->getListeners($event->name);
-			if(empty($list)){
-				$this->logger->info('No event listener is registered for the event [' .$event->name. '] skipping.');
-				if($event->returnBack){
+			if (empty($list)) {
+				$this->logger->info('No event listener is registered for the event [' . $event->name . '] skipping.');
+				if ($event->returnBack) {
 					return $event;
 				}
 				return;
 			}
-			else{
-				$this->logger->info('Found the registered event listener for the event [' .$event->name. '] the list are: ' . stringfy_vars($list));
+			else {
+				$this->logger->info('Found the registered event listener for the event [' . $event->name . '] the list are: ' . stringfy_vars($list));
 			}
-			foreach($list as $listener){
-				if($eBackup->returnBack){
+			foreach ($list as $listener) {
+				if ($eBackup->returnBack) {
 					$returnedEvent = call_user_func_array($listener, array($event));
-					if($returnedEvent instanceof EventInfo){
+					if ($returnedEvent instanceof EventInfo) {
 						$event = $returnedEvent;
 					}
-					else{
-						show_error('This event [' .$event->name. '] need you return the event object after processing');
+					else {
+						show_error('This event [' . $event->name . '] need you return the event object after processing');
 					}
 				}
-				else{
+				else {
 					call_user_func_array($listener, array($event));
 				}
-				if($event->stop){
+				if ($event->stop) {
 					break;
 				}
 			}
 			//only test for original event may be during the flow some listeners change this parameter
-			if($eBackup->returnBack){
+			if ($eBackup->returnBack) {
 				return $event;
 			}
 		}

tests/tnhfw/classes/EventInfoTest.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 
 		
 		
-		public function testDefaultValue(){
+		public function testDefaultValue() {
 			$e = new EventInfo('foo');
 			$this->assertSame($e->name, 'foo');
 			$this->assertSame($e->payload, array());
@@ -33,7 +33,7 @@ 
 			$this->assertFalse($e->stop);
 		}
 		
-		public function testPayloadValueIsSet(){
+		public function testPayloadValueIsSet() {
 			$e = new EventInfo('foo', array('bar'));
 			$this->assertSame($e->name, 'foo');
 			$this->assertSame($e->payload, array('bar'));
@@ -41,7 +41,7 @@ 
 			$this->assertFalse($e->stop);
 		}
 		
-		public function testReturnBackValueIsSetToTrue(){
+		public function testReturnBackValueIsSetToTrue() {
 			$e = new EventInfo('foo', array('bar'), true);
 			$this->assertSame($e->name, 'foo');
 			$this->assertSame($e->payload, array('bar'));
@@ -49,7 +49,7 @@ 
 			$this->assertFalse($e->stop);
 		}
 		
-		public function testStopValueIsSetToTue(){
+		public function testStopValueIsSetToTue() {
 			$e = new EventInfo('foo', array('bar'), true, true);
 			$this->assertSame($e->name, 'foo');
 			$this->assertSame($e->payload, array('bar'));

core/classes/Controller.php

Spacing +20 added lines, -20 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Controller{
+	class Controller {
 		
 		/**
 		 * The name of the module if this controller belong to an module
@@ -48,7 +48,7 @@ 
 		 * Class constructor
 		 * @param object $logger the Log instance to use if is null will create one
 		 */
-		public function __construct(Log $logger = null){
+		public function __construct(Log $logger = null) {
 			//setting the Log instance
 			$this->setLoggerFromParamOrCreateNewInstance($logger);
 			
@@ -84,9 +84,9 @@ 
 		/**
 		 * This method is used to set the module name
 		 */
-		protected function setModuleNameFromRouter(){
+		protected function setModuleNameFromRouter() {
 			//determine the current module
-			if(isset($this->router) && $this->router->getModule()){
+			if (isset($this->router) && $this->router->getModule()) {
 				$this->moduleName = $this->router->getModule();
 			}
 		}
@@ -95,13 +95,13 @@ 
 		 * Set the cache using the argument otherwise will use the configuration
 		 * @param CacheInterface $cache the implementation of CacheInterface if null will use the configured
 		 */
-		protected function setCacheFromParamOrConfig(CacheInterface $cache = null){
+		protected function setCacheFromParamOrConfig(CacheInterface $cache = null) {
 			$this->logger->debug('Setting the cache handler instance');
 			//set cache handler instance
-			if(get_config('cache_enable', false)){
-				if ($cache !== null){
+			if (get_config('cache_enable', false)) {
+				if ($cache !== null) {
 					$this->cache = $cache;
-				} else if (isset($this->{strtolower(get_config('cache_handler'))})){
+				} else if (isset($this->{strtolower(get_config('cache_handler'))})) {
 					$this->cache = $this->{strtolower(get_config('cache_handler'))};
 					unset($this->{strtolower(get_config('cache_handler'))});
 				} 
@@ -112,12 +112,12 @@ 
 		 * Set the Log instance using argument or create new instance
 		 * @param object $logger the Log instance if not null
 		 */
-		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-			if($logger !== null){
+		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+			if ($logger !== null) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 				$this->logger->setLogger('MainController');
 	        }
 		}
@@ -126,20 +126,20 @@ 
 		 * This method is used to load the required resources for framework to work
 		 * @return void 
 		 */
-		private function loadRequiredResources(){
+		private function loadRequiredResources() {
 			$this->logger->debug('Adding the loaded classes to the super instance');
-			foreach (class_loaded() as $var => $class){
-				$this->$var =& class_loader($class);
+			foreach (class_loaded() as $var => $class) {
+				$this->$var = & class_loader($class);
 			}
 
 			$this->logger->debug('Loading the required classes into super instance');
-			$this->eventdispatcher =& class_loader('EventDispatcher', 'classes');
-			$this->loader =& class_loader('Loader', 'classes');
-			$this->lang =& class_loader('Lang', 'classes');
-			$this->request =& class_loader('Request', 'classes');
+			$this->eventdispatcher = & class_loader('EventDispatcher', 'classes');
+			$this->loader = & class_loader('Loader', 'classes');
+			$this->lang = & class_loader('Lang', 'classes');
+			$this->request = & class_loader('Request', 'classes');
 			//dispatch the request instance created event
 			$this->eventdispatcher->dispatch('REQUEST_CREATED');
-			$this->response =& class_loader('Response', 'classes', 'classes');
+			$this->response = & class_loader('Response', 'classes', 'classes');
 		}
 
 	}

core/classes/DBSessionHandler.php

Spacing +45 added lines, -45 removed lines

@@ -27,11 +27,11 @@ 
 	/**
 	 * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
 	 */
-	if( !interface_exists('SessionHandlerInterface')){
+	if (!interface_exists('SessionHandlerInterface')) {
 		show_error('"SessionHandlerInterface" interface does not exists or is disabled can not use it to handler database session.');
 	}
 
-	class DBSessionHandler implements SessionHandlerInterface{
+	class DBSessionHandler implements SessionHandlerInterface {
 		
 		/**
 		 * The encryption method to use to encrypt session data in database
@@ -81,25 +81,25 @@ 
          */
         protected $loader = null;
 
-		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
+		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null) {
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->setLogger($logger);
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::DBSessionHandler');
 	        }
 
-	        if(is_object($loader)){
+	        if (is_object($loader)) {
 	          $this->setLoader($loader);
 	        }
 		    $this->OBJ = & get_instance();
 
 		    
-			if(is_object($modelInstance)){
+			if (is_object($modelInstance)) {
 				$this->setModelInstance($modelInstance);
 			}
 		}
@@ -108,7 +108,7 @@ 
 		 * Set the session secret used to encrypt the data in database 
 		 * @param string $secret the base64 string secret
 		 */
-		public function setSessionSecret($secret){
+		public function setSessionSecret($secret) {
 			$this->sessionSecret = $secret;
 			return $this;
 		}
@@ -117,7 +117,7 @@ 
 		 * Return the session secret
 		 * @return string 
 		 */
-		public function getSessionSecret(){
+		public function getSessionSecret() {
 			return $this->sessionSecret;
 		}
 
@@ -126,7 +126,7 @@ 
 		 * Set the initializer vector for openssl 
 		 * @param string $key the session secret used
 		 */
-		public function setInitializerVector($key){
+		public function setInitializerVector($key) {
 			$iv_length = openssl_cipher_iv_length(self::DB_SESSION_HASH_METHOD);
 			$key = base64_decode($key);
 			$this->iv = substr(hash('sha256', $key), 0, $iv_length);
@@ -137,7 +137,7 @@ 
 		 * Return the initializer vector
 		 * @return string 
 		 */
-		public function getInitializerVector(){
+		public function getInitializerVector() {
 			return $this->iv;
 		}
 
@@ -147,17 +147,17 @@ 
 		 * @param  string $sessionName the session name
 		 * @return boolean 
 		 */
-		public function open($savePath, $sessionName){
+		public function open($savePath, $sessionName) {
 			$this->logger->debug('Opening database session handler for [' . $sessionName . ']');
 			//try to check if session secret is set before
 			$secret = $this->getSessionSecret();
-			if(empty($secret)){
+			if (empty($secret)) {
 				$secret = get_config('session_secret', null);
 				$this->setSessionSecret($secret);
 			}
 			$this->logger->info('Session secret: ' . $secret);
 
-			if(! $this->getModelInstance()){
+			if (!$this->getModelInstance()) {
 				$this->setModelInstanceFromConfig();
 			}
 			$this->setInitializerVector($secret);
@@ -165,7 +165,7 @@ 
 			//set session tables columns
 			$this->sessionTableColumns = $this->getModelInstance()->getSessionTableColumns();
 
-			if(empty($this->sessionTableColumns)){
+			if (empty($this->sessionTableColumns)) {
 				show_error('The session handler is "database" but the table columns not set');
 			}
 			$this->logger->info('Database session, the model columns are listed below: ' . stringfy_vars($this->sessionTableColumns));
@@ -181,7 +181,7 @@ 
 		 * Close the session
 		 * @return boolean
 		 */
-		public function close(){
+		public function close() {
 			$this->logger->debug('Closing database session handler');
 			return true;
 		}
@@ -191,28 +191,28 @@ 
 		 * @param  string $sid the session id to use
 		 * @return string      the session data in serialiaze format
 		 */
-		public function read($sid){
+		public function read($sid) {
 			$this->logger->debug('Reading database session data for SID: ' . $sid);
 			$instance = $this->getModelInstance();
 			$columns = $this->sessionTableColumns;
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
 			}
-			else{
+			else {
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
 			
 			$ip = get_ip();
 			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+			$browser = $this->OBJ->browser->getPlatform() . ', ' . $this->OBJ->browser->getBrowser() . ' ' . $this->OBJ->browser->getVersion();
 			
 			$data = $instance->get_by(array($columns['sid'] => $sid, $columns['shost'] => $host, $columns['sbrowser'] => $browser));
-			if($data && isset($data->{$columns['sdata']})){
+			if ($data && isset($data->{$columns['sdata']})) {
 				//checking inactivity 
 				$timeInactivity = time() - get_config('session_inactivity_time', 100);
-				if($data->{$columns['stime']} < $timeInactivity){
+				if ($data->{$columns['stime']} < $timeInactivity) {
 					$this->logger->info('Database session data for SID: ' . $sid . ' already expired, destroy it');
 					$this->destroy($sid);
 					return null;
@@ -229,16 +229,16 @@ 
 		 * @param  mixed $data the session data to save in serialize format
 		 * @return boolean 
 		 */
-		public function write($sid, $data){
+		public function write($sid, $data) {
 			$this->logger->debug('Saving database session data for SID: ' . $sid . ', data: ' . stringfy_vars($data));
 			$instance = $this->getModelInstance();
 			$columns = $this->sessionTableColumns;
 
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
 			}
-			else{
+			else {
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -246,7 +246,7 @@ 
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
 			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+			$browser = $this->OBJ->browser->getPlatform() . ', ' . $this->OBJ->browser->getBrowser() . ' ' . $this->OBJ->browser->getVersion();
 			$data = $this->encode($data);
 			$params = array(
 							$columns['sid'] => $sid,
@@ -259,13 +259,13 @@ 
 						);
 			$this->logger->info('Database session data to save are listed below :' . stringfy_vars($params));
 			$exists = $instance->get($sid);
-			if($exists){
+			if ($exists) {
 				$this->logger->info('Session data for SID: ' . $sid . ' already exists, just update it');
 				//update
 				unset($params[$columns['sid']]);
 				$instance->update($sid, $params);
 			}
-			else{
+			else {
 				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
 				$instance->insert($params);
 			}
@@ -278,7 +278,7 @@ 
 		 * @param  string $sid the session id value
 		 * @return boolean
 		 */
-		public function destroy($sid){
+		public function destroy($sid) {
 			$this->logger->debug('Destroy of session data for SID: ' . $sid);
 			$instance = $this->modelInstanceName;
 			$instance->delete($sid);
@@ -290,7 +290,7 @@ 
 		 * @param  integer $maxLifetime the max lifetime
 		 * @return boolean
 		 */
-		public function gc($maxLifetime){
+		public function gc($maxLifetime) {
 			$instance = $this->modelInstanceName;
 			$time = time() - $maxLifetime;
 			$this->logger->debug('Garbage collector of expired session. maxLifetime [' . $maxLifetime . '] sec, expired time [' . $time . ']');
@@ -303,9 +303,9 @@ 
 		 * @param  mixed $data the session data to encode
 		 * @return mixed the encoded session data
 		 */
-		public function encode($data){
+		public function encode($data) {
 			$key = base64_decode($this->sessionSecret);
-			$dataEncrypted = openssl_encrypt($data , self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
+			$dataEncrypted = openssl_encrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
 			$output = base64_encode($dataEncrypted);
 			return $output;
 		}
@@ -316,7 +316,7 @@ 
 		 * @param  mixed $data the data to decode
 		 * @return mixed       the decoded data
 		 */
-		public function decode($data){
+		public function decode($data) {
 			$key = base64_decode($this->sessionSecret);
 			$data = base64_decode($data);
 			$data = openssl_decrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
@@ -328,7 +328,7 @@ 
          * Return the loader instance
          * @return object Loader the loader instance
          */
-        public function getLoader(){
+        public function getLoader() {
             return $this->loader;
         }
 
@@ -336,7 +336,7 @@ 
          * set the loader instance for future use
          * @param object Loader $loader the loader object
          */
-         public function setLoader($loader){
+         public function setLoader($loader) {
             $this->loader = $loader;
             return $this;
         }
@@ -345,7 +345,7 @@ 
          * Return the model instance
          * @return object DBSessionHandlerModel the model instance
          */
-        public function getModelInstance(){
+        public function getModelInstance() {
             return $this->modelInstanceName;
         }
 
@@ -353,7 +353,7 @@ 
          * set the model instance for future use
          * @param DBSessionHandlerModel $modelInstance the model object
          */
-         public function setModelInstance(DBSessionHandlerModel $modelInstance){
+         public function setModelInstance(DBSessionHandlerModel $modelInstance) {
             $this->modelInstanceName = $modelInstance;
             return $this;
         }
@@ -362,7 +362,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -370,7 +370,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -378,18 +378,18 @@ 
 	    /**
 	     * Set the model instance using the configuration for session
 	     */
-	    private function setModelInstanceFromConfig(){
+	    private function setModelInstanceFromConfig() {
 	    	$modelName = get_config('session_save_path');
 			$this->logger->info('The database session model: ' . $modelName);
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
 			}
 			//@codeCoverageIgnoreStart
-			else{
+			else {
             	Loader::model($modelName, 'dbsessionhandlerinstance'); 
             }
-            if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
-				show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
+            if (isset($this->OBJ->dbsessionhandlerinstance) && !$this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel) {
+				show_error('To use database session handler, your class model "' . get_class($this->OBJ->dbsessionhandlerinstance) . '" need extends "DBSessionHandlerModel"');
 			}  
 			//@codeCoverageIgnoreEnd
 			

tests/tnhfw/classes/DBSessionHandlerTest.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 		
 		private static $config = null;
 		
-		public function __construct(){
+		public function __construct() {
 			$this->db = new Database(array(
 								'driver'    =>  'sqlite',
 								'database'  =>  TESTS_PATH . 'assets/db_tests.db',
@@ -49,7 +49,7 @@ 
 
 		
 		
-		public function testUsingSessionConfiguration(){
+		public function testUsingSessionConfiguration() {
 			//using value in the configuration
 			self::$config->set('session_save_path', 'DBSessionModel');
 			self::$config->set('session_secret', $this->secret);
@@ -75,7 +75,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenDataIsExpired(){
+		public function testWhenDataIsExpired() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -88,7 +88,7 @@ 
 			$this->assertNull($dbsh->read('foo'));
 		}
 		
-		public function testWhenDataAlreadyExistDoUpdate(){
+		public function testWhenDataAlreadyExistDoUpdate() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -101,7 +101,7 @@ 
 			$this->assertEquals($dbsh->read('foo'), '445');	
 		}
 		
-		public function testUsingCustomModelInstance(){
+		public function testUsingCustomModelInstance() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -129,7 +129,7 @@ 
 		}
 			
 			
-		public function testUsingCustomLogInstance(){
+		public function testUsingCustomLogInstance() {
 			$dbsh = new DBSessionHandler($this->model, new Log());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -156,7 +156,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testUsingCustomLoaderInstance(){
+		public function testUsingCustomLoaderInstance() {
 			$dbsh = new DBSessionHandler($this->model, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -184,7 +184,7 @@ 
 		}
 		
 		
-		public function testWhenModelInsanceIsNotSet(){
+		public function testWhenModelInsanceIsNotSet() {
 			$dbsh = new DBSessionHandler(null, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -212,7 +212,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenModelTableColumnsIsNotSet(){
+		public function testWhenModelTableColumnsIsNotSet() {
 			//session table is empty
 			$this->model->setSessionTableColumns(array());
 			$dbsh = new DBSessionHandler($this->model);

tests/include/common.php

Spacing +36 added lines, -36 removed lines

@@ -29,14 +29,14 @@ 
 		//put the first letter of class to upper case 
 		$class = ucfirst($class);
 		static $classes = array();
-		if(isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log'){
+		if (isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log') {
 			return $classes[$class];
 		}
 		$found = false;
 		foreach (array(ROOT_PATH, CORE_PATH) as $path) {
 			$file = $path . $dir . '/' . $class . '.php';
-			if(file_exists($file)){
-				if(class_exists($class, false) === false){
+			if (file_exists($file)) {
+				if (class_exists($class, false) === false) {
 					require_once $file;
 				}
 				//already found
@@ -44,7 +44,7 @@ 
 				break;
 			}
 		}
-		if(! $found){
+		if (!$found) {
 			//can't use show_error() at this time because some dependencies not yet loaded
 			set_http_status_header(503);
 			echo 'Cannot find the class [' . $class . ']';
@@ -54,7 +54,7 @@ 
 		/*
 		   TODO use the best method to get the Log instance
 		 */
-		if($class == 'Log'){
+		if ($class == 'Log') {
 			//can't use the instruction like "return new Log()" 
 			//because we need return the reference instance of the loaded class.
 			$log = new Log();
@@ -72,7 +72,7 @@ 
 
 	function & class_loaded($class = null){
 		static $list = array();
-		if($class != null){
+		if ($class != null) {
 			$list[strtolower($class)] = $class;
 		}
 		return $list;
@@ -80,7 +80,7 @@ 
 
 	function & load_configurations(array $overwrite_values = array()){
 		static $config;
-		if(empty($config)){
+		if (empty($config)) {
 			$file = CONFIG_PATH . 'config.php';
 			require_once $file;
 		
@@ -94,53 +94,53 @@ 
 	/**
 	*  @test
 	*/
-	function get_config($key, $default = null){
+	function get_config($key, $default = null) {
 		static $cfg;
-		if(empty($cfg)){
+		if (empty($cfg)) {
 			$cfg[0] = & load_configurations();
 		}
 		return array_key_exists($key, $cfg[0]) ? $cfg[0][$key] : $default;
 	}
 
-	function save_to_log($level, $message, $logger = null){
-		echo 'save_to_log('.$level . ',' . $message . ',' . $logger . ")\n";
+	function save_to_log($level, $message, $logger = null) {
+		echo 'save_to_log(' . $level . ',' . $message . ',' . $logger . ")\n";
 	}
 
 	
-	function set_http_status_header($code = 200, $text = null){
+	function set_http_status_header($code = 200, $text = null) {
 		echo 'header(' . $code . ', ' . $text . ')';
 		return true;
 	}
 
 	
-	function show_error($msg, $title = 'error', $logging = true){
+	function show_error($msg, $title = 'error', $logging = true) {
 		//show only and continue to help track of some error occured
 		echo 'show_error(' . $msg . ', ' . $title . ', ' . ($logging ? 'Y' : 'N') . ")\n";
 	}
 
-	function is_https(){
+	function is_https() {
 		return false;
 	}
 	
 	/**
 	*  @test
 	*/
-	function is_url($url){
+	function is_url($url) {
 		return preg_match('/^(http|https|ftp):\/\/(.*)/', $url);
 	}
 		
-	function php_exception_handler($ex){
+	function php_exception_handler($ex) {
 		//show only and continue to help track of some error occured
-		echo 'php_exception_handler('.$ex->getMessage().', '.$ex->getFile().', '.$ex->getLine() . ")\n";
+		echo 'php_exception_handler(' . $ex->getMessage() . ', ' . $ex->getFile() . ', ' . $ex->getLine() . ")\n";
 	}
 	
 	
-	function php_error_handler($errno , $errstr, $errfile , $errline){
+	function php_error_handler($errno, $errstr, $errfile, $errline) {
 		//show only and continue to help track of some error occured
-		echo 'php_error_handler('.$errno .', ' . $errstr.', ' . $errfile.', '.$errline . ")\n";
+		echo 'php_error_handler(' . $errno . ', ' . $errstr . ', ' . $errfile . ', ' . $errline . ")\n";
 	}
 
-	function php_shudown_handler(){
+	function php_shudown_handler() {
 		return true;
 	}
 
@@ -148,11 +148,11 @@ 
 	/**
 	*  @test
 	*/
-	function attributes_to_string(array $attributes){
+	function attributes_to_string(array $attributes) {
 		$str = ' ';
 		//we check that the array passed as an argument is not empty.
-		if(! empty($attributes)){
-			foreach($attributes as $key => $value){
+		if (!empty($attributes)) {
+			foreach ($attributes as $key => $value) {
 				$key = trim(htmlspecialchars($key));
 				$value = trim(htmlspecialchars($value));
 				/*
@@ -162,35 +162,35 @@ 
 				* 	$attr = array('placeholder' => 'I am a "puple"')
 				* 	$str = attributes_to_string($attr); => placeholder = "I am a \"puple\""
 				 */
-				if($value && strpos('"', $value) !== false){
+				if ($value && strpos('"', $value) !== false) {
 					$value = addslashes($value);
 				}
-				$str .= $key.' = "'.$value.'" ';
+				$str .= $key . ' = "' . $value . '" ';
 			}
 		}
 		//remove the space after using rtrim()
 		return rtrim($str);
 	}
 
-	function stringfy_vars($var){
+	function stringfy_vars($var) {
 		return print_r($var, true);
 	}
 
 	/**
 	*  @test
 	*/
-	function clean_input($str){
-		if(is_array($str)){
+	function clean_input($str) {
+		if (is_array($str)) {
 			$str = array_map('clean_input', $str);
 		}
-		else if(is_object($str)){
+		else if (is_object($str)) {
 			$obj = $str;
 			foreach ($str as $var => $value) {
 				$obj->$var = clean_input($value);
 			}
 			$str = $obj;
 		}
-		else{
+		else {
 			$str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
 		}
 		return $str;
@@ -199,11 +199,11 @@ 
 	/**
 	*  @test
 	*/
-	function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*'){
+	function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*') {
 		//get the string length
 		$len = strlen($str);
 		//if str is empty
-		if($len <= 0){
+		if ($len <= 0) {
 			return str_repeat($hiddenChar, 6);
 		}
 		//if the length is less than startCount and endCount
@@ -211,14 +211,14 @@ 
 		//or startCount is negative or endCount is negative
 		//return the full string hidden
 		
-		if((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)){
+		if ((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)) {
 			return str_repeat($hiddenChar, $len);
 		}
 		//the start non hidden string
 		$startNonHiddenStr = substr($str, 0, $startCount);
 		//the end non hidden string
 		$endNonHiddenStr = null;
-		if($endCount > 0){
+		if ($endCount > 0) {
 			$endNonHiddenStr = substr($str, - $endCount);
 		}
 		//the hidden string
@@ -227,12 +227,12 @@ 
 		return $startNonHiddenStr . $hiddenStr . $endNonHiddenStr;
 	}
 	
-	function set_session_config(){
+	function set_session_config() {
 		return true;
 	}
 	
 	function & get_instance(){
-		if(! Controller::get_instance()){
+		if (!Controller::get_instance()) {
 			$c = new Controller();
 			return $c;
 		}

tests/hmvc/models/DBSessionModel.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	class DBSessionModel extends DBSessionHandlerModel{
+	class DBSessionModel extends DBSessionHandlerModel {
 		
 		protected $_table = 'ses';
 		protected $primary_key = 's_id';
@@ -14,14 +14,14 @@ 
 			'skey' => 'test_id' //VARCHAR(255) 
 		);
 		
-		public function deleteByTime($time){
+		public function deleteByTime($time) {
 			$this->getQueryBuilder()->from($this->_table)
 									->where('s_time', '<', $time);
 			$this->_database->delete();
 		}
 
 		
-		public function getKeyValue(){
+		public function getKeyValue() {
 			$user_id = 0;
 			return $user_id;
 		}

tests/include/autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 	//Autoload function
-	function tests_autoload($class){
+	function tests_autoload($class) {
 		$classesMap = array(
 			//Caches
 			'ApcCache' => CORE_CLASSES_CACHE_PATH . 'ApcCache.php',
@@ -40,11 +40,11 @@ 
 			'StringHash' => CORE_LIBRARY_PATH . 'StringHash.php',
 			'Upload' => CORE_LIBRARY_PATH . 'Upload.php',
 		);
-		if(isset($classesMap[$class])){
-			if(file_exists($classesMap[$class])){
+		if (isset($classesMap[$class])) {
+			if (file_exists($classesMap[$class])) {
 				require_once $classesMap[$class];
 			}
-			else{
+			else {
 				echo 'File for class ' . $class . ' not found';
 			}
 		}