Level-2 / Transphporm

src/FilePath.php

Spacing +3 added lines, -3 removed lines

@@ -19,15 +19,15 @@
 
 	public function getFilePath($filePath) {
 		if (is_file($filePath)) return $filePath;
-		else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
+		else if (is_file($this->baseDir.DIRECTORY_SEPARATOR.$filePath)) return $this->baseDir.DIRECTORY_SEPARATOR.$filePath;
 		else return $this->loadFromPaths($filePath);
 	}
 
 	private function loadFromPaths($filePath) {
 		foreach ($this->paths as $path) {
-			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath;
+			if (is_file($path.DIRECTORY_SEPARATOR.$filePath)) return $path.DIRECTORY_SEPARATOR.$filePath;
 		}
 
-		throw new \Exception('File ' . $filePath . ' not found in paths (' . implode(', ', $this->paths) . ')');
+		throw new \Exception('File '.$filePath.' not found in paths ('.implode(', ', $this->paths).')');
 	}
 }

Braces +10 added lines, -4 removed lines

@@ -18,14 +18,20 @@
 	}
 
 	public function getFilePath($filePath) {
-		if (is_file($filePath)) return $filePath;
-		else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
-		else return $this->loadFromPaths($filePath);
+		if (is_file($filePath)) {
+			return $filePath;
+		} else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) {
+			return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
+		} else {
+			return $this->loadFromPaths($filePath);
+		}
 	}
 
 	private function loadFromPaths($filePath) {
 		foreach ($this->paths as $path) {
-			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath;
+			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) {
+				return $path . DIRECTORY_SEPARATOR . $filePath;
+			}
 		}
 
 		throw new \Exception('File ' . $filePath . ' not found in paths (' . implode(', ', $this->paths) . ')');

src/Template.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 			$this->save = function($content = null) {
 				return $this->document->saveHtml($content);
 			};
-			$this->document->loadHtml('<' . '?xml encoding="UTF-8">' . $doc,  LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
+			$this->document->loadHtml('<'.'?xml encoding="UTF-8">'.$doc, LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
 
 		}
 		else {
@@ -89,7 +89,7 @@ 
 		if ($document) return $this->document;
 
 		//Print the doctype... saveHtml inexplicably does not support $doc->doctype as an argument
-		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype) . "\n" : '';
+		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype)."\n" : '';
 
 		if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement);
 		else $output = $this->printDocument();

Braces +12 added lines, -6 removed lines

@@ -41,8 +41,7 @@ 
 			};
 			$this->document->loadHtml('<' . '?xml encoding="UTF-8">' . $doc,  LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
 
-		}
-		else {
+		} else {
 			$this->document->loadXml($doc);
 			//XML was loaded, save as XML.
 			$this->save = function($content = null) {
@@ -79,7 +78,9 @@ 
 	/** Prints out the current DomDocument as HTML */
 	private function printDocument() {
 		$output = '';
-		foreach ($this->document->documentElement->childNodes as $node) $output .= call_user_func($this->save, $node);
+		foreach ($this->document->documentElement->childNodes as $node) {
+			$output .= call_user_func($this->save, $node);
+		}
 		return $output;
 	}
 
@@ -91,13 +92,18 @@ 
 		//Generate the document by taking only the childnodes of the template, ignoring the <template> and </template> tags
 		//TODO: Is there a faster way of doing this without string manipulation on the output or this loop through childnodes?
 		 //Either return a whole DomDocument or return the output HTML
-		if ($document) return $this->document;
+		if ($document) {
+			return $this->document;
+		}
 
 		//Print the doctype... saveHtml inexplicably does not support $doc->doctype as an argument
 		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype) . "\n" : '';
 
-		if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement);
-		else $output = $this->printDocument();
+		if ($this->document->documentElement->tagName !== 'template') {
+			$output .= call_user_func($this->save, $this->document->documentElement);
+		} else {
+			$output = $this->printDocument();
+		}
 
 		//repair empty tags. Browsers break on <script /> and <div /> so can't avoid LIBXML_NOEMPTYTAG but they also break on <base></base> so repair them
 		$output = str_replace(['></img>', '></br>', '></meta>', '></base>', '></link>', '></hr>', '></input>'], ' />', $output);

src/TSSFunction/Json.php

Spacing +2 added lines, -2 removed lines

@@ -17,13 +17,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;
 	}

Braces +6 added lines, -2 removed lines

@@ -17,13 +17,17 @@
 
 		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/Hook/ElementData.php

Braces +3 added lines, -1 removed lines

@@ -25,7 +25,9 @@
 	/** Returns the data that has been bound to $element, or, if no data is bound to $element climb the DOM tree to find the data bound to a parent node*/
 	public function getData(\DomElement $element = null, $type = 'data') {
 		while ($element) {
-			if (isset($this->elementMap[$element]) && array_key_exists($type, $this->elementMap[$element])) return $this->elementMap[$element][$type];
+			if (isset($this->elementMap[$element]) && array_key_exists($type, $this->elementMap[$element])) {
+				return $this->elementMap[$element][$type];
+			}
 			$element = $element->parentNode;
 		}
 		return $this->data;

src/Parser/ValueResult.php

Braces +8 added lines, -5 removed lines

@@ -33,14 +33,17 @@
 		];
 
 		if ($funcs[$this->mode] === 'concat' && is_numeric($newValue)
-			&& is_numeric($this->result[count($this->result)-1]))
-			$this->add($newValue);
-		else
-			$this->{$funcs[$this->mode]}($newValue);
+			&& is_numeric($this->result[count($this->result)-1])) {
+					$this->add($newValue);
+		} else {
+					$this->{$funcs[$this->mode]}($newValue);
+		}
 	}
 
 	public function in($value) {
-		if (!is_array($value)) throw new \Exception(' `in` can only be used with arrays');
+		if (!is_array($value)) {
+			throw new \Exception(' `in` can only be used with arrays');
+		}
 		$this->result[count($this->result)-1] = in_array($this->result[count($this->result)-1], $value);
 	}
 

src/Parser/Tokenizer/Literals.php

Braces +7 added lines, -3 removed lines

@@ -37,9 +37,13 @@
 	}
 
 	private function processLiterals($tokens, $name, $str) {
-		if (is_numeric($name)) $tokens->add(['type' => Tokenizer::NUMERIC, 'value' => $name]);
-		else if (method_exists($this, $name)) $this->$name($tokens);
-		else $tokens->add(['type' => Tokenizer::NAME, 'value' => $name, 'line' => $str->lineNo()]);
+		if (is_numeric($name)) {
+			$tokens->add(['type' => Tokenizer::NUMERIC, 'value' => $name]);
+		} else if (method_exists($this, $name)) {
+			$this->$name($tokens);
+		} else {
+			$tokens->add(['type' => Tokenizer::NAME, 'value' => $name, 'line' => $str->lineNo()]);
+		}
 	}
 
 	private function true($tokens) {

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

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