Level-2 / Transphporm

src/FunctionSet.php

Braces +4 added lines, -3 removed lines

@@ -26,11 +26,12 @@
 	private function getArgs0($name, $args) {
 		if (isset($this->functions[$name]) && !($this->functions[$name] instanceof TSSFunction\Data)) {
 			$tokens = $args[0];
-			if ($tokens->count() == 0) return [];
+			if ($tokens->count() == 0) {
+				return [];
+			}
 			$parser = new \Transphporm\Parser\Value($this);
 			return $parser->parseTokens($tokens, $this->elementData->getData($this->element));
-		}
-		else {
+		} else {
 			return iterator_to_array($args[0]);
 		}
 

src/Parser/Sheet.php

Doc Comments +10 added lines

@@ -30,6 +30,9 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $indexStart
+	 */
 	private function parseTokens($indexStart) {
 		$this->rules = [];
 		foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) {
@@ -55,6 +58,10 @@ 
 		if (empty($rules) && count($this->tss) > 0) throw new \Exception('No TSS rules parsed');
 	}
 
+	/**
+	 * @param Tokens $selector
+	 * @param integer $index
+	 */
 	private function CssToRules($selector, $index, $properties, $line) {
 		$parts = $selector->trim()->splitOnToken(Tokenizer::ARG);
 		$rules = [];
@@ -78,6 +85,9 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $indexStart
+	 */
 	private function processingInstructions($token, $indexStart) {
 		if ($token['type'] !== Tokenizer::AT_SIGN) return false;
 		$tokens = $this->tss->from(Tokenizer::AT_SIGN, false)->to(Tokenizer::SEMI_COLON, false);

Indentation +9 added lines, -9 removed lines

@@ -104,15 +104,15 @@
 	}
 
 	private function getProperties($tokens) {
-        $rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
+		$rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
 
-        $return = [];
-        foreach ($rules as $rule) {
-            $name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
-            $tokens = $rule->from(Tokenizer::COLON)->trim();
-            if (count($tokens) > 0) $return[$name] = $rule->from(Tokenizer::COLON)->trim();
-        }
+		$return = [];
+		foreach ($rules as $rule) {
+			$name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
+			$tokens = $rule->from(Tokenizer::COLON)->trim();
+			if (count($tokens) > 0) $return[$name] = $rule->from(Tokenizer::COLON)->trim();
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 }

Braces +17 added lines, -6 removed lines

@@ -25,7 +25,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);
 		$this->checkError($rules);
 		return $rules;
@@ -36,8 +38,9 @@ 
 		foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) {
 			if ($processing = $this->processingInstructions($token, count($this->rules)+$indexStart)) {
 				$this->rules = array_merge($this->rules, $processing);
+			} else if (!in_array($token['type'], [Tokenizer::NEW_LINE, Tokenizer::AT_SIGN])) {
+				$this->addRules($token, $indexStart++);
 			}
-			else if (!in_array($token['type'], [Tokenizer::NEW_LINE, Tokenizer::AT_SIGN])) $this->addRules($token, $indexStart++);
 		}
 
 		return $this->rules;
@@ -47,13 +50,17 @@ 
 		$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']), $token['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) {
@@ -80,7 +87,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();
 		$funcToks = $tokens->from(Tokenizer::NAME);
@@ -110,7 +119,9 @@ 
         foreach ($rules as $rule) {
             $name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
             $tokens = $rule->from(Tokenizer::COLON)->trim();
-            if (count($tokens) > 0) $return[$name] = $rule->from(Tokenizer::COLON)->trim();
+            if (count($tokens) > 0) {
+            	$return[$name] = $rule->from(Tokenizer::COLON)->trim();
+            }
         }
 
         return $return;

src/Builder.php

Braces +12 added lines, -4 removed lines

@@ -27,7 +27,9 @@ 
 		$this->cache = new Cache(new \ArrayObject());
 		$this->filePath = new FilePath();
 		$modules = is_array($modules) ? $modules : $this->defaultModules;
-		foreach ($modules as $module) $this->loadModule(new $module);
+		foreach ($modules as $module) {
+			$this->loadModule(new $module);
+		}
 	}
 
 	//Allow setting the time used by Transphporm for caching. This is for testing purposes
