Level-2 / Transphporm

src/Parser/Sheet.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 			}
 
 			$selector = trim(substr($this->tss, $pos, $next-$pos));
-			$pos =  strpos($this->tss, '}', $next)+1;
+			$pos = strpos($this->tss, '}', $next)+1;
 			$newRules = $this->cssToRules($selector, count($rules)+$indexStart, $this->getProperties(trim(substr($this->tss, $next+1, $pos-2-$next))));
 			$rules = $this->writeRule($rules, $newRules);
 		}
@@ -62,7 +62,7 @@ 
 	private function processingInstructions($tss, $pos, $next, $indexStart) {
 		$rules = [];
 		while (($atPos = strpos($tss, '@', $pos)) !== false) {
-			if ($atPos  <= (int) $next) {
+			if ($atPos <= (int) $next) {
 				$spacePos = strpos($tss, ' ', $atPos);
 				$funcName = substr($tss, $atPos+1, $spacePos-$atPos-1);
 				$pos = strpos($tss, ';', $spacePos);
@@ -78,12 +78,12 @@ 
 	}
 
 	private function import($args, $indexStart) {
-		if (is_file(trim($args,'\'" '))) $fileName = trim($args,'\'" ');
+		if (is_file(trim($args, '\'" '))) $fileName = trim($args, '\'" ');
 		else $fileName = $this->valueParser->parse($args)[0];
 
-		if (is_file($this->baseDir . $fileName)) $tssFile = $this->baseDir . $fileName;
+		if (is_file($this->baseDir.$fileName)) $tssFile = $this->baseDir.$fileName;
 		elseif (is_file($fileName)) $tssFile = $fileName;
-		else throw new \Exception('Imported TSS File "' . $fileName .'" does not exist');
+		else throw new \Exception('Imported TSS File "'.$fileName.'" does not exist');
 
 		$sheet = new Sheet(file_get_contents($tssFile), $this->baseDir, $this->xPath, $this->valueParser);
 		return $sheet->parse(0, [], $indexStart);

Braces +25 added lines, -11 removed lines

@@ -33,7 +33,9 @@ 
 			$rules = $this->writeRule($rules, $newRules);
 		}
 		//there may be processing instructions at the end
-		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss), count($rules)+$indexStart)) $rules = array_merge($rules, $processing['rules']);
+		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss), count($rules)+$indexStart)) {
+			$rules = array_merge($rules, $processing['rules']);
+		}
 		usort($rules, [$this, 'sortRules']);
 		return $rules;
 	}
@@ -68,8 +70,7 @@ 
 				$pos = strpos($tss, ';', $spacePos);
 				$args = substr($tss, $spacePos+1, $pos-$spacePos-1);
 				$rules = array_merge($rules, $this->$funcName($args, $indexStart));
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -78,12 +79,19 @@ 
 	}
 
 	private function import($args, $indexStart) {
-		if (is_file(trim($args,'\'" '))) $fileName = trim($args,'\'" ');
-		else $fileName = $this->valueParser->parse($args)[0];
+		if (is_file(trim($args,'\'" '))) {
+			$fileName = trim($args,'\'" ');
+		} else {
+			$fileName = $this->valueParser->parse($args)[0];
+		}
 
-		if (is_file($this->baseDir . $fileName)) $tssFile = $this->baseDir . $fileName;
-		elseif (is_file($fileName)) $tssFile = $fileName;
-		else throw new \Exception('Imported TSS File "' . $fileName .'" does not exist');
+		if (is_file($this->baseDir . $fileName)) {
+			$tssFile = $this->baseDir . $fileName;
+		} elseif (is_file($fileName)) {
+			$tssFile = $fileName;
+		} else {
+			throw new \Exception('Imported TSS File "' . $fileName .'" does not exist');
+		}
 
 		$sheet = new Sheet(file_get_contents($tssFile), $this->baseDir, $this->xPath, $this->valueParser);
 		return $sheet->parse(0, [], $indexStart);
@@ -91,7 +99,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;
 	}
@@ -100,7 +110,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+2);
 		}
 
@@ -113,7 +125,9 @@ 
 		$return = [];
 
 		foreach ($rules as $rule) {
-			if (trim($rule) === '') continue;
+			if (trim($rule) === '') {
+				continue;
+			}
 			$parts = explode(':', $rule, 2);
 			$parts[1] = $stringExtractor->rebuild($parts[1]);
 			$return[trim($parts[0])] = isset($parts[1]) ? trim($parts[1]) : '';

src/TSSFunction/Template.php

Spacing +3 added lines, -3 removed lines

@@ -27,11 +27,11 @@
 		$selector = $this->readArray($args, 1);
 		$tss = $this->readArray($args, 2);
 
-		if (is_file($this->baseDir . $args[0])) $xmlFile = $this->baseDir . $args[0];
+		if (is_file($this->baseDir.$args[0])) $xmlFile = $this->baseDir.$args[0];
 		elseif (is_file($args[0])) $xmlFile = $args[0];
-		else throw new \Exception('XML File "' . $args[0] .'" does not exist');
+		else throw new \Exception('XML File "'.$args[0].'" does not exist');
 
-		$newTemplate = new \Transphporm\Builder($xmlFile, $tss ? $this->baseDir . $tss : null);
+		$newTemplate = new \Transphporm\Builder($xmlFile, $tss ? $this->baseDir.$tss : null);
 
 		$doc = $newTemplate->output($this->elementData->getData($element), true)->body;
 		if ($selector != '') return $this->templateSubsection($doc, $selector);

Braces +13 added lines, -5 removed lines

@@ -27,14 +27,20 @@ 
 		$selector = $this->readArray($args, 1);
 		$tss = $this->readArray($args, 2);
 
-		if (is_file($this->baseDir . $args[0])) $xmlFile = $this->baseDir . $args[0];
-		elseif (is_file($args[0])) $xmlFile = $args[0];
-		else throw new \Exception('XML File "' . $args[0] .'" does not exist');
+		if (is_file($this->baseDir . $args[0])) {
+			$xmlFile = $this->baseDir . $args[0];
+		} elseif (is_file($args[0])) {
+			$xmlFile = $args[0];
+		} else {
+			throw new \Exception('XML File "' . $args[0] .'" does not exist');
+		}
 
 		$newTemplate = new \Transphporm\Builder($xmlFile, $tss ? $this->baseDir . $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);
 
@@ -64,7 +70,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;
 	}
 }