Level-2 / Transphporm

src/Config.php

Doc Comments +6 added lines

@@ -35,6 +35,9 @@ 
 		return $this->headers;
 	}
 
+	/**
+	 * @return FilePath
+	 */
 	public function getFilePath() {
 		return $this->filePath;
 	}
@@ -63,6 +66,9 @@ 
 		return $this->valueParser;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function registerProperty($name, Property $property) {
 		$this->properties[$name] = $property;
 	}

src/TSSFunction/Template.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
 		$this->xPath = $xPath;
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	private function readArray($array, $index) {
 		return isset($array[$index]) ? $array[$index] : null;
 	}

Braces +11 added lines, -4 removed lines

@@ -25,13 +25,18 @@ 
 		$selector = $this->readArray($args, 1);
 		$tss = $this->readArray($args, 2);
 
-		if (trim($args[0])[0] === '<') $xml = $args[0];
-		else $xml = $this->filePath->getFilePath($args[0]);
+		if (trim($args[0])[0] === '<') {
+			$xml = $args[0];
+		} else {
+			$xml = $this->filePath->getFilePath($args[0]);
+		}
 
 		$newTemplate = new \Transphporm\Builder($xml, $tss ? $this->filePath->getFilePath($tss) : null);
 
 		$doc = $newTemplate->output($this->elementData->getData($element), true)->body;
-		if ($selector != '') return $this->templateSubsection($doc, $selector);
+		if ($selector != '') {
+			return $this->templateSubsection($doc, $selector);
+		}
 
 		return $this->getTemplateContent($doc, $tss);
 
@@ -62,7 +67,9 @@ 
 
 	private function getClonedElement($node, $tss) {
 		$clone = $node->cloneNode(true);
-		if ($tss != null && $clone instanceof \DomElement) $clone->setAttribute('transphporm', 'includedtemplate');
+		if ($tss != null && $clone instanceof \DomElement) {
+			$clone->setAttribute('transphporm', 'includedtemplate');
+		}
 		return $clone;
 	}
 }

src/TSSFunction/Json.php

Indentation +18 added lines, -18 removed lines

@@ -1,29 +1,29 @@
 <?php
 namespace Transphporm\TSSFunction;
 class Json implements \Transphporm\TSSFunction {
-    private $baseDir;
+	private $baseDir;
 
-    public function __construct(\Transphporm\FilePath $filePath) {
-        $this->filePath = $filePath;
-    }
+	public function __construct(\Transphporm\FilePath $filePath) {
+		$this->filePath = $filePath;
+	}
 
-    public function run(array $args, \DomElement $element = null) {
-        $json = $args[0];
+	public function run(array $args, \DomElement $element = null) {
+		$json = $args[0];
 
-        if ($this->isJsonFile($json)) {
-            $path = $this->filePath->getFilePath($json);
-            if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
-            $json = file_get_contents($path);
-        }
+		if ($this->isJsonFile($json)) {
+			$path = $this->filePath->getFilePath($json);
+			if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
+			$json = file_get_contents($path);
+		}
 
-        $map = json_decode($json, true);
+		$map = json_decode($json, true);
 
-        if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
+		if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
 
-        return $map;
-    }
+		return $map;
+	}
 
-    private function isJsonFile($json) {
-        return trim($json)[0] != '{' && trim($json)[0] != '[';
-    }
+	private function isJsonFile($json) {
+		return trim($json)[0] != '{' && trim($json)[0] != '[';
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -12,13 +12,13 @@
 
         if ($this->isJsonFile($json)) {
             $path = $this->filePath->getFilePath($json);
-            if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
+            if (!file_exists($path)) throw new \Exception('File does not exist at: '.$path);
             $json = file_get_contents($path);
         }
 
         $map = json_decode($json, true);
 
-        if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
+        if (!is_array($map)) throw new \Exception('Could not decode json: '.json_last_error_msg());
 
         return $map;
     }

src/Parser/Sheet.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 		if (is_file($tss)) {
 			$this->file = $tss;
 			$this->rules = $this->cache->load($tss);
-			$baseDir = dirname(realpath($tss)) . DIRECTORY_SEPARATOR;
+			$baseDir = dirname(realpath($tss)).DIRECTORY_SEPARATOR;
 			if (empty($this->rules)) $tss = file_get_contents($tss);
 			else return;
 		}

Braces +31 added lines, -13 removed lines

@@ -25,8 +25,11 @@ 
 			$this->file = $tss;
 			$this->rules = $this->cache->load($tss);
 			$baseDir = dirname(realpath($tss)) . DIRECTORY_SEPARATOR;
-			if (empty($this->rules)) $tss = file_get_contents($tss);
-			else return;
+			if (empty($this->rules)) {
+				$tss = file_get_contents($tss);
+			} else {
+				return;
+			}
 		}
 		$this->tss = $this->stripComments($tss, '//', "\n");
 		$this->tss = $this->stripComments($this->tss, '/*', '*/');