@@ -80,7 +82,9 @@ 
 		$valueParser = new Parser\Value($functionSet);
 		$this->config = new Config($functionSet, $valueParser, $elementData, new Hook\Formatter(), new Parser\CssToXpath($functionSet, $template->getPrefix(), md5($this->tss)), $this->filePath, $headers);
 
-		foreach ($this->modules as $module) $module->load($this->config);
+		foreach ($this->modules as $module) {
+			$module->load($this->config);
+		}
 		return $template;
 	}
 
@@ -94,7 +98,9 @@ 
 	//Load a template, firstly check if it's a file or a valid string
 	private function loadTemplate() {
         $result = ['cache' => $this->template, 'headers' => []];
-		if (strpos($this->template, "\n") === false && is_file($this->template)) $result = $this->loadTemplateFromFile($this->template);
+		if (strpos($this->template, "\n") === false && is_file($this->template)) {
+			$result = $this->loadTemplateFromFile($this->template);
+		}
 		return $result;
 	}
 
@@ -113,6 +119,8 @@ 
 
 	public function __destruct() {
 		//Required hack as DomXPath can only register static functions clear the statically stored instance to avoid memory leaks
-		if (isset($this->config)) $this->config->getCssToXpath()->cleanup();
+		if (isset($this->config)) {
+			$this->config->getCssToXpath()->cleanup();
+		}
 	}
 }

Indentation +8 added lines, -8 removed lines

@@ -42,9 +42,9 @@ 
 	}
 
 	public function setLocale($locale) {
-        $format = new \Transphporm\Module\Format($locale);
-        $this->modules[get_class($format)] = $format;
-    }
+		$format = new \Transphporm\Module\Format($locale);
+		$this->modules[get_class($format)] = $format;
+	}
 
 	public function addPath($dir) {
 		$this->filePath->addPath($dir);
@@ -100,15 +100,15 @@ 
 
 	//Load a template, firstly check if it's a file or a valid string
 	private function loadTemplate() {
-        $result = ['cache' => $this->template, 'headers' => []];
+		$result = ['cache' => $this->template, 'headers' => []];
 		if (strpos($this->template, "\n") === false && is_file($this->template)) $result = $this->loadTemplateFromFile($this->template);
 		return $result;
 	}
 
-    private function loadTemplateFromFile($file) {
-        $xml = $this->cache->load($this->cacheKey . $file, filemtime($file));
-        return $xml ? $xml : ['cache' => file_get_contents($file) ?: "", 'headers' => []];
-    }
+	private function loadTemplateFromFile($file) {
+		$xml = $this->cache->load($this->cacheKey . $file, filemtime($file));
+		return $xml ? $xml : ['cache' => file_get_contents($file) ?: "", 'headers' => []];
+	}
 
 	public function setCache(\ArrayAccess $cache) {
 		$this->cache = new Cache($cache);

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 			   'headers' => array_merge($result['headers'], $headers),
 			   'body' => $this->doPostProcessing($template)->output($document)
 			];
-			$this->cache->write($tssCache->getCacheKey($data) . $this->template, $result);
+			$this->cache->write($tssCache->getCacheKey($data).$this->template, $result);
 		}
 		unset($result['cache'], $result['renderTime']);
 		return (object) $result;
@@ -82,7 +82,7 @@ 
 		$elementData = new \Transphporm\Hook\ElementData(new \SplObjectStorage(), $data);
 		$functionSet = new FunctionSet($elementData);
 		//To be a valid XML document it must have a root element, automatically wrap it in <template> to ensure it does
-		$template = new Template($this->isValidDoc($body) ? str_ireplace('<!doctype', '<!DOCTYPE', $body) : '<template>' . $body . '</template>' );
+		$template = new Template($this->isValidDoc($body) ? str_ireplace('<!doctype', '<!DOCTYPE', $body) : '<template>'.$body.'</template>');
 
 		$valueParser = new Parser\Value($functionSet);
 		$this->config = new Config($functionSet, $valueParser, $elementData, new Hook\Formatter(), new Parser\CssToXpath($functionSet, $template->getPrefix(), md5($this->tss)), $this->filePath, $headers);
