Level-2 / Transphporm

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

src/Parser/ValueData.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 
 	public function extract($last, $autoLookup) {
 		$value = $this->read($last);
-		if ($value && ($autoLookup || is_array($this->data) || $this->data instanceof \ArrayAccess) ) {
+		if ($value && ($autoLookup || is_array($this->data) || $this->data instanceof \ArrayAccess)) {
 			return $value;
 		}
 		throw new \UnexpectedValueException('Not found');

Braces +22 added lines, -9 removed lines

@@ -14,16 +14,23 @@ 
 	}
 
 	public function traverse($key) {
-		if (isset($this->data->{$key})) $this->data = $this->data->{$key};
-		else if ((is_array($this->data) || $this->data instanceof \ArrayAccess) && isset($this->data[$key])) $this->data = $this->data[$key];
+		if (isset($this->data->{$key})) {
+			$this->data = $this->data->{$key};
+		} else if ((is_array($this->data) || $this->data instanceof \ArrayAccess) && isset($this->data[$key])) {
+			$this->data = $this->data[$key];
+		}
 	}
 
 	public function read($value) {
 		if ((is_array($this->data) || $this->data instanceof \ArrayAccess)) {
-			if (isset($this->data[$value])) return $this->data[$value];
+			if (isset($this->data[$value])) {
+				return $this->data[$value];
+			}
+		} else if (isset($this->data->$value)) {
+			return $this->data->$value;
+		} else {
+			return false;
 		}
-		else if (isset($this->data->$value)) return $this->data->$value;
-		else return false;
 	}
 
 	public function call($func, $args) {
@@ -32,14 +39,20 @@ 
 
 	public function parseNested($parser, $token, $funcName) {
 		$args = $parser->parseTokens($token['value'], $this->data);
-		if ($args[0] == $this->data) $args = [];
+		if ($args[0] == $this->data) {
+			$args = [];
+		}
 		return $this->callFuncOnObject($this->data, $funcName, $args);
 	}
 
 	private function callFuncOnObject($obj, $func, $args) {
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
-		else if (is_callable([$obj, $func])) return call_user_func_array([$obj, $func], $args);
-		else return false;
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $args);
+		} else if (is_callable([$obj, $func])) {
+			return call_user_func_array([$obj, $func], $args);
+		} else {
+			return false;
+		}
 	}
 
 	public function extract($last, $autoLookup) {

src/Hook/PseudoMatcher.php

Braces +16 added lines, -9 removed lines

@@ -27,9 +27,10 @@ 
 				try {
 					$parts = $this->getFuncParts($tokens);
 					$matches = $function->match($parts['name'], $parts['args'], $element);
-					if ($matches === false) return false;
-				}
-				catch (\Exception $e) {
+					if ($matches === false) {
+						return false;
+					}
+				} catch (\Exception $e) {
 					throw new \Transphporm\RunException(\Transphporm\Exception::PSEUDO, $parts['name'], $e);
 				}
 			}
@@ -42,31 +43,37 @@ 
 		$parts['name'] = $this->getFuncName($tokens);
 		if ($parts['name'] === null || in_array($parts['name'], ['data', 'iteration', 'root'])) {
 			$parts['args'] = $this->valueParser->parseTokens($tokens);
-		}
-		else if (count($tokens) > 1) {
+		} else if (count($tokens) > 1) {
 			$tokens->rewind();
 			$tokens->next();
 			$parts['args'] = $this->valueParser->parseTokens($tokens->current()['value']);
+		} else {
+			$parts['args'] = [['']];
 		}
-		else $parts['args'] = [['']];
 		return $parts;
 	}
 
 	private function getFuncName($tokens) {
-		if ($tokens->type() === Tokenizer::NAME) return $tokens->read();
+		if ($tokens->type() === Tokenizer::NAME) {
+			return $tokens->read();
+		}
 		return null;
 	}
 
 	public function hasFunction($name) {
 		foreach ($this->pseudo as $tokens) {
-			if ($name === $this->getFuncName($tokens)) return true;
+			if ($name === $this->getFuncName($tokens)) {
+				return true;
+			}
 		}
 	}
 
 	public function getFuncArgs($name) {
 		foreach ($this->pseudo as $tokens) {
 			$parts = $this->getFuncParts($tokens);
-			if ($name === $parts['name']) return $parts['args'];
+			if ($name === $parts['name']) {
+				return $parts['args'];
+			}
 		}
 	}
 }

src/FunctionSet.php

Braces +2 added lines, -4 removed lines

@@ -21,15 +21,13 @@
 				$tokens = $args[0];
 				$parser = new \Transphporm\Parser\Value($this);
 				$args[0] = $parser->parseTokens($tokens, $this->elementData->getData($this->element));
-			}
-			else if (isset($args[0]) && $args[0] instanceof Parser\Tokens) {
+			} else if (isset($args[0]) && $args[0] instanceof Parser\Tokens) {
 				$args[0] = iterator_to_array($args[0]);
 			}
 			if (isset($this->functions[$name])) {
 				return $this->functions[$name]->run($args[0], $this->element);
 			}
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new RunException(Exception::TSS_FUNCTION, $name, $e);
 		}
 		return true;

