updates

Author: webdevlabs

.codeclimate.yml

@@ -13,4 +13,4 @@ engines:
         enabled: false
       CleanCode/StaticAccess:
         enabled: false
-                        
+                                

.htaccess

@@ -2,4 +2,4 @@
     RewriteEngine On
 
     RewriteRule ^(.*)$ public/$1 [L]
-</IfModule>
+</IfModule>

.travis.yml

@@ -17,4 +17,3 @@ before_script:
   - composer self-update
   - composer update
 script: phpunit Test.php
-  

Test.php

@@ -11,4 +11,3 @@ public function testOnePlusOne() {
 		$this->assertEquals(1+1,2);
   	}
 }
-?>

app/HomeController.php

@@ -20,4 +20,4 @@ public function showIndex()
         $this->template->display('layout.tpl');
     }    
 
-}
+}

system/Validation.php

@@ -35,13 +35,13 @@ public function __construct($formrequest)
 	public function addRule($field, $errorMessage, $rules = array()) 
 	{
 		if (count($this->request) == 0) {
-			throw new Exception("The array of post parameters is empty");
+			throw new \Exception("The array of post parameters is empty");
 		}
 		if ($field == '') {
-			throw new Exception("field parameter is empty");
+			throw new \Exception("field parameter is empty");
 		}
-		if (!is_array($rules) or empty($rules)) {
-			throw new Exception("The array of rules parameter is empty");
+		if (!is_array($rules) || empty($rules)) {
+			throw new \Exception("The array of rules parameter is empty");
 		}
 		$errorMessage = ($errorMessage == '') ? $field : $errorMessage;
 		$this->fields[] = array(
@@ -76,10 +76,10 @@ public function createRule($rulename, $errorMessage, $callback)
 	public function validate() 
 	{
 		if (count($this->request) == 0) {
-			throw new Exception("The array of post parameters is empty");
+			throw new \Exception("The array of post parameters is empty");
 		}
 		if (count($this->fields) == 0) {
-			throw new Exception("Validation rules is not set");
+			throw new \Exception("Validation rules is not set");
 		}
 		foreach ($this->fields as $field) {
 			$fieldName = $field['name'];
@@ -106,7 +106,7 @@ public function validate()
 			$output = call_user_func($rule['callback']);
 			if ($output !== true && $rule['name'] !== '') {
 				// if empty errorMessage, then get errors array from callback output
-				if ($rule['name'] == $rule['errorMessage'] and is_array($output)) {
+				if ($rule['name'] == $rule['errorMessage'] && is_array($output)) {
 					//								$errnum='0';
 					foreach ($output as $rulekey => $errmsg) {
 						//									$errnum++;

system/ValidationMethods.php

@@ -66,4 +66,3 @@ function validURI($input) {
 		return (preg_match("#^[a-zA-ZA-y0-9_-]+$#", $input) == 1);
 	}
 }
-?>