@@ -106,7 +106,7 @@ 
 	}
 
     private function loadTemplateFromFile($file) {
-        $xml = $this->cache->load($this->cacheKey . $file, filemtime($file));
+        $xml = $this->cache->load($this->cacheKey.$file, filemtime($file));
         return $xml ? $xml : ['cache' => file_get_contents($file) ?: "", 'headers' => []];
     }
 

src/Property/Content.php

Braces +19 added lines, -10 removed lines

@@ -14,7 +14,9 @@ 
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if (!$this->shouldRun($element)) return false;
+		if (!$this->shouldRun($element)) {
+			return false;
+		}
 
 		$values = $this->formatter->format($values, $rules);
 
@@ -25,14 +27,17 @@ 
 			if ($this->getContentMode($rules) === 'replace') {
 				$contentReplace = new ContentReplace($this);
 				$contentReplace->replaceContent($element, $values);
+			} else {
+				$this->appendContent($element, $values);
 			}
-			else $this->appendContent($element, $values);
 		}
 	}
 
 	private function shouldRun($element) {
 		do {
-			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
+			if ($element->getAttribute('transphporm') == 'includedtemplate') {
+				return false;
+			}
 		}
 		while (($element = $element->parentNode) instanceof \DomElement);
 		return true;
@@ -59,9 +64,10 @@ 
 	public function getNode($node, $document) {
 		foreach ($node as $n) {
 			if (is_array($n)) {
-				foreach ($this->getNode($n, $document) as $new) yield $new;
-			}
-			else {
+				foreach ($this->getNode($n, $document) as $new) {
+					yield $new;
+				}
+			} else {
 				yield $this->convertNode($n, $document);
 			}
 		}
@@ -70,9 +76,10 @@ 
 	private function convertNode($node, $document) {
 		if ($node instanceof \DomElement || $node instanceof \DOMComment) {
 			$new = $document->importNode($node, true);
-		}
-		else {
-			if ($node instanceof \DomText) $node = $node->nodeValue;
+		} else {
+			if ($node instanceof \DomText) {
+				$node = $node->nodeValue;
+			}
 			$new = $document->createElement('text');
 
 			$new->appendChild($document->createTextNode($node));
@@ -89,6 +96,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }
\ No newline at end of file

src/Property/ContentReplace.php

Braces +6 added lines, -2 removed lines

@@ -13,7 +13,9 @@ 
 	}
 
 	public function replaceContent($element, $content) {
-		if ($element->getAttribute('transphporm') == 'added') return;
+		if ($element->getAttribute('transphporm') == 'added') {
+			return;
+		}
 		//If this rule was cached, the elements that were added last time need to be removed prior to running the rule again.
 		if ($element->getAttribute('transphporm')) {
 			$this->replaceCachedContent($element);
@@ -27,7 +29,9 @@ 
 
 	private function insertNodes($element, $content) {
 		foreach ($this->content->getNode($content, $element->ownerDocument) as $node) {
-			if ($node instanceof \DomElement && !$node->getAttribute('transphporm'))  $node->setAttribute('transphporm', 'added');
+			if ($node instanceof \DomElement && !$node->getAttribute('transphporm')) {
+				$node->setAttribute('transphporm', 'added');
+			}
 			$element->parentNode->insertBefore($node, $element);
 		}
 	}

src/SheetLoader/SheetLoader.php

Doc Comments +12 added lines

@@ -42,6 +42,9 @@ 
 	}
 
 
+	/**
+	 * @param \Transphporm\Template $template
+	 */
 	public function processRules($template, \Transphporm\Config $config) {
 		$rules = $this->getRules($config->getCssToXpath(), $config->getValueParser());
 
@@ -57,11 +60,20 @@ 
 	}
 
 	//Load the TSS
+
+	/**
+	 * @param \Transphporm\Parser\CssToXpath $cssToXpath
+	 * @param \Transphporm\Parser\Value $valueParser
+	 */
 	public function getRules($cssToXpath, $valueParser, $indexStart = 0) {
 		return $this->tss->getRules($cssToXpath, $valueParser, $this, $indexStart);
 	}
 
 	//Process a TSS rule e.g. `ul li {content: "foo"; format: bar}
+
+	/**
+	 * @param \Transphporm\Config $config
+	 */
 	private function executeTssRule($rule, $template, $config) {
 		$rule->touch();
 

Spacing +1 added lines, -1 removed lines

@@ -84,6 +84,6 @@
 
 
 	private function sortPseudo($a, $b) {
-		return count($a->pseudo) > count($b->pseudo)  ? 1 : -1;
+		return count($a->pseudo) > count($b->pseudo) ? 1 : -1;
 	}
 }

Braces +13 added lines, -5 removed lines

@@ -39,8 +39,9 @@ 
 			if ($token['type'] == \Transphporm\Parser\Tokenizer::NAME && $token['value'] == 'data') {
 				$tokens->next();
 				$newTokens = array_merge($newTokens, iterator_to_array($tokens->current()['value']));
+			} else {
+				$newTokens[] = $token;
 			}
-			else $newTokens[] = $token;
 		}
 
 		$this->tss->setCacheKey(new \Transphporm\Parser\Tokens($newTokens));
@@ -58,7 +59,9 @@ 
 		usort($rules, [$this, 'sortRules']);
 
 		foreach ($rules as $rule) {
-			if ($rule->shouldRun($this->time)) $this->executeTssRule($rule, $template, $config);
+			if ($rule->shouldRun($this->time)) {
+				$this->executeTssRule($rule, $template, $config);
+			}
 		}
 
 		//if (is_file($this->tss)) $this->write($this->tss, $rules, $this->import);
@@ -83,10 +86,15 @@ 
 
 	private function sortRules($a, $b) {
 		//If they have the same depth, compare on index
-		if ($a->query === $b->query) return $this->sortPseudo($a, $b);
+		if ($a->query === $b->query) {
+			return $this->sortPseudo($a, $b);
+		}
 
-		if ($a->depth === $b->depth) $property = 'index';
-		else $property = 'depth';
+		if ($a->depth === $b->depth) {
+			$property = 'index';
+		} else {
+			$property = 'depth';
+		}
 
 		return ($a->$property < $b->$property) ? -1 : 1;
 	}

Indentation +11 added lines, -11 removed lines

@@ -7,17 +7,17 @@
 namespace Transphporm\SheetLoader;
 //Separates out TSS file loading/caching from parsing
 class SheetLoader {
-    private $tss;
-    private $filePath;
-    private $time;
-    private $import = [];
-
-    public function __construct(\Transphporm\Cache $cache, \Transphporm\FilePath $filePath, TSSRules $tss, $time) {
-    	$this->cache = $cache;
-        $this->filePath = $filePath;
-        $this->tss = $tss;
-        $this->time = isset($time) ? $time : time();
-    }
+	private $tss;
+	private $filePath;
+	private $time;
+	private $import = [];
+
+	public function __construct(\Transphporm\Cache $cache, \Transphporm\FilePath $filePath, TSSRules $tss, $time) {
+		$this->cache = $cache;
+		$this->filePath = $filePath;
+		$this->tss = $tss;
+		$this->time = isset($time) ? $time : time();
+	}
 
 	//Allows controlling whether any updates are required to the template
 	//e.g. return false

src/Parser/Tokenizer/Brackets.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 class Brackets implements \Transphporm\Parser\Tokenizable {
 
-	private $types =  [
+	private $types = [
 			Tokenizer::OPEN_BRACKET => ['(', ')'],
 			Tokenizer::OPEN_BRACE => ['{', '}'],
 			Tokenizer::OPEN_SQUARE_BRACKET => ['[', ']']

src/SheetLoader/TSSFile.php

Indentation +5 added lines, -5 removed lines

@@ -17,8 +17,8 @@ 
 		$this->fileName = $fileName;
 		$this->filePath = $filePath;
 		$this->cache = $cache;
-	    $this->time = isset($time) ? $time : time();
-	    $this->cacheName = $this->fileName;
+		$this->time = isset($time) ? $time : time();
+		$this->cacheName = $this->fileName;
 	}
 
 	private function getRulesFromCache($file) {
@@ -77,15 +77,15 @@ 
 	}
 
 	//write the sheet to cache
-    public function write($rules, $imports = []) {
+	public function write($rules, $imports = []) {
 		$existing = $this->cache->load($this->fileName, filemtime($this->fileName));
 		if (isset($existing['import']) && empty($imports)) $imports = $existing['import'];
 		$this->cache->write($this->cacheName, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => $this->time, 'cacheKey' => $this->cacheKey]);
 
 		return $rules;
-    }
+	}
 
-    //Gets the minimum update-frequency for a sheet's rules
+	//Gets the minimum update-frequency for a sheet's rules
 	private function getMinUpdateFreq($rules) {
 		$min = \PHP_INT_MAX;
 

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		if ($this->cacheKey) {
 			$parser = new \Transphporm\Parser\Value($data);
 			$cacheKey = $parser->parseTokens($this->cacheKey)[0];
-			$this->cacheName = $cacheKey . $this->fileName;
+			$this->cacheName = $cacheKey.$this->fileName;
 			return $cacheKey;
 		}
 		else return $this->fileName;

Braces +22 added lines, -8 removed lines

@@ -32,7 +32,9 @@ 
 		if ($rules) {
 			foreach ($rules['import'] as $file) {
 				//Check that the import file hasn't been changed since the cache was written
-				if (filemtime($file) > $rules['ctime']) return false;
+				if (filemtime($file) > $rules['ctime']) {
+					return false;
+				}
 			}
 		}
 
@@ -48,10 +50,14 @@ 
 
 		$rules = $this->getRulesFromCache($this->fileName);
 		//Nothing was cached or the TSS file has changed, update is required
-		if (empty($rules)) return true;
+		if (empty($rules)) {
+			return true;
+		}
 
 		//Find the sheet's minimum update-frequency, if it hasn't passed then no updates are required
-		if ($rules['ctime']+$rules['minFreq'] <= $this->time) return true;
+		if ($rules['ctime']+$rules['minFreq'] <= $this->time) {
+			return true;
+		}
 
 		return false;
 	}
@@ -63,15 +69,19 @@ 
 			$cacheKey = $parser->parseTokens($this->cacheKey)[0];
 			$this->cacheName = $cacheKey . $this->fileName;
 			return $cacheKey;
+		} else {
+			return $this->fileName;
 		}
-		else return $this->fileName;
 	}
 
 	public function getRules($cssToXpath, $valueParser, $sheetLoader, $indexStart) {
 		$rules = $this->getRulesFromCache($this->fileName);
 		$this->filePath->addPath(dirname(realpath($this->fileName)));
-		if (empty($rules)) $tss = file_get_contents($this->fileName);
-		else return $rules['rules'];
+		if (empty($rules)) {
+			$tss = file_get_contents($this->fileName);
+		} else {
+			return $rules['rules'];
+		}
 
 		return $tss == null ? [] : (new \Transphporm\Parser\Sheet($tss, $cssToXpath, $valueParser, $this->filePath, $sheetLoader))->parse($indexStart);
 	}
@@ -79,7 +89,9 @@ 
 	//write the sheet to cache
     public function write($rules, $imports = []) {
 		$existing = $this->cache->load($this->fileName, filemtime($this->fileName));
-		if (isset($existing['import']) && empty($imports)) $imports = $existing['import'];
+		if (isset($existing['import']) && empty($imports)) {
+			$imports = $existing['import'];
+		}
 		$this->cache->write($this->cacheName, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => $this->time, 'cacheKey' => $this->cacheKey]);
 
 		return $rules;
@@ -91,7 +103,9 @@ 
 
 		foreach ($rules as $rule) {
 			$ruleFreq = $rule->getUpdateFrequency();
-			if ($ruleFreq < $min) $min = $ruleFreq;
+			if ($ruleFreq < $min) {
+				$min = $ruleFreq;
+			}
 		}
 
 		return $min;

src/TSSFunction/Constant.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	public function run(array $args, \DomElement $element) {
 		$const_name = strtoupper(trim($args[0]));
 		if (!defined($const_name)) {
-			throw new \Exception($const_name . ' is not a defined constant');
+			throw new \Exception($const_name.' is not a defined constant');
 		}
 		return constant($const_name);
 	}