src/Parser/Value.php

Braces +23 added lines, -18 removed lines

@@ -50,7 +50,9 @@ 
 		$this->data = new ValueData($data ? $data : $this->baseData);
 		$this->last = null;
 
-		if (count($tokens) <= 0) return [$data];
+		if (count($tokens) <= 0) {
+			return [$data];
+		}
 
 		foreach (new TokenFilterIterator($tokens, [Tokenizer::WHITESPACE, Tokenizer::NEW_LINE]) as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -72,16 +74,16 @@ 
 	//Reads the last selected value from $data regardless if it's an array or object and overrides $this->data with the new value
 	//Dot moves $data to the next object in $data foo.bar moves the $data pointer from `foo` to `bar`
 	private function processDot($token) {
-		if ($this->last !== null) $this->data->traverse($this->last);
-		else {
+		if ($this->last !== null) {
+			$this->data->traverse($this->last);
+		} else {
 			//When . is not preceeded by anything, treat it as part of the string instead of an operator
 			// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 			$lastResult = $this->result->pop();
 			if ($lastResult) {
 				$this->data = new ValueData($lastResult);
 				$this->traversing = true;
-			}
-			else {
+			} else {
 				$this->processString(['value' => '.']);
 				$this->result->setMode(Tokenizer::CONCAT);
 			}
@@ -94,15 +96,19 @@ 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
-			if ($this->last !== null) $this->data->traverse($this->last);
-			else {
+		} else {
+			if ($this->last !== null) {
+				$this->data->traverse($this->last);
+			} else {
 				$lastResult = $this->result->pop();
-				if ($lastResult) $this->data = new ValueData($lastResult);
+				if ($lastResult) {
+					$this->data = new ValueData($lastResult);
+				}
 			}
 			$this->last = $parser->parseTokens($token['value'], null)[0];
-			if (!is_bool($this->last)) $this->traversing = true;
+			if (!is_bool($this->last)) {
+				$this->traversing = true;
+			}
 		}
 	}
 
@@ -121,8 +127,7 @@ 
 	private function processBrackets($token) {
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -139,7 +144,9 @@ 
 		foreach ($this->result->getResult() as $i => $value) {
 			if (is_scalar($value)) {
 				$val = $this->data->read($value);
-				if ($val) $this->result[$i] = $val;
+				if ($val) {
+					$this->result[$i] = $val;
+				}
 			}
 		}
 		$this->last = null;
@@ -151,12 +158,10 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				if (!($this->autoLookup || $this->traversing)) {
 					$this->result->processValue($this->last);
-				}
-				else {
+				} else {
 					$this->result->clear();
 					$this->result[0] = false;
 				}

src/TSSFunction/Math.php

Indentation +25 added lines, -25 removed lines

@@ -3,33 +3,33 @@
 namespace Transphporm\TSSFunction;
 
 class Math implements \Transphporm\TSSFunction {
-    private $mode;
+	private $mode;
 
-    const ADD = 1;
-    const SUBTRACT = 2;
-    const MULTIPLY = 3;
-    const DIVIDE = 4;
+	const ADD = 1;
+	const SUBTRACT = 2;
+	const MULTIPLY = 3;
+	const DIVIDE = 4;
 
-    public function __construct($mode) {
-        $this->mode = $mode;
-    }
+	public function __construct($mode) {
+		$this->mode = $mode;
+	}
 
-    public function run(array $args, \DomElement $element) {
-        $result = $args[0];
-        for ($i = 1; $i < count($args); $i++) $result = $this->getModeResult($args[$i], $result);
-        return $result;
-    }
+	public function run(array $args, \DomElement $element) {
+		$result = $args[0];
+		for ($i = 1; $i < count($args); $i++) $result = $this->getModeResult($args[$i], $result);
+		return $result;
+	}
 
-    private function getModeResult($val, $prev) {
-        switch ($this->mode) {
-            case Math::ADD:
-                return $prev+$val;
-            case Math::SUBTRACT:
-                return $prev-$val;
-            case Math::MULTIPLY:
-                return $prev*$val;
-            case MATH::DIVIDE:
-                return $prev/$val;
-        }
-    }
+	private function getModeResult($val, $prev) {
+		switch ($this->mode) {
+			case Math::ADD:
+				return $prev+$val;
+			case Math::SUBTRACT:
+				return $prev-$val;
+			case Math::MULTIPLY:
+				return $prev*$val;
+			case MATH::DIVIDE:
+				return $prev/$val;
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -27,9 +27,9 @@
             case Math::SUBTRACT:
                 return $prev-$val;
             case Math::MULTIPLY:
-                return $prev*$val;
+                return $prev * $val;
             case MATH::DIVIDE:
-                return $prev/$val;
+                return $prev / $val;
         }
     }
 }

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 
     public function run(array $args, \DomElement $element) {
         $result = $args[0];
-        for ($i = 1; $i < count($args); $i++) $result = $this->getModeResult($args[$i], $result);
+        for ($i = 1; $i < count($args); $i++) {
+        	$result = $this->getModeResult($args[$i], $result);
+        }
         return $result;
     }