@@ -38,7 +41,9 @@ 
 	}
 
 	public function parse($indexStart = 0) {
-		if (!empty($this->rules)) return $this->rules['rules'];
+		if (!empty($this->rules)) {
+			return $this->rules['rules'];
+		}
 		$rules = $this->parseTokens($indexStart);
 		usort($rules, [$this, 'sortRules']);
 		$this->checkError($rules);
@@ -52,12 +57,12 @@ 
 			if ($processing = $this->processingInstructions($token, count($this->rules)+$indexStart)) {
 				$this->rules = array_merge($this->rules, $processing);
 				continue;
-			}
-			else if ($token['type'] === Tokenizer::NEW_LINE) {
+			} else if ($token['type'] === Tokenizer::NEW_LINE) {
 				$line++;
 				continue;
+			} else {
+				$this->addRules($token, $indexStart, $line);
 			}
-			else $this->addRules($token, $indexStart, $line);
 		}
 		return $this->rules;
 	}
@@ -65,14 +70,18 @@ 
 	private function addRules($token, $indexStart, $line) {
 		$selector = $this->tss->from($token['type'], true)->to(Tokenizer::OPEN_BRACE);
 		$this->tss->skip(count($selector));
-		if (count($selector) === 0) return;
+		if (count($selector) === 0) {
+			return;
+		}
 
 		$newRules = $this->cssToRules($selector, count($this->rules)+$indexStart, $this->getProperties($this->tss->current()['value']), $line);
 		$this->rules = $this->writeRule($this->rules, $newRules);
 	}
 
 	private function checkError($rules) {
-		if (empty($rules) && count($this->tss) > 0) throw new \Exception('No TSS rules parsed');
+		if (empty($rules) && count($this->tss) > 0) {
+			throw new \Exception('No TSS rules parsed');
+		}
 	}
 
 	private function CssToRules($selector, $index, $properties, $line) {
@@ -99,7 +108,9 @@ 
 	}
 
 	private function processingInstructions($token, $indexStart) {
-		if ($token['type'] !== Tokenizer::AT_SIGN) return false;
+		if ($token['type'] !== Tokenizer::AT_SIGN) {
+			return false;
+		}
 		$tokens = $this->tss->from(Tokenizer::AT_SIGN, false)->to(Tokenizer::SEMI_COLON, false);
 		$funcName = $tokens->from(Tokenizer::NAME, true)->read();
 		$args = $this->valueParser->parseTokens($tokens->from(Tokenizer::NAME));
@@ -111,8 +122,11 @@ 
 	}
 
 	private function import($args, $indexStart) {
-		if ($this->file !== null) $fileName = $fileName = $this->filePath->getFilePath($args[0]);
-		else $fileName = $args[0];
+		if ($this->file !== null) {
+			$fileName = $fileName = $this->filePath->getFilePath($args[0]);
+		} else {
+			$fileName = $args[0];
+		}
 		$this->import[] = $fileName;
 		$sheet = new Sheet($fileName, $this->baseDir, $this->xPath, $this->valueParser, $this->cache, $this->filePath);
 		return $sheet->parse($indexStart);
@@ -120,7 +134,9 @@ 
 
 	private function sortRules($a, $b) {
 		//If they have the same depth, compare on index
-		if ($a->depth === $b->depth) return $a->index < $b->index ? -1 : 1;
+		if ($a->depth === $b->depth) {
+			return $a->index < $b->index ? -1 : 1;
+		}
 
 		return ($a->depth < $b->depth) ? -1 : 1;
 	}
@@ -129,7 +145,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));
 		}
 

src/FilePath.php

Indentation +8 added lines, -8 removed lines

@@ -2,16 +2,16 @@
 namespace Transphporm;
 
 class FilePath {
-    private $baseDir;
-    private $cwd;
+	private $baseDir;
+	private $cwd;
 
-    public function __construct(&$baseDir, $customBase = null) {
-        $this->baseDir = &$baseDir;
-        if ($customBase === null) $this->customBase = getcwd();
-        else $this->customBase = rtrim($customBase, '/');
-    }
+	public function __construct(&$baseDir, $customBase = null) {
+		$this->baseDir = &$baseDir;
+		if ($customBase === null) $this->customBase = getcwd();
+		else $this->customBase = rtrim($customBase, '/');
+	}
 
-    public function getFilePath($filePath = "") {
+	public function getFilePath($filePath = "") {
 		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase . $filePath;
 		else return $this->baseDir . $filePath;
 	}

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@
     }
 
     public function getFilePath($filePath = "") {
-		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase . $filePath;
-		else return $this->baseDir . $filePath;
+		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase.$filePath;
+		else return $this->baseDir.$filePath;
 	}
 }

Braces +10 added lines, -4 removed lines

@@ -7,12 +7,18 @@
 
     public function __construct(&$baseDir, $customBase = null) {
         $this->baseDir = &$baseDir;
-        if ($customBase === null) $this->customBase = getcwd();
-        else $this->customBase = rtrim($customBase, '/');
+        if ($customBase === null) {
+        	$this->customBase = getcwd();
+        } else {
+        	$this->customBase = rtrim($customBase, '/');
+        }
     }
 
     public function getFilePath($filePath = "") {
-		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase . $filePath;
-		else return $this->baseDir . $filePath;
+		if (isset($filePath[0]) && $filePath[0] == "/") {
+			return $this->customBase . $filePath;
+		} else {
+			return $this->baseDir . $filePath;
+		}
 	}
 }