tnhfw / tnh-fw

tests/tnhfw/libraries/PDFTest.php

Indentation +20 added lines, -20 removed lines

@@ -1,31 +1,31 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class PDFTest extends TestCase
-	{	
+    class PDFTest 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 testNotYet()
-		{
-			$this->markTestSkipped();
-		}
+        public function testNotYet()
+        {
+            $this->markTestSkipped();
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

tests/tnhfw/libraries/AssetsTest.php

Indentation +20 added lines, -20 removed lines

@@ -1,31 +1,31 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class AssetsTest extends TestCase
-	{	
+    class AssetsTest 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 testNotYet()
-		{
-			$this->markTestSkipped();
-		}
+        public function testNotYet()
+        {
+            $this->markTestSkipped();
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

tests/tnhfw/libraries/FormValidationTest.php

Indentation +71 added lines, -71 removed lines

@@ -2,12 +2,12 @@ 
 use PHPUnit\Framework\TestCase;
 class FormValidationTest extends TestCase
 {   
-	public static function setUpBeforeClass()
+    public static function setUpBeforeClass()
     {
     
     }
 	
-	public static function tearDownAfterClass()
+    public static function tearDownAfterClass()
     {
         
     }
@@ -27,109 +27,109 @@ 
     // tests
     public function testValidationDataIsEmpty()
     {
-		$fv = new FormValidation();
-		$this->assertEmpty($fv->getData());
+        $fv = new FormValidation();
+        $this->assertEmpty($fv->getData());
     }
 	
-	public function testValidationDataIsNotEmpty()
+    public function testValidationDataIsNotEmpty()
     {
-		$fv = new FormValidation();
-		$fv->setData(array('name' => 'mike'));
-		$this->assertNotEmpty($fv->getData());
-		$this->assertArrayHasKey('name', $fv->getData());
+        $fv = new FormValidation();
+        $fv->setData(array('name' => 'mike'));
+        $this->assertNotEmpty($fv->getData());
+        $this->assertArrayHasKey('name', $fv->getData());
     }
 	
-	public function testCannotDoValidation()
+    public function testCannotDoValidation()
     {
-		$fv = new FormValidation();
-		$this->assertFalse($fv->canDoValidation());
+        $fv = new FormValidation();
+        $this->assertFalse($fv->canDoValidation());
     }
 
-	public function testSettingErrorDelimiter()
+    public function testSettingErrorDelimiter()
     {
-		$fv = new FormValidation();
-		$fv->setErrorDelimiter('<a>', '</b>');
-		$this->assertContains('<a>', $fv->getErrorDelimiter());
-		$this->assertContains('</b>', $fv->getErrorDelimiter());
+        $fv = new FormValidation();
+        $fv->setErrorDelimiter('<a>', '</b>');
+        $this->assertContains('<a>', $fv->getErrorDelimiter());
+        $this->assertContains('</b>', $fv->getErrorDelimiter());
     }
 	
-	public function testSettingErrorsDelimiter()
+    public function testSettingErrorsDelimiter()
     {
-		$fv = new FormValidation();
-		$fv->setErrorsDelimiter('<foo>', '</bar>');
-		$this->assertContains('<foo>', $fv->getErrorsDelimiter());
-		$this->assertContains('</bar>', $fv->getErrorsDelimiter());
+        $fv = new FormValidation();
+        $fv->setErrorsDelimiter('<foo>', '</bar>');
+        $this->assertContains('<foo>', $fv->getErrorsDelimiter());
+        $this->assertContains('</bar>', $fv->getErrorsDelimiter());
     }
 	
-	public function testSettingErrorMessageOverride()
+    public function testSettingErrorMessageOverride()
     {
 		
-		//field specific message for the rule
-		$fv = new FormValidation();
-		$fv->setData(array('foo' => ''));
-		$fv->setRule('foo', 'bar', 'required');
-		$fv->setMessage('required', 'foo', 'foo required message error');
+        //field specific message for the rule
+        $fv = new FormValidation();
+        $fv->setData(array('foo' => ''));
+        $fv->setRule('foo', 'bar', 'required');
+        $fv->setMessage('required', 'foo', 'foo required message error');
 		
-		$this->assertFalse($fv->run());
-		$this->assertContains('foo required message error', $fv->returnErrors());
+        $this->assertFalse($fv->run());
+        $this->assertContains('foo required message error', $fv->returnErrors());
 		
-		//global message for the rule
-		$fv = new FormValidation();
-		$fv->setData(array('foo' => '', 'bar' => null));
-		$fv->setRule('foo', 'bar', 'required');
-		$fv->setRule('bar', 'foo', 'required');
-		$fv->setMessage('required', 'global required message error');
+        //global message for the rule
+        $fv = new FormValidation();
+        $fv->setData(array('foo' => '', 'bar' => null));
+        $fv->setRule('foo', 'bar', 'required');
+        $fv->setRule('bar', 'foo', 'required');
+        $fv->setMessage('required', 'global required message error');
 
-		$this->assertFalse($fv->run());
-		$this->assertContains('global required message error', $fv->returnErrors());
+        $this->assertFalse($fv->run());
+        $this->assertContains('global required message error', $fv->returnErrors());
     }
 	
-	public function testSettingCustomErrorMessage()
+    public function testSettingCustomErrorMessage()
     {
 		
-		$fv = new FormValidation();
-		$fv->setData(array('foo' => ''));
-		$fv->setRule('foo', 'bar', 'required');
-		$fv->setCustomError('foo', 'custom foo message error');
+        $fv = new FormValidation();
+        $fv->setData(array('foo' => ''));
+        $fv->setRule('foo', 'bar', 'required');
+        $fv->setCustomError('foo', 'custom foo message error');
 		
-		$this->assertFalse($fv->run());
-		$this->assertContains('custom foo message error', $fv->returnErrors());
+        $this->assertFalse($fv->run());
+        $this->assertContains('custom foo message error', $fv->returnErrors());
 		
-		//with label in the message
-		$fv = new FormValidation();
-		$fv->setData(array('foo' => ''));
-		$fv->setRule('foo', 'bar', 'required');
-		$fv->setCustomError('foo', 'custom "%1" message error');
+        //with label in the message
+        $fv = new FormValidation();
+        $fv->setData(array('foo' => ''));
+        $fv->setRule('foo', 'bar', 'required');
+        $fv->setCustomError('foo', 'custom "%1" message error');
 		
-		$this->assertFalse($fv->run());
-		$this->assertContains('custom "bar" message error', $fv->returnErrors());	
+        $this->assertFalse($fv->run());
+        $this->assertContains('custom "bar" message error', $fv->returnErrors());	
     }
 	
-	public function testReturnErrorsArray()
+    public function testReturnErrorsArray()
     {
-		$fv = new FormValidation();
-		$fv->setRule('name', 'name', 'required');
-		$fv->setData(array('name' => ''));
-		$this->assertFalse($fv->run());
-		$this->assertNotEmpty($fv->returnErrors());
+        $fv = new FormValidation();
+        $fv->setRule('name', 'name', 'required');
+        $fv->setData(array('name' => ''));
+        $this->assertFalse($fv->run());
+        $this->assertNotEmpty($fv->returnErrors());
     }
 	
 	
-	public function testRequiredRule()
+    public function testRequiredRule()
     {
-		$fv = new FormValidation();
-		$fv->setRule('name', 'name', 'required');
-		$fv->setData(array('name' => ''));
-		$this->assertFalse($fv->run());
+        $fv = new FormValidation();
+        $fv->setRule('name', 'name', 'required');
+        $fv->setData(array('name' => ''));
+        $this->assertFalse($fv->run());
 		
-		$fv = new FormValidation();
-		$fv->setRule('name', 'name', 'required');
-		$fv->setData(array('name' => null));
-		$this->assertFalse($fv->run());
+        $fv = new FormValidation();
+        $fv->setRule('name', 'name', 'required');
+        $fv->setData(array('name' => null));
+        $this->assertFalse($fv->run());
 		
-		$fv = new FormValidation();
-		$fv->setRule('name', 'name', 'required');
-		$fv->setData(array('name' => 'tony'));
-		$this->assertTrue($fv->run());
+        $fv = new FormValidation();
+        $fv->setRule('name', 'name', 'required');
+        $fv->setData(array('name' => 'tony'));
+        $this->assertTrue($fv->run());
     }
 }
\ No newline at end of file

tests/tnhfw/libraries/PaginationTest.php

Indentation +20 added lines, -20 removed lines

@@ -1,31 +1,31 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class PaginationTest extends TestCase
-	{	
+    class PaginationTest 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 testNotYet()
-		{
-			$this->markTestSkipped();
-		}
+        public function testNotYet()
+        {
+            $this->markTestSkipped();
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

tests/tnhfw/CommonTest.php

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

tests/include/testsUtil.php

Indentation +9 added lines, -9 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-	/**
-	* Function to test private & protected method
-	*/
-	function runPrivateOrProtectedMethod($object, $method, array $args = array()){
-		$r = new ReflectionClass(get_class($object));
-		$m = $r->getMethod($method);
-		$m->setAccessible(true);
-		return $m->invokeArgs($object, $args);
-	}
\ No newline at end of file
+    /**
+     * Function to test private & protected method
+     */
+    function runPrivateOrProtectedMethod($object, $method, array $args = array()){
+        $r = new ReflectionClass(get_class($object));
+        $m = $r->getMethod($method);
+        $m->setAccessible(true);
+        return $m->invokeArgs($object, $args);
+    }
\ No newline at end of file

tests/include/common.php

Indentation +201 added lines, -201 removed lines

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

tests/include/autoloader.php

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

config/autoload.php

Indentation +86 added lines, -86 removed lines

@@ -1,94 +1,94 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework created using the concept of codeigniter with bootstrap twitter
-	 *
-	 * 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 created using the concept of codeigniter with bootstrap twitter
+     *
+     * 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 file contains the configuration of resources that you want to load automatically: 
-	* personal or system libraries, configuration files, models, 
-	* personal functions or systems that are used most often in your application 
-	* instead of loading them every time you want to use it.
-	* Note: loading a lot of resources can decrease the performance of your application.
-	*/
+    /**
+     * This file contains the configuration of resources that you want to load automatically: 
+     * personal or system libraries, configuration files, models, 
+     * personal functions or systems that are used most often in your application 
+     * instead of loading them every time you want to use it.
+     * Note: loading a lot of resources can decrease the performance of your application.
+     */
 
 
-	/**
-	* If you have personal libraries or systems to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['libraries'] = array('library1', 'library1');
-	*
-	* Note: Personal libraries have priority over system libraries, 
-	* ie the loading order is as follows: it looks in the folder of the personal libraries, 
-	* if it is found, it is loaded, if not , we search in the system libraries folder, 
-	* before returning an error in case it does not find it.
-	*/
-	$autoload['libraries'] = array();
+    /**
+     * If you have personal libraries or systems to load automatically, then list them in the following array.
+     * For example :
+     *
+     *	$autoload['libraries'] = array('library1', 'library1');
+     *
+     * Note: Personal libraries have priority over system libraries, 
+     * ie the loading order is as follows: it looks in the folder of the personal libraries, 
+     * if it is found, it is loaded, if not , we search in the system libraries folder, 
+     * before returning an error in case it does not find it.
+     */
+    $autoload['libraries'] = array();
 
-	/**
-	* If you have configuration files to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['config'] = array('config1', 'config2');
-	*
-	* Note 1: the file name must have as prefix "config_" 
-	* for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
-	* otherwise the system can not find this configuration file.
-	* For example :
-	*
-	*	$config['key1'] = value1;
-	* 	$config['key2'] = value2;
-	*
-	* Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
-	*/
-	$autoload['config'] = array();
+    /**
+     * If you have configuration files to load automatically, then list them in the following array.
+     * For example :
+     *
+     *	$autoload['config'] = array('config1', 'config2');
+     *
+     * Note 1: the file name must have as prefix "config_" 
+     * for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
+     * otherwise the system can not find this configuration file.
+     * For example :
+     *
+     *	$config['key1'] = value1;
+     * 	$config['key2'] = value2;
+     *
+     * Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
+     */
+    $autoload['config'] = array();
 
-	/**
-	* If you have models to load automatically, then list them in the following table.
-	* For example :
-	*
-	*	$autoload['models'] = array('model1', 'model2');
-	*/
-	$autoload['models'] = array();
+    /**
+     * If you have models to load automatically, then list them in the following table.
+     * For example :
+     *
+     *	$autoload['models'] = array('model1', 'model2');
+     */
+    $autoload['models'] = array();
 
-	/**
-	* If you have system or personal functions to load automatically, specify them in the following array.
-	* For example :
-	*
-	* 	$autoload['functions'] = array('function1', 'function2');
-	*
-	* Note: Personal functions have priority over system functions,
-	* that is to say that the order of loading is the following : it looks in the directory of the personal functions,
-	* if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
-	* before returning an error in case he does not find it.
-	*/
-	$autoload['functions'] = array();
+    /**
+     * If you have system or personal functions to load automatically, specify them in the following array.
+     * For example :
+     *
+     * 	$autoload['functions'] = array('function1', 'function2');
+     *
+     * Note: Personal functions have priority over system functions,
+     * that is to say that the order of loading is the following : it looks in the directory of the personal functions,
+     * if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
+     * before returning an error in case he does not find it.
+     */
+    $autoload['functions'] = array();
 	
-	/**
-	* If you have system or personal language to load automatically, specify them in the following array.
-	* For example :
-	*
-	* 	$autoload['languages'] = array('lang1', 'lang2');
-	*/
-	$autoload['languages'] = array();
+    /**
+     * If you have system or personal language to load automatically, specify them in the following array.
+     * For example :
+     *
+     * 	$autoload['languages'] = array('lang1', 'lang2');
+     */
+    $autoload['languages'] = array();