tnhfw / tnh-fw

tests/tnhfw/CommonTest.php

Spacing +3 added lines, -3 removed lines

@@ -24,20 +24,20 @@
 		}
 
 		
-		public function testFunctionGetConfigKeyNotExist(){
+		public function testFunctionGetConfigKeyNotExist() {
 			$key = 'foo';
 			$cfg = get_config($key);
 			$this->assertNull($cfg);
 		}
 		
-		public function testFunctionGetConfigKeyNotExistUsingDefaultValue(){
+		public function testFunctionGetConfigKeyNotExistUsingDefaultValue() {
 			$key = 'foo';
 			$expected = 'bar';
 			$cfg = get_config($key, $expected);
 			$this->assertEquals($cfg, $expected);
 		}
 		
-		public function testFunctionGetConfigAfterSet(){
+		public function testFunctionGetConfigAfterSet() {
 			$key = 'foo';
 			$expected = 'bar';
 			$c = new Config();

Indentation +36 added lines, -36 removed lines

@@ -1,50 +1,50 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class CommonTest extends TestCase
-	{	
+    class CommonTest extends TestCase
+    {	
 	
-		public static function setUpBeforeClass()
-		{
+        public static function setUpBeforeClass()
+        {
 			
-		}
+        }
 		
-		public static function tearDownAfterClass()
-		{
+        public static function tearDownAfterClass()
+        {
 			
-		}
+        }
 	
-		protected function setUp()
-		{
-		}
+        protected function setUp()
+        {
+        }
 
-		protected function tearDown()
-		{
-		}
+        protected function tearDown()
+        {
+        }
 
 		
-		public function testFunctionGetConfigKeyNotExist(){
-			$key = 'foo';
-			$cfg = get_config($key);
-			$this->assertNull($cfg);
-		}
+        public function testFunctionGetConfigKeyNotExist(){
+            $key = 'foo';
+            $cfg = get_config($key);
+            $this->assertNull($cfg);
+        }
 		
-		public function testFunctionGetConfigKeyNotExistUsingDefaultValue(){
-			$key = 'foo';
-			$expected = 'bar';
-			$cfg = get_config($key, $expected);
-			$this->assertEquals($cfg, $expected);
-		}
+        public function testFunctionGetConfigKeyNotExistUsingDefaultValue(){
+            $key = 'foo';
+            $expected = 'bar';
+            $cfg = get_config($key, $expected);
+            $this->assertEquals($cfg, $expected);
+        }
 		
-		public function testFunctionGetConfigAfterSet(){
-			$key = 'foo';
-			$expected = 'bar';
-			$c = new Config();
-			$c->init();
-			$c->set($key, $expected);
-			$cfg = get_config($key);
-			$this->assertEquals($cfg, $expected);
-		}
+        public function testFunctionGetConfigAfterSet(){
+            $key = 'foo';
+            $expected = 'bar';
+            $c = new Config();
+            $c->init();
+            $c->set($key, $expected);
+            $cfg = get_config($key);
+            $this->assertEquals($cfg, $expected);
+        }
 		
-	}
\ No newline at end of file
+    }
\ No newline at end of file

core/classes/cache/ApcCache.php

Spacing +39 added lines, -39 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 	
-	class ApcCache implements CacheInterface{
+	class ApcCache implements CacheInterface {
 
 		/**
 		 * The logger instance
@@ -33,19 +33,19 @@ 
 		private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
+		public function __construct(Log $logger = null) {
+			if (!$this->isSupported()) {
 				show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
 			}
 
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
 		}
@@ -55,21 +55,21 @@ 
 		 * @param  string $key the key to identify the cache data
 		 * @return mixed      the cache data if exists else return false
 		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
+		public function get($key) {
+			$this->logger->debug('Getting cache data for key [' . $key . ']');
 			$success = false;
 			$data = apc_fetch($key, $success);
-			if($success === false){
-				$this->logger->info('No cache found for the key ['. $key .'], return false');
+			if ($success === false) {
+				$this->logger->info('No cache found for the key [' . $key . '], return false');
 				return false;
 			}
-			else{
+			else {
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
-				if($cacheInfo){
+				if ($cacheInfo) {
 					$expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
 				}
-				$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+				$this->logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 				return $data;
 			}
 		}
@@ -82,16 +82,16 @@ 
 		 * @param integer $ttl  the cache life time
 		 * @return boolean true if success otherwise will return false
 		 */
-		public function set($key, $data, $ttl = 0){
+		public function set($key, $data, $ttl = 0) {
 			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+			$this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$result = apc_store($key, $data, $ttl);
-			if($result === false){
-		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+			if ($result === false) {
+		    	$this->logger->error('Can not write cache data for the key [' . $key . '], return false');
 		    	return false;
 		    }
-		    else{
-		    	$this->logger->info('Cache data saved for the key ['. $key .']');
+		    else {
+		    	$this->logger->info('Cache data saved for the key [' . $key . ']');
 		    	return true;
 		    }
 		}
@@ -103,15 +103,15 @@ 
 		 * @return boolean      true if the cache is deleted, false if can't delete 
 		 * the cache or the cache with the given key not exist
 		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
+		public function delete($key) {
+			$this->logger->debug('Deleting of cache data for key [' . $key . ']');
 			$cacheInfo = $this->_getCacheInfo($key);
-			if($cacheInfo === false){
+			if ($cacheInfo === false) {
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
+			else {
+				$this->logger->info('Found cache data for the key [' . $key . '] remove it');
 	      		return apc_delete($key) === true;
 			}
 		}
@@ -124,10 +124,10 @@ 
 		 * 'expire' => expiration time of the cache (Unix timestamp),
 		 * 'ttl' => the time to live of the cache in second
 		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
+		public function getInfo($key) {
+			$this->logger->debug('Getting of cache info for key [' . $key . ']');
 			$cacheInfos = $this->_getCacheInfo($key);
-			if($cacheInfos){
+			if ($cacheInfos) {
 				$data = array(
 							'mtime' => $cacheInfos['creation_time'],
 							'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
@@ -135,7 +135,7 @@ 
 							);
 				return $data;
 			}
-			else{
+			else {
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -145,7 +145,7 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			//for APC[u] is done automatically
 			return true;
 		}
@@ -153,14 +153,14 @@ 
 		/**
 		 * Remove all cache data
 		 */
-		public function clean(){
+		public function clean() {
 			$this->logger->debug('Deleting of all cache data');
 			$cacheInfos = apc_cache_info('user');
-			if(empty($cacheInfos['cache_list'])){
+			if (empty($cacheInfos['cache_list'])) {
 				$this->logger->info('No cache data were found skipping');
 				return false;
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}
@@ -172,7 +172,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
 		}
 
@@ -180,7 +180,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -188,7 +188,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;
 	    }
@@ -199,12 +199,12 @@ 
 		* @param string $key the cache key to get the cache information 
 		* @return boolean|array
 		*/
-		private function _getCacheInfo($key){
+		private function _getCacheInfo($key) {
 			$caches = apc_cache_info('user');
-			if(! empty($caches['cache_list'])){
+			if (!empty($caches['cache_list'])) {
 				$cacheLists = $caches['cache_list'];
-				foreach ($cacheLists as $c){
-					if(isset($c['info']) && $c['info'] === $key){
+				foreach ($cacheLists as $c) {
+					if (isset($c['info']) && $c['info'] === $key) {
 						return $c;
 					}
 				}

Braces +6 added lines, -12 removed lines

@@ -43,8 +43,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
@@ -62,8 +61,7 @@ 
 			if($success === false){
 				$this->logger->info('No cache found for the key ['. $key .'], return false');
 				return false;
-			}
-			else{
+			} else{
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
 				if($cacheInfo){
@@ -89,8 +87,7 @@ 
 			if($result === false){
 		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$this->logger->info('Cache data saved for the key ['. $key .']');
 		    	return true;
 		    }
@@ -109,8 +106,7 @@ 
 			if($cacheInfo === false){
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
 	      		return apc_delete($key) === true;
 			}
@@ -134,8 +130,7 @@ 
 							'ttl' => $cacheInfos['ttl']
 							);
 				return $data;
-			}
-			else{
+			} else{
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -159,8 +154,7 @@ 
 			if(empty($cacheInfos['cache_list'])){
 				$this->logger->info('No cache data were found skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}

Indentation +194 added lines, -194 removed lines

@@ -1,215 +1,215 @@
 <?php
-	defined('ROOT_PATH') or exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') or exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 	
-	class ApcCache implements CacheInterface{
+    class ApcCache implements CacheInterface{
 
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
-				show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
-			}
+        public function __construct(Log $logger = null){
+            if(! $this->isSupported()){
+                show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
+            }
 
-			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->logger = $logger;
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::ApcCache');
-	        }
-		}
+            /**
+             * instance of the Log class
+             */
+            if(is_object($logger)){
+                $this->logger = $logger;
+            }
+            else{
+                $this->logger =& class_loader('Log', 'classes');
+                $this->logger->setLogger('Library::ApcCache');
+            }
+        }
 
-		/**
-		 * This is used to get the cache data using the key
-		 * @param  string $key the key to identify the cache data
-		 * @return mixed      the cache data if exists else return false
-		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
-			$success = false;
-			$data = apc_fetch($key, $success);
-			if($success === false){
-				$this->logger->info('No cache found for the key ['. $key .'], return false');
-				return false;
-			}
-			else{
-				$cacheInfo = $this->_getCacheInfo($key);
-				$expire = time();
-				if($cacheInfo){
-					$expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
-				}
-				$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
-				return $data;
-			}
-		}
+        /**
+         * This is used to get the cache data using the key
+         * @param  string $key the key to identify the cache data
+         * @return mixed      the cache data if exists else return false
+         */
+        public function get($key){
+            $this->logger->debug('Getting cache data for key ['. $key .']');
+            $success = false;
+            $data = apc_fetch($key, $success);
+            if($success === false){
+                $this->logger->info('No cache found for the key ['. $key .'], return false');
+                return false;
+            }
+            else{
+                $cacheInfo = $this->_getCacheInfo($key);
+                $expire = time();
+                if($cacheInfo){
+                    $expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
+                }
+                $this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+                return $data;
+            }
+        }
 
 
-		/**
-		 * Save data to the cache
-		 * @param string  $key  the key to identify this cache data
-		 * @param mixed  $data the cache data to be saved
-		 * @param integer $ttl  the cache life time
-		 * @return boolean true if success otherwise will return false
-		 */
-		public function set($key, $data, $ttl = 0){
-			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
-			$result = apc_store($key, $data, $ttl);
-			if($result === false){
-		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
-		    	return false;
-		    }
-		    else{
-		    	$this->logger->info('Cache data saved for the key ['. $key .']');
-		    	return true;
-		    }
-		}
+        /**
+         * Save data to the cache
+         * @param string  $key  the key to identify this cache data
+         * @param mixed  $data the cache data to be saved
+         * @param integer $ttl  the cache life time
+         * @return boolean true if success otherwise will return false
+         */
+        public function set($key, $data, $ttl = 0){
+            $expire = time() + $ttl;
+            $this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+            $result = apc_store($key, $data, $ttl);
+            if($result === false){
+                $this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+                return false;
+            }
+            else{
+                $this->logger->info('Cache data saved for the key ['. $key .']');
+                return true;
+            }
+        }
 
 
-		/**
-		 * Delete the cache data for given key
-		 * @param  string $key the key for cache to be deleted
-		 * @return boolean      true if the cache is deleted, false if can't delete 
-		 * the cache or the cache with the given key not exist
-		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
-			$cacheInfo = $this->_getCacheInfo($key);
-			if($cacheInfo === false){
-				$this->logger->info('This cache data does not exists skipping');
-				return false;
-			}
-			else{
-				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
-	      		return apc_delete($key) === true;
-			}
-		}
+        /**
+         * Delete the cache data for given key
+         * @param  string $key the key for cache to be deleted
+         * @return boolean      true if the cache is deleted, false if can't delete 
+         * the cache or the cache with the given key not exist
+         */
+        public function delete($key){
+            $this->logger->debug('Deleting of cache data for key [' .$key. ']');
+            $cacheInfo = $this->_getCacheInfo($key);
+            if($cacheInfo === false){
+                $this->logger->info('This cache data does not exists skipping');
+                return false;
+            }
+            else{
+                $this->logger->info('Found cache data for the key [' .$key. '] remove it');
+                    return apc_delete($key) === true;
+            }
+        }
 		
-		/**
-		 * Get the cache information for given key
-		 * @param  string $key the key for cache to get the information for
-		 * @return boolean|array    the cache information. The associative array and must contains the following information:
-		 * 'mtime' => creation time of the cache (Unix timestamp),
-		 * 'expire' => expiration time of the cache (Unix timestamp),
-		 * 'ttl' => the time to live of the cache in second
-		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
-			$cacheInfos = $this->_getCacheInfo($key);
-			if($cacheInfos){
-				$data = array(
-							'mtime' => $cacheInfos['creation_time'],
-							'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
-							'ttl' => $cacheInfos['ttl']
-							);
-				return $data;
-			}
-			else{
-				$this->logger->info('This cache does not exists skipping');
-				return false;
-			}
-		}
+        /**
+         * Get the cache information for given key
+         * @param  string $key the key for cache to get the information for
+         * @return boolean|array    the cache information. The associative array and must contains the following information:
+         * 'mtime' => creation time of the cache (Unix timestamp),
+         * 'expire' => expiration time of the cache (Unix timestamp),
+         * 'ttl' => the time to live of the cache in second
+         */
+        public function getInfo($key){
+            $this->logger->debug('Getting of cache info for key [' .$key. ']');
+            $cacheInfos = $this->_getCacheInfo($key);
+            if($cacheInfos){
+                $data = array(
+                            'mtime' => $cacheInfos['creation_time'],
+                            'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
+                            'ttl' => $cacheInfos['ttl']
+                            );
+                return $data;
+            }
+            else{
+                $this->logger->info('This cache does not exists skipping');
+                return false;
+            }
+        }
 
 
-		/**
-		 * Used to delete expired cache data
-		 */
-		public function deleteExpiredCache(){
-			//for APC[u] is done automatically
-			return true;
-		}
+        /**
+         * Used to delete expired cache data
+         */
+        public function deleteExpiredCache(){
+            //for APC[u] is done automatically
+            return true;
+        }
 
-		/**
-		 * Remove all cache data
-		 */
-		public function clean(){
-			$this->logger->debug('Deleting of all cache data');
-			$cacheInfos = apc_cache_info('user');
-			if(empty($cacheInfos['cache_list'])){
-				$this->logger->info('No cache data were found skipping');
-				return false;
-			}
-			else{
-				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
-				return apc_clear_cache('user');
-			}
-		}
+        /**
+         * Remove all cache data
+         */
+        public function clean(){
+            $this->logger->debug('Deleting of all cache data');
+            $cacheInfos = apc_cache_info('user');
+            if(empty($cacheInfos['cache_list'])){
+                $this->logger->info('No cache data were found skipping');
+                return false;
+            }
+            else{
+                $this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
+                return apc_clear_cache('user');
+            }
+        }
 		
 		
-		/**
-		 * Check whether the cache feature for the handle is supported
-		 *
-		 * @return bool
-		 */
-		public function isSupported(){
-			return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
-		}
+        /**
+         * Check whether the cache feature for the handle is supported
+         *
+         * @return bool
+         */
+        public function isSupported(){
+            return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
+        }
 
-		/**
-	     * Return the Log instance
-	     * @return Log
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
+        /**
+         * Return the Log instance
+         * @return Log
+         */
+        public function getLogger(){
+            return $this->logger;
+        }
 
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
+        /**
+         * Set the log instance
+         * @param Log $logger the log object
+         */
+        public function setLogger(Log $logger){
+            $this->logger = $logger;
+            return $this;
+        }
 		
-		/**
-		* Return the array of cache information
-		*
-		* @param string $key the cache key to get the cache information 
-		* @return boolean|array
-		*/
-		private function _getCacheInfo($key){
-			$caches = apc_cache_info('user');
-			if(! empty($caches['cache_list'])){
-				$cacheLists = $caches['cache_list'];
-				foreach ($cacheLists as $c){
-					if(isset($c['info']) && $c['info'] === $key){
-						return $c;
-					}
-				}
+        /**
+         * Return the array of cache information
+         *
+         * @param string $key the cache key to get the cache information 
+         * @return boolean|array
+         */
+        private function _getCacheInfo($key){
+            $caches = apc_cache_info('user');
+            if(! empty($caches['cache_list'])){
+                $cacheLists = $caches['cache_list'];
+                foreach ($cacheLists as $c){
+                    if(isset($c['info']) && $c['info'] === $key){
+                        return $c;
+                    }
+                }
 				
-			}
-			return false;
-		}
-	}
+            }
+            return false;
+        }
+    }

core/libraries/Benchmark.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * Class for Benchmark
 	 */
-	class Benchmark{
+	class Benchmark {
 		/**
 		 * The markers for excution time
 		 * @var array
@@ -44,7 +44,7 @@ 
 		 * This method is used to mark one point for benchmark (execution time and memory usage)
 		 * @param  string $name the marker name
 		 */
-		public function mark($name){
+		public function mark($name) {
 			//Marker for execution time
 			$this->markersTime[$name] = microtime(true);
 			//Marker for memory usage
@@ -58,12 +58,12 @@ 
 		 * @param  integer $decimalCount   the number of decimal
 		 * @return string         the total execution time
 		 */
-		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
+		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6) {
+			if (!$startMarkerName || !isset($this->markersTime[$startMarkerName])) {
 				return 0;
 			}
 			
-			if(! isset($this->markersTime[$endMarkerName])){
+			if (!isset($this->markersTime[$endMarkerName])) {
 				$this->markersTime[$endMarkerName] = microtime(true);
 			}
 			return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
@@ -76,12 +76,12 @@ 
 		 * @param  integer $decimalCount   the number of decimal
 		 * @return string         the total memory usage
 		 */
-		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
+		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6) {
+			if (!$startMarkerName || !isset($this->markersMemory[$startMarkerName])) {
 				return 0;
 			}
 			
-			if(! isset($this->markersMemory[$endMarkerName])){
+			if (!isset($this->markersMemory[$endMarkerName])) {
 				$this->markersMemory[$endMarkerName] = microtime(true);
 			}
 			return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);

Indentation +81 added lines, -81 removed lines

@@ -1,89 +1,89 @@
 <?php
-	defined('ROOT_PATH') or exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') or exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	/**
-	 * Class for Benchmark
-	 */
-	class Benchmark{
-		/**
-		 * The markers for excution time
-		 * @var array
-		 */
-		private $markersTime = array();
+    /**
+     * Class for Benchmark
+     */
+    class Benchmark{
+        /**
+         * The markers for excution time
+         * @var array
+         */
+        private $markersTime = array();
 		
-		/**
-		 * The markers for memory usage
-		 * @var array
-		 */
-		private $markersMemory = array();
+        /**
+         * The markers for memory usage
+         * @var array
+         */
+        private $markersMemory = array();
 		
-		/**
-		 * This method is used to mark one point for benchmark (execution time and memory usage)
-		 * @param  string $name the marker name
-		 */
-		public function mark($name){
-			//Marker for execution time
-			$this->markersTime[$name] = microtime(true);
-			//Marker for memory usage
-			$this->markersMemory[$name] = memory_get_usage(true);
-		}
+        /**
+         * This method is used to mark one point for benchmark (execution time and memory usage)
+         * @param  string $name the marker name
+         */
+        public function mark($name){
+            //Marker for execution time
+            $this->markersTime[$name] = microtime(true);
+            //Marker for memory usage
+            $this->markersMemory[$name] = memory_get_usage(true);
+        }
 		
-		/**
-		 * This method is used to get the total excution time in second between two markers
-		 * @param  string  $startMarkerName the marker for start point
-		 * @param  string  $endMarkerName   the marker for end point
-		 * @param  integer $decimalCount   the number of decimal
-		 * @return string         the total execution time
-		 */
-		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
-				return 0;
-			}
+        /**
+         * This method is used to get the total excution time in second between two markers
+         * @param  string  $startMarkerName the marker for start point
+         * @param  string  $endMarkerName   the marker for end point
+         * @param  integer $decimalCount   the number of decimal
+         * @return string         the total execution time
+         */
+        public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
+            if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
+                return 0;
+            }
 			
-			if(! isset($this->markersTime[$endMarkerName])){
-				$this->markersTime[$endMarkerName] = microtime(true);
-			}
-			return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
-		}
+            if(! isset($this->markersTime[$endMarkerName])){
+                $this->markersTime[$endMarkerName] = microtime(true);
+            }
+            return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
+        }
 		
-		/**
-		 * This method is used to get the total memory usage in byte between two markers
-		 * @param  string  $startMarkerName the marker for start point
-		 * @param  string  $endMarkerName   the marker for end point
-		 * @param  integer $decimalCount   the number of decimal
-		 * @return string         the total memory usage
-		 */
-		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
-				return 0;
-			}
+        /**
+         * This method is used to get the total memory usage in byte between two markers
+         * @param  string  $startMarkerName the marker for start point
+         * @param  string  $endMarkerName   the marker for end point
+         * @param  integer $decimalCount   the number of decimal
+         * @return string         the total memory usage
+         */
+        public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
+            if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
+                return 0;
+            }
 			
-			if(! isset($this->markersMemory[$endMarkerName])){
-				$this->markersMemory[$endMarkerName] = microtime(true);
-			}
-			return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);
-		}
-	}
+            if(! isset($this->markersMemory[$endMarkerName])){
+                $this->markersMemory[$endMarkerName] = microtime(true);
+            }
+            return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);
+        }
+    }

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;

Indentation +56 added lines, -56 removed lines

@@ -1,63 +1,63 @@
 <?php
-	defined('ROOT_PATH') or exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') or exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	/**
-	 * This class represent the event detail to dispatch to correspond listener
-	 */
-	class EventInfo{
+    /**
+     * This class represent the event detail to dispatch to correspond listener
+     */
+    class EventInfo{
 		
-		/**
-		 * The event name
-		 * @var string
-		 */
-		public $name;
+        /**
+         * The event name
+         * @var string
+         */
+        public $name;
 
-		/**
-		 * The event data to send to the listeners
-		 * @var mixed
-		 */
-		public $payload;
+        /**
+         * The event data to send to the listeners
+         * @var mixed
+         */
+        public $payload;
 
-		/**
-		 * If the listeners need return the event after treatment or not, false means no need
-		 * return true need return the event. 
-		 * @var boolean
-		 */
-		public $returnBack;
+        /**
+         * If the listeners need return the event after treatment or not, false means no need
+         * return true need return the event. 
+         * @var boolean
+         */
+        public $returnBack;
 
-		/**
-		 * This variable indicates if need stop the event propagation
-		 * @var boolean
-		 */
-		public $stop;
+        /**
+         * This variable indicates if need stop the event propagation
+         * @var boolean
+         */
+        public $stop;
 		
-		public function __construct($name, $payload = array(), $returnBack = false, $stop = false){
-			$this->name = $name;
-			$this->payload = $payload;
-			$this->returnBack = $returnBack;
-			$this->stop = $stop;
-		}
-	}
+        public function __construct($name, $payload = array(), $returnBack = false, $stop = false){
+            $this->name = $name;
+            $this->payload = $payload;
+            $this->returnBack = $returnBack;
+            $this->stop = $stop;
+        }
+    }

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;
 			}
 		}

Braces +8 added lines, -16 removed lines

@@ -59,8 +59,7 @@ 
 			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;
@@ -78,12 +77,10 @@ 
 				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');
 			}
 		}
@@ -98,8 +95,7 @@ 
 			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();
 			}
@@ -132,8 +128,7 @@ 
 			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);
 			}
@@ -153,8 +148,7 @@ 
 					return $event;
 				}
 				return;
-			}
-			else{
+			} else{
 				$this->logger->info('Found the registered event listener for the event [' .$event->name. '] the list are: ' . stringfy_vars($list));
 			}
 			foreach($list as $listener){
@@ -162,12 +156,10 @@ 
 					$returnedEvent = call_user_func_array($listener, array($event));
 					if($returnedEvent instanceof EventInfo){
 						$event = $returnedEvent;
-					}
-					else{
+					} 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){

Indentation +169 added lines, -169 removed lines

@@ -1,182 +1,182 @@
 <?php
-	defined('ROOT_PATH') or exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') or exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	/**
-	 * This class represent the event dispatcher management, permit to record the listener and 
-	 * also to dispatch the event
-	 */
+    /**
+     * This class represent the event dispatcher management, permit to record the listener and 
+     * also to dispatch the event
+     */
 	
-	class EventDispatcher{
+    class EventDispatcher{
 		
-		/**
-		 * The list of the registered listeners
-		 * @var array
-		 */
-		private $listeners = array();
+        /**
+         * The list of the registered listeners
+         * @var array
+         */
+        private $listeners = array();
 		
 
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private $logger;
 
-		public function __construct(){
-			$this->logger =& class_loader('Log', 'classes');
-			$this->logger->setLogger('Library::EventDispatcher');
-		}
+        public function __construct(){
+            $this->logger =& class_loader('Log', 'classes');
+            $this->logger->setLogger('Library::EventDispatcher');
+        }
 
-		/**
-		 * Register new listener
-		 * @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])){
-				$this->logger->info('This event does not have the registered event listener before, adding new one');
-				$this->listeners[$eventName] = array();
-			}
-			else{
-				$this->logger->info('This event already have the registered listener, add this listener to the list');
-			}
-			$this->listeners[$eventName][] = $listener;
-		}
+        /**
+         * Register new listener
+         * @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])){
+                $this->logger->info('This event does not have the registered event listener before, adding new one');
+                $this->listeners[$eventName] = array();
+            }
+            else{
+                $this->logger->info('This event already have the registered listener, add this listener to the list');
+            }
+            $this->listeners[$eventName][] = $listener;
+        }
 		
-		/**
-		 * Remove the event listener from list
-		 * @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])){
-				$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');
-					unset($this->listeners[$eventName][$index]);
-				}
-				else{
-					$this->logger->info('Cannot found this listener in the event listener list');
-				}
-			}
-			else{
-				$this->logger->info('This event does not have this listener ignore remove');
-			}
-		}
+        /**
+         * Remove the event listener from list
+         * @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])){
+                $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');
+                    unset($this->listeners[$eventName][$index]);
+                }
+                else{
+                    $this->logger->info('Cannot found this listener in the event listener list');
+                }
+            }
+            else{
+                $this->logger->info('This event does not have this listener ignore remove');
+            }
+        }
 		
-		/**
-		 * Remove all the event listener. If event name is null will remove all listeners, else will just 
-		 * 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])){
-				$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{
-				$this->logger->info('The event name is not set or does not exist in the listener, so remove all event listener');
-				$this->listeners = array();
-			}
-		}
+        /**
+         * Remove all the event listener. If event name is null will remove all listeners, else will just 
+         * 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])){
+                $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{
+                $this->logger->info('The event name is not set or does not exist in the listener, so remove all event listener');
+                $this->listeners = array();
+            }
+        }
 		
-		/**
-		 * Get the list of listener for this event
-		 * @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){
-			return isset($this->listeners[$eventName]) ? $this->listeners[$eventName] : array();
-		}
+        /**
+         * Get the list of listener for this event
+         * @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){
+            return isset($this->listeners[$eventName]) ? $this->listeners[$eventName] : array();
+        }
 		
-		/**
-		 * Dispatch the event to the registered listeners.
-		 * @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){
-				$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->info('This event need stopped, no need call any listener');
-				return;
-			}
-			if($event->returnBack){
-				$this->logger->info('This event need return back, return the result for future use');
-				return $this->dispatchToListerners($event);
-			}
-			else{
-				$this->logger->info('This event no need return back the result, just dispatch it');
-				$this->dispatchToListerners($event);
-			}
-		}
+        /**
+         * Dispatch the event to the registered listeners.
+         * @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){
+                $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->info('This event need stopped, no need call any listener');
+                return;
+            }
+            if($event->returnBack){
+                $this->logger->info('This event need return back, return the result for future use');
+                return $this->dispatchToListerners($event);
+            }
+            else{
+                $this->logger->info('This event no need return back the result, just dispatch it');
+                $this->dispatchToListerners($event);
+            }
+        }
 		
-		/**
-		 * Dispatch the event to the registered listeners.
-		 * @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){
-			$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){
-					return $event;
-				}
-				return;
-			}
-			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){
-					$returnedEvent = call_user_func_array($listener, array($event));
-					if($returnedEvent instanceof EventInfo){
-						$event = $returnedEvent;
-					}
-					else{
-						show_error('This event [' .$event->name. '] need you return the event object after processing');
-					}
-				}
-				else{
-					call_user_func_array($listener, array($event));
-				}
-				if($event->stop){
-					break;
-				}
-			}
-			//only test for original event may be during the flow some listeners change this parameter
-			if($eBackup->returnBack){
-				return $event;
-			}
-		}
-	}
+        /**
+         * Dispatch the event to the registered listeners.
+         * @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){
+            $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){
+                    return $event;
+                }
+                return;
+            }
+            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){
+                    $returnedEvent = call_user_func_array($listener, array($event));
+                    if($returnedEvent instanceof EventInfo){
+                        $event = $returnedEvent;
+                    }
+                    else{
+                        show_error('This event [' .$event->name. '] need you return the event object after processing');
+                    }
+                }
+                else{
+                    call_user_func_array($listener, array($event));
+                }
+                if($event->stop){
+                    break;
+                }
+            }
+            //only test for original event may be during the flow some listeners change this parameter
+            if($eBackup->returnBack){
+                return $event;
+            }
+        }
+    }

core/classes/Controller.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
 		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
 			if($logger !== null){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 				$this->logger->setLogger('MainController');
 	        }

Indentation +126 added lines, -126 removed lines

@@ -1,146 +1,146 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * 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
-		 * @var string
-		 */
-		public $moduleName = null;
+        /**
+         * The name of the module if this controller belong to an module
+         * @var string
+         */
+        public $moduleName = null;
 
-		/**
-		 * The singleton of the super object
-		 * @var Controller
-		 */
-		private static $instance;
+        /**
+         * The singleton of the super object
+         * @var Controller
+         */
+        private static $instance;
 
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		protected $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        protected $logger;
 
-		/**
-		 * Class constructor
-		 * @param object $logger the Log instance to use if is null will create one
-		 */
-		public function __construct(Log $logger = null){
-			//setting the Log instance
-			$this->setLoggerFromParamOrCreateNewInstance($logger);
+        /**
+         * Class constructor
+         * @param object $logger the Log instance to use if is null will create one
+         */
+        public function __construct(Log $logger = null){
+            //setting the Log instance
+            $this->setLoggerFromParamOrCreateNewInstance($logger);
 			
-			//instance of the super object
-			self::$instance = & $this;
+            //instance of the super object
+            self::$instance = & $this;
 
-			//Load the resources loaded during the application bootstrap
-			$this->logger->debug('Adding the loaded classes to the super instance');
-			foreach (class_loaded() as $var => $class){
-				$this->$var =& class_loader($class);
-			}
+            //Load the resources loaded during the application bootstrap
+            $this->logger->debug('Adding the loaded classes to the super instance');
+            foreach (class_loaded() as $var => $class){
+                $this->$var =& class_loader($class);
+            }
 			
-			//set module using the router
-			$this->setModuleNameFromRouter();
+            //set module using the router
+            $this->setModuleNameFromRouter();
 
-			//load the required resources
-			$this->loadRequiredResources();
+            //load the required resources
+            $this->loadRequiredResources();
 			
-			//set the cache using the configuration
-			$this->setCacheFromParamOrConfig(null);
+            //set the cache using the configuration
+            $this->setCacheFromParamOrConfig(null);
 			
-			//set application session configuration
-			$this->logger->debug('Setting PHP application session handler');
-			set_session_config();
+            //set application session configuration
+            $this->logger->debug('Setting PHP application session handler');
+            set_session_config();
 
-			//dispatch the loaded instance of super controller event
-			$this->eventdispatcher->dispatch('SUPER_CONTROLLER_CREATED');
-		}
+            //dispatch the loaded instance of super controller event
+            $this->eventdispatcher->dispatch('SUPER_CONTROLLER_CREATED');
+        }
 
 
-		/**
-		 * This is a very useful method it's used to get the super object instance
-		 * @return Controller the super object instance
-		 */
-		public static function &get_instance(){
-			return self::$instance;
-		}
+        /**
+         * This is a very useful method it's used to get the super object instance
+         * @return Controller the super object instance
+         */
+        public static function &get_instance(){
+            return self::$instance;
+        }
 
-		/**
-		 * This method is used to set the module name
-		 */
-		protected function setModuleNameFromRouter(){
-			//set the module using the router instance
-			if(isset($this->router) && $this->router->getModule()){
-				$this->moduleName = $this->router->getModule();
-			}
-		}
+        /**
+         * This method is used to set the module name
+         */
+        protected function setModuleNameFromRouter(){
+            //set the module using the router instance
+            if(isset($this->router) && $this->router->getModule()){
+                $this->moduleName = $this->router->getModule();
+            }
+        }
 
-		/**
-		 * 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){
-			$this->logger->debug('Setting the cache handler instance');
-			//set cache handler instance
-			if(get_config('cache_enable', false)){
-				if ($cache !== null){
-					$this->cache = $cache;
-				} else if (isset($this->{strtolower(get_config('cache_handler'))})){
-					$this->cache = $this->{strtolower(get_config('cache_handler'))};
-					unset($this->{strtolower(get_config('cache_handler'))});
-				} 
-			}
-		}
+        /**
+         * 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){
+            $this->logger->debug('Setting the cache handler instance');
+            //set cache handler instance
+            if(get_config('cache_enable', false)){
+                if ($cache !== null){
+                    $this->cache = $cache;
+                } else if (isset($this->{strtolower(get_config('cache_handler'))})){
+                    $this->cache = $this->{strtolower(get_config('cache_handler'))};
+                    unset($this->{strtolower(get_config('cache_handler'))});
+                } 
+            }
+        }
 
-		/**
-		 * 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){
-	          $this->logger = $logger;
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-				$this->logger->setLogger('MainController');
-	        }
-		}
+        /**
+         * 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){
+                $this->logger = $logger;
+            }
+            else{
+                $this->logger =& class_loader('Log', 'classes');
+                $this->logger->setLogger('MainController');
+            }
+        }
 
-		/**
-		 * This method is used to load the required resources for framework to work
-		 * @return void 
-		 */
-		private function loadRequiredResources(){
-			$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');
-			//dispatch the request instance created event
-			$this->eventdispatcher->dispatch('REQUEST_CREATED');
-			$this->response =& class_loader('Response', 'classes', 'classes');
-		}
+        /**
+         * This method is used to load the required resources for framework to work
+         * @return void 
+         */
+        private function loadRequiredResources(){
+            $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');
+            //dispatch the request instance created event
+            $this->eventdispatcher->dispatch('REQUEST_CREATED');
+            $this->response =& class_loader('Response', 'classes', 'classes');
+        }
 
-	}
+    }

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);
 			
@@ -57,8 +57,8 @@ 
 
 			//Load the resources loaded during the application bootstrap
 			$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);
 			}
 			
 			//set module using the router
@@ -90,9 +90,9 @@ 
 		/**
 		 * This method is used to set the module name
 		 */
-		protected function setModuleNameFromRouter(){
+		protected function setModuleNameFromRouter() {
 			//set the module using the router instance
-			if(isset($this->router) && $this->router->getModule()){
+			if (isset($this->router) && $this->router->getModule()) {
 				$this->moduleName = $this->router->getModule();
 			}
 		}
@@ -101,13 +101,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'))});
 				} 
@@ -118,12 +118,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');
 	        }
 		}
@@ -132,15 +132,15 @@ 
 		 * This method is used to load the required resources for framework to work
 		 * @return void 
 		 */
-		private function loadRequiredResources(){
+		private function loadRequiredResources() {
 			$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');
 		}
 
 	}

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'));

Indentation +47 added lines, -47 removed lines

@@ -1,59 +1,59 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class EventInfoTest extends TestCase
-	{	
+    class EventInfoTest extends TestCase
+    {	
 	
-		public static function setUpBeforeClass()
-		{
+        public static function setUpBeforeClass()
+        {
 		
-		}
+        }
 		
-		public static function tearDownAfterClass()
-		{
+        public static function tearDownAfterClass()
+        {
 			
-		}
+        }
 		
-		protected function setUp()
-		{
-		}
+        protected function setUp()
+        {
+        }
 
-		protected function tearDown()
-		{
-		}
+        protected function tearDown()
+        {
+        }
 
 		
 		
-		public function testDefaultValue(){
-			$e = new EventInfo('foo');
-			$this->assertSame($e->name, 'foo');
-			$this->assertSame($e->payload, array());
-			$this->assertFalse($e->returnBack);
-			$this->assertFalse($e->stop);
-		}
-		
-		public function testPayloadValueIsSet(){
-			$e = new EventInfo('foo', array('bar'));
-			$this->assertSame($e->name, 'foo');
-			$this->assertSame($e->payload, array('bar'));
-			$this->assertFalse($e->returnBack);
-			$this->assertFalse($e->stop);
-		}
-		
-		public function testReturnBackValueIsSetToTrue(){
-			$e = new EventInfo('foo', array('bar'), true);
-			$this->assertSame($e->name, 'foo');
-			$this->assertSame($e->payload, array('bar'));
-			$this->assertTrue($e->returnBack);
-			$this->assertFalse($e->stop);
-		}
-		
-		public function testStopValueIsSetToTue(){
-			$e = new EventInfo('foo', array('bar'), true, true);
-			$this->assertSame($e->name, 'foo');
-			$this->assertSame($e->payload, array('bar'));
-			$this->assertTrue($e->returnBack);
-			$this->assertTrue($e->stop);
-		}
-	}
\ No newline at end of file
+        public function testDefaultValue(){
+            $e = new EventInfo('foo');
+            $this->assertSame($e->name, 'foo');
+            $this->assertSame($e->payload, array());
+            $this->assertFalse($e->returnBack);
+            $this->assertFalse($e->stop);
+        }
+		
+        public function testPayloadValueIsSet(){
+            $e = new EventInfo('foo', array('bar'));
+            $this->assertSame($e->name, 'foo');
+            $this->assertSame($e->payload, array('bar'));
+            $this->assertFalse($e->returnBack);
+            $this->assertFalse($e->stop);
+        }
+		
+        public function testReturnBackValueIsSetToTrue(){
+            $e = new EventInfo('foo', array('bar'), true);
+            $this->assertSame($e->name, 'foo');
+            $this->assertSame($e->payload, array('bar'));
+            $this->assertTrue($e->returnBack);
+            $this->assertFalse($e->stop);
+        }
+		
+        public function testStopValueIsSetToTue(){
+            $e = new EventInfo('foo', array('bar'), true, true);
+            $this->assertSame($e->name, 'foo');
+            $this->assertSame($e->payload, array('bar'));
+            $this->assertTrue($e->returnBack);
+            $this->assertTrue($e->stop);
+        }
+    }
\ No newline at end of file

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;
 		}

Indentation +22 added lines, -22 removed lines

@@ -1,28 +1,28 @@
 <?php
-	class DBSessionModel extends DBSessionHandlerModel{
+    class DBSessionModel extends DBSessionHandlerModel{
 		
-		protected $_table = 'ses';
-		protected $primary_key = 's_id';
+        protected $_table = 'ses';
+        protected $primary_key = 's_id';
 		
-		protected $sessionTableColumns = array(
-			'sid' => 's_id', //VARCHAR(255)
-			'sdata' => 's_data', //TEXT
-			'stime' => 's_time', //unix timestamp (INT|BIGINT)
-			'shost' => 's_host', //VARCHAR(255)
-			'sip' => 's_ip', //VARCHAR(255) 
-			'sbrowser' => 's_browser', //VARCHAR(255) 
-			'skey' => 'test_id' //VARCHAR(255) 
-		);
+        protected $sessionTableColumns = array(
+            'sid' => 's_id', //VARCHAR(255)
+            'sdata' => 's_data', //TEXT
+            'stime' => 's_time', //unix timestamp (INT|BIGINT)
+            'shost' => 's_host', //VARCHAR(255)
+            'sip' => 's_ip', //VARCHAR(255) 
+            'sbrowser' => 's_browser', //VARCHAR(255) 
+            'skey' => 'test_id' //VARCHAR(255) 
+        );
 		
-		public function deleteByTime($time){
-			$this->getQueryBuilder()->from($this->_table)
-									->where('s_time', '<', $time);
-			$this->_database->delete();
-		}
+        public function deleteByTime($time){
+            $this->getQueryBuilder()->from($this->_table)
+                                    ->where('s_time', '<', $time);
+            $this->_database->delete();
+        }
 
 		
-		public function getKeyValue(){
-			$user_id = 0;
-			return $user_id;
-		}
-	}
\ No newline at end of file
+        public function getKeyValue(){
+            $user_id = 0;
+            return $user_id;
+        }
+    }
\ No newline at end of file

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';
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
 		if(isset($classesMap[$class])){
 			if(file_exists($classesMap[$class])){
 				require_once $classesMap[$class];
-			}
-			else{
+			} else{
 				echo 'File for class ' . $class . ' not found';
 			}
 		}

Indentation +53 added lines, -53 removed lines

@@ -1,54 +1,54 @@
 <?php
-	//Autoload function
-	function tests_autoload($class){
-		$classesMap = array(
-			//Caches
-			'ApcCache' => CORE_CLASSES_CACHE_PATH . 'ApcCache.php',
-			'CacheInterface' => CORE_CLASSES_CACHE_PATH . 'CacheInterface.php',
-			'FileCache' => CORE_CLASSES_CACHE_PATH . 'FileCache.php',
-			//models
-			'DBSessionHandlerModel' => CORE_CLASSES_MODEL_PATH . 'DBSessionHandlerModel.php',
-			'Model' => CORE_CLASSES_MODEL_PATH . 'Model.php',
-			//Core classes
-			'Config' => CORE_CLASSES_PATH . 'Config.php',
-			'Controller' => CORE_CLASSES_PATH . 'Controller.php',
-			'Database' => CORE_CLASSES_DATABASE_PATH . 'Database.php',
-			'DatabaseQueryBuilder' => CORE_CLASSES_DATABASE_PATH . 'DatabaseQueryBuilder.php',
-			'DatabaseQueryResult' => CORE_CLASSES_DATABASE_PATH . 'DatabaseQueryResult.php',
-			'DatabaseQueryRunner' => CORE_CLASSES_DATABASE_PATH . 'DatabaseQueryRunner.php',
-			'DBSessionHandler' => CORE_CLASSES_PATH . 'DBSessionHandler.php',
-			'EventInfo' => CORE_CLASSES_PATH . 'EventInfo.php',
-			'EventDispatcher' => CORE_CLASSES_PATH . 'EventDispatcher.php',
-			'Lang' => CORE_CLASSES_PATH . 'Lang.php',
-			'Loader' => CORE_CLASSES_PATH . 'Loader.php',
-			'Log' => CORE_CLASSES_PATH . 'Log.php',
-			'Module' => CORE_CLASSES_PATH . 'Module.php',
-			'Request' => CORE_CLASSES_PATH . 'Request.php',
-			'Response' => CORE_CLASSES_PATH . 'Response.php',
-			'Router' => CORE_CLASSES_PATH . 'Router.php',
-			'Security' => CORE_CLASSES_PATH . 'Security.php',
-			'Session' => CORE_CLASSES_PATH . 'Session.php',
-			'Url' => CORE_CLASSES_PATH . 'Url.php',
-			//Core libraries
-			'Assets' => CORE_LIBRARY_PATH . 'Assets.php',
-			'Benchmark' => CORE_LIBRARY_PATH . 'Benchmark.php',
-			'Browser' => CORE_LIBRARY_PATH . 'Browser.php',
-			'Cookie' => CORE_LIBRARY_PATH . 'Cookie.php',
-			'Email' => CORE_LIBRARY_PATH . 'Email.php',
-			'Form' => CORE_LIBRARY_PATH . 'Form.php',
-			'FormValidation' => CORE_LIBRARY_PATH . 'FormValidation.php',
-			'Html' => CORE_LIBRARY_PATH . 'Html.php',
-			'Pagination' => CORE_LIBRARY_PATH . 'Pagination.php',
-			'PDF' => CORE_LIBRARY_PATH . 'PDF.php',
-			'StringHash' => CORE_LIBRARY_PATH . 'StringHash.php',
-			'Upload' => CORE_LIBRARY_PATH . 'Upload.php',
-		);
-		if(isset($classesMap[$class])){
-			if(file_exists($classesMap[$class])){
-				require_once $classesMap[$class];
-			}
-			else{
-				echo 'File for class ' . $class . ' not found';
-			}
-		}
-	}
\ No newline at end of file
+    //Autoload function
+    function tests_autoload($class){
+        $classesMap = array(
+            //Caches
+            'ApcCache' => CORE_CLASSES_CACHE_PATH . 'ApcCache.php',
+            'CacheInterface' => CORE_CLASSES_CACHE_PATH . 'CacheInterface.php',
+            'FileCache' => CORE_CLASSES_CACHE_PATH . 'FileCache.php',
+            //models
+            'DBSessionHandlerModel' => CORE_CLASSES_MODEL_PATH . 'DBSessionHandlerModel.php',
+            'Model' => CORE_CLASSES_MODEL_PATH . 'Model.php',
+            //Core classes
+            'Config' => CORE_CLASSES_PATH . 'Config.php',
+            'Controller' => CORE_CLASSES_PATH . 'Controller.php',
+            'Database' => CORE_CLASSES_DATABASE_PATH . 'Database.php',
+            'DatabaseQueryBuilder' => CORE_CLASSES_DATABASE_PATH . 'DatabaseQueryBuilder.php',
+            'DatabaseQueryResult' => CORE_CLASSES_DATABASE_PATH . 'DatabaseQueryResult.php',
+            'DatabaseQueryRunner' => CORE_CLASSES_DATABASE_PATH . 'DatabaseQueryRunner.php',
+            'DBSessionHandler' => CORE_CLASSES_PATH . 'DBSessionHandler.php',
+            'EventInfo' => CORE_CLASSES_PATH . 'EventInfo.php',
+            'EventDispatcher' => CORE_CLASSES_PATH . 'EventDispatcher.php',
+            'Lang' => CORE_CLASSES_PATH . 'Lang.php',
+            'Loader' => CORE_CLASSES_PATH . 'Loader.php',
+            'Log' => CORE_CLASSES_PATH . 'Log.php',
+            'Module' => CORE_CLASSES_PATH . 'Module.php',
+            'Request' => CORE_CLASSES_PATH . 'Request.php',
+            'Response' => CORE_CLASSES_PATH . 'Response.php',
+            'Router' => CORE_CLASSES_PATH . 'Router.php',
+            'Security' => CORE_CLASSES_PATH . 'Security.php',
+            'Session' => CORE_CLASSES_PATH . 'Session.php',
+            'Url' => CORE_CLASSES_PATH . 'Url.php',
+            //Core libraries
+            'Assets' => CORE_LIBRARY_PATH . 'Assets.php',
+            'Benchmark' => CORE_LIBRARY_PATH . 'Benchmark.php',
+            'Browser' => CORE_LIBRARY_PATH . 'Browser.php',
+            'Cookie' => CORE_LIBRARY_PATH . 'Cookie.php',
+            'Email' => CORE_LIBRARY_PATH . 'Email.php',
+            'Form' => CORE_LIBRARY_PATH . 'Form.php',
+            'FormValidation' => CORE_LIBRARY_PATH . 'FormValidation.php',
+            'Html' => CORE_LIBRARY_PATH . 'Html.php',
+            'Pagination' => CORE_LIBRARY_PATH . 'Pagination.php',
+            'PDF' => CORE_LIBRARY_PATH . 'PDF.php',
+            'StringHash' => CORE_LIBRARY_PATH . 'StringHash.php',
+            'Upload' => CORE_LIBRARY_PATH . 'Upload.php',
+        );
+        if(isset($classesMap[$class])){
+            if(file_exists($classesMap[$class])){
+                require_once $classesMap[$class];
+            }
+            else{
+                echo 'File for class ' . $class . ' not found';
+            }
+        }
+    }
\ No newline at end of file