Level-2 / Transphporm

src/TSSValidator.php

Indentation +36 added lines, -36 removed lines

@@ -2,56 +2,56 @@
 namespace Transphporm;
 use Transphporm\Parser\Tokenizer;
 class TSSValidator {
-    private $error;
+	private $error;
 
-    public function validate($tss) {
-        $this->error = null;
-        $tokens = $this->tokenize($tss);
+	public function validate($tss) {
+		$this->error = null;
+		$tokens = $this->tokenize($tss);
 
-        foreach ($tokens as $token)
-            if (!$this->validateRule($token)) return false;
+		foreach ($tokens as $token)
+			if (!$this->validateRule($token)) return false;
 
-        return true;
-    }
+		return true;
+	}
 
-    public function getLastError() {
-        return $this->error;
-    }
+	public function getLastError() {
+		return $this->error;
+	}
 
-    private function validateRule($token) {
-        if ($token['type'] !== Tokenizer::OPEN_BRACE) return true;
+	private function validateRule($token) {
+		if ($token['type'] !== Tokenizer::OPEN_BRACE) return true;
 
-        return $this->checkBraces($token) && $this->checkSemicolons($token)
-            && $this->checkParenthesis($token);
-    }
+		return $this->checkBraces($token) && $this->checkSemicolons($token)
+			&& $this->checkParenthesis($token);
+	}
 
-    private function checkBraces($token) {
-        return strpos($token['string'], '{') === false;
-    }
+	private function checkBraces($token) {
+		return strpos($token['string'], '{') === false;
+	}
 
-    private function checkSemicolons($braceToken) {
-        $prevSemicolon = true;
-        foreach ($braceToken['value'] as $token) {
-            if ($token['type'] === Tokenizer::SEMI_COLON) $prevSemicolon = true;
-            if ($token['type'] === Tokenizer::COLON && !$prevSemicolon) return false;
-            else if ($token['type'] === Tokenizer::COLON) $prevSemicolon = false;
-        }
-        return true;
-    }
+	private function checkSemicolons($braceToken) {
+		$prevSemicolon = true;
+		foreach ($braceToken['value'] as $token) {
+			if ($token['type'] === Tokenizer::SEMI_COLON) $prevSemicolon = true;
+			if ($token['type'] === Tokenizer::COLON && !$prevSemicolon) return false;
+			else if ($token['type'] === Tokenizer::COLON) $prevSemicolon = false;
+		}
+		return true;
+	}
 
-    private function checkParenthesis($token) {
-        return substr_count($token['string'], '(') === substr_count($token['string'], ')');
-    }
+	private function checkParenthesis($token) {
+		return substr_count($token['string'], '(') === substr_count($token['string'], ')');
+	}
 
-    private function tokenize($tss) {
-        if (is_file($tss)) $tss = file_get_contents($tss);
-        $tss = $this->stripComments($tss, '//', "\n");
+	private function tokenize($tss) {
+		if (is_file($tss)) $tss = file_get_contents($tss);
+		$tss = $this->stripComments($tss, '//', "\n");
 		$tss = $this->stripComments($tss, '/*', '*/');
 		$tokenizer = new Tokenizer($tss);
 		return $tokenizer->getTokens();
-    }
+	}
 
-    private function stripComments($str, $open, $close) {
+	private function stripComments($str, $open, $close) {
 		$pos = 0;
 		while (($pos = strpos($str, $open, $pos)) !== false) {
 			$end = strpos($str, $close, $pos);

Braces +20 added lines, -8 removed lines

@@ -8,8 +8,9 @@ 
         $this->error = null;
         $tokens = $this->tokenize($tss);
 
-        foreach ($tokens as $token)
-            if (!$this->validateRule($token)) return false;
+        foreach ($tokens as $token) {
+                    if (!$this->validateRule($token)) return false;
+        }
 
         return true;
     }
@@ -19,7 +20,9 @@ 
     }
 
     private function validateRule($token) {
-        if ($token['type'] !== Tokenizer::OPEN_BRACE) return true;
+        if ($token['type'] !== Tokenizer::OPEN_BRACE) {
+        	return true;
+        }
 
         return $this->checkBraces($token) && $this->checkSemicolons($token)
             && $this->checkParenthesis($token);
@@ -32,9 +35,14 @@ 
     private function checkSemicolons($braceToken) {
         $prevSemicolon = true;
         foreach ($braceToken['value'] as $token) {
-            if ($token['type'] === Tokenizer::SEMI_COLON) $prevSemicolon = true;
-            if ($token['type'] === Tokenizer::COLON && !$prevSemicolon) return false;
-            else if ($token['type'] === Tokenizer::COLON) $prevSemicolon = false;
+            if ($token['type'] === Tokenizer::SEMI_COLON) {
+            	$prevSemicolon = true;
+            }
+            if ($token['type'] === Tokenizer::COLON && !$prevSemicolon) {
+            	return false;
+            } else if ($token['type'] === Tokenizer::COLON) {
+            	$prevSemicolon = false;
+            }
         }
         return true;
     }
@@ -44,7 +52,9 @@ 
     }
 
     private function tokenize($tss) {
-        if (is_file($tss)) $tss = file_get_contents($tss);
+        if (is_file($tss)) {
+        	$tss = file_get_contents($tss);
+        }
         $tss = $this->stripComments($tss, '//', "\n");
 		$tss = $this->stripComments($tss, '/*', '*/');
 		$tokenizer = new Tokenizer($tss);
@@ -55,7 +65,9 @@ 
 		$pos = 0;
 		while (($pos = strpos($str, $open, $pos)) !== false) {
 			$end = strpos($str, $close, $pos);
-			if ($end === false) break;
+			if ($end === false) {
+				break;
+			}
 			$str = substr_replace($str, '', $pos, $end-$pos+strlen($close));
 		}