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/Builder.php

Doc Comments +4 added lines

@@ -85,6 +85,10 @@
 	}
 
 	//Add a postprocessing hook. This cleans up anything transphporm has added to the markup which needs to be removed
+
+	/**
+	 * @param Template $template
+	 */
 	private function doPostProcessing($template) {
 		$template->addHook('//*[@transphporm]', new Hook\PostProcess());
 		return $template;

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);
@@ -97,15 +97,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 . $this->template, filemtime($this->template));
-        return $xml ? $xml : ['cache' => file_get_contents($this->template) ?: "", 'headers' => []];
-    }
+	private function loadTemplateFromFile($file) {
+		$xml = $this->cache->load($this->cacheKey . $this->template, filemtime($this->template));
+		return $xml ? $xml : ['cache' => file_get_contents($this->template) ?: "", '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 . $this->template, filemtime($this->template));
+        $xml = $this->cache->load($this->cacheKey.$this->template, filemtime($this->template));
         return $xml ? $xml : ['cache' => file_get_contents($this->template) ?: "", '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();
 

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 = $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 = $time ?? time();
+	}
 
 	//Allows controlling whether any updates are required to the template
 	//e.g. return false

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;
 	}

src/SheetLoader/TSSFile.php

Doc Comments +4 added lines

@@ -12,6 +12,10 @@
 	private $cache;
 	private $time;
 
+	/**
+	 * @param string $fileName
+	 * @param \Transphporm\Cache $cache
+	 */
 	public function __construct($fileName, \Transphporm\FilePath $filePath, $cache, $time) {
 		$this->fileName = $fileName;
 		$this->filePath = $filePath;

Indentation +5 added lines, -5 removed lines

@@ -16,8 +16,8 @@ 
 		$this->fileName = $fileName;
 		$this->filePath = $filePath;
 		$this->cache = $cache;
-	    $this->time = $time ?? time();
-	    $this->cacheName = $this->fileName;
+		$this->time = $time ?? time();
+		$this->cacheName = $this->fileName;
 	}
 
 	private function getRulesFromCache($file) {
@@ -74,16 +74,16 @@ 
 	}
 
 	//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 +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	}
 
 	public function updateRequired($data) {
-		$this->cacheName = $this->getCacheKey($data) . $this->fileName;
+		$this->cacheName = $this->getCacheKey($data).$this->fileName;
 
 		$rules = $this->getRulesFromCache($this->fileName, $data);
 		//Nothing was cached or the TSS file has changed, update is required
@@ -58,7 +58,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 '';

Braces +22 added lines, -8 removed lines

@@ -29,7 +29,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;
+				}
 			}
 		}
 
@@ -45,10 +47,14 @@ 
 
 		$rules = $this->getRulesFromCache($this->fileName, $data);
 		//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;
 	}
@@ -60,15 +66,19 @@ 
 			$cacheKey = $parser->parseTokens($this->cacheKey)[0];
 			$this->cacheName = $cacheKey . $this->fileName;
 			return $cacheKey;
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 	public function getRules($cssToXpath, $valueParser, $sheetLoader, $indexStart) {
 		$rules = $this->getRulesFromCache($this->fileName)['rules'];
 		$this->filePath->addPath(dirname(realpath($this->fileName)));
-		if (empty($rules)) $tss = file_get_contents($this->fileName);
-		else return $rules;
+		if (empty($rules)) {
+			$tss = file_get_contents($this->fileName);
+		} else {
+			return $rules;
+		}
 
 		return $tss == null ? [] : (new \Transphporm\Parser\Sheet($tss, $cssToXpath, $valueParser, $this->filePath, $sheetLoader))->parse($indexStart);
 	}
@@ -76,7 +86,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;
@@ -88,7 +100,9 @@ 
 
 		foreach ($rules as $rule) {
 			$ruleFreq = $rule->getUpdateFrequency();
-			if ($ruleFreq < $min) $min = $ruleFreq;
+			if ($ruleFreq < $min) {
+				$min = $ruleFreq;
+			}
 		}
 
 		return $min;

src/SheetCache.php

Indentation +5 added lines, -5 removed lines

@@ -44,17 +44,17 @@
 
 
 	//write the sheet to cache
-    public function write($file, $rules, $imports = []) {
+	public function write($file, $rules, $imports = []) {
 		if (is_file($file)) {
 			$existing = $this->cache->load($file, filemtime($file));
 			if (isset($existing['import'])) $imports = $existing['import'];
 			$this->cache->write($this->cacheName, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => $this->time, 'cacheKey' => $this->cacheKey]);
 		}
 		return $rules;
-    }
+	}
 
-    public function setKey($key) {
-    	$this->cacheKey = $key;
-    }
+	public function setKey($key) {
+		$this->cacheKey = $key;
+	}
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

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

Braces +11 added lines, -4 removed lines

@@ -24,7 +24,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;
+				}
 			}
 		}
 		return $rules;
@@ -32,14 +34,17 @@ 
 
 	public function getCacheKey($tss, $data) {
 		//Read the rules so that $this->cacheKey is set
-		if (is_file($tss)) $this->getRulesFromCache($tss);
+		if (is_file($tss)) {
+			$this->getRulesFromCache($tss);
+		}
 		if ($this->cacheKey) {
 			$parser = new Parser\Value($data);
 			$parsedKey = $parser->parseTokens($this->cacheKey)[0];
 			$this->cacheName = $parsedKey . $this->tss;
 			return $parsedKey;
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 
@@ -47,7 +52,9 @@ 
     public function write($file, $rules, $imports = []) {
 		if (is_file($file)) {
 			$existing = $this->cache->load($file, filemtime($file));
-			if (isset($existing['import'])) $imports = $existing['import'];
+			if (isset($existing['import'])) {
+				$imports = $existing['import'];
+			}
 			$this->cache->write($this->cacheName, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => $this->time, 'cacheKey' => $this->cacheKey]);
 		}
 		return $rules;