Completed
Push — master ( c04c93...c97fb5 )
by Tom
02:35
created
src/TSSFunction/Data.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
  * @version         1.0                                                             */
7 7
 namespace Transphporm\TSSFunction;
8 8
 /* Handles data() and iteration() function calls from the stylesheet */
9
-class Data implements \Transphporm\TSSFunction{
9
+class Data implements \Transphporm\TSSFunction {
10 10
 	private $data;
11 11
 	private $dataKey;
12 12
 	private $functionSet;
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,11 @@
 block discarded – undo
18 18
 	}
19 19
 
20 20
 	public function run(array $args, \DomElement $element = null) {
21
-		if ($this->dataKey === "root") $data = $this->data->getData(null, 'data');
22
-		else $data = $this->data->getData($element, $this->dataKey);
21
+		if ($this->dataKey === "root") {
22
+			$data = $this->data->getData(null, 'data');
23
+		} else {
24
+			$data = $this->data->getData($element, $this->dataKey);
25
+		}
23 26
 		$parser = new \Transphporm\Parser\Value($this->functionSet, true);
24 27
 		$return = $parser->parseTokens($args, $data);
25 28
 		return $return[0];
Please login to merge, or discard this patch.
src/TSSFunction/Json.php 3 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,25 +1,25 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Transphporm\TSSFunction;
3 3
 class Json implements \Transphporm\TSSFunction {
4
-    private $baseDir;
4
+	private $baseDir;
5 5
 
6
-    public function __construct(&$baseDir) {
7
-        $this->baseDir = &$baseDir;
8
-    }
6
+	public function __construct(&$baseDir) {
7
+		$this->baseDir = &$baseDir;
8
+	}
9 9
 
10
-    public function run(array $args, \DomElement $element = null) {
11
-        $json = $args[0];
10
+	public function run(array $args, \DomElement $element = null) {
11
+		$json = $args[0];
12 12
 
13
-        if (trim($json)[0] != '{') {
14
-            $path = $this->baseDir . $json;
15
-            if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
16
-            $json = file_get_contents($json);
17
-        }
13
+		if (trim($json)[0] != '{') {
14
+			$path = $this->baseDir . $json;
15
+			if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
16
+			$json = file_get_contents($json);
17
+		}
18 18
 
19
-        $map = json_decode($json, true);
19
+		$map = json_decode($json, true);
20 20
 
21
-        if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
21
+		if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
22 22
 
23
-        return $map;
24
-    }
23
+		return $map;
24
+	}
25 25
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,14 +11,14 @@
 block discarded – undo
11 11
         $json = $args[0];
12 12
 
13 13
         if (trim($json)[0] != '{') {
14
-            $path = $this->baseDir . $json;
15
-            if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
14
+            $path = $this->baseDir.$json;
15
+            if (!file_exists($path)) throw new \Exception('File does not exist at: '.$path);
16 16
             $json = file_get_contents($json);
17 17
         }
18 18
 
19 19
         $map = json_decode($json, true);
20 20
 
21
-        if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
21
+        if (!is_array($map)) throw new \Exception('Could not decode json: '.json_last_error_msg());
22 22
 
23 23
         return $map;
24 24
     }
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,13 +12,17 @@
 block discarded – undo
12 12
 
13 13
         if (trim($json)[0] != '{') {
14 14
             $path = $this->baseDir . $json;
15
-            if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
15
+            if (!file_exists($path)) {
16
+            	throw new \Exception('File does not exist at: ' . $path);
17
+            }
16 18
             $json = file_get_contents($json);
17 19
         }
18 20
 
19 21
         $map = json_decode($json, true);
20 22
 
21
-        if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
23
+        if (!is_array($map)) {
24
+        	throw new \Exception('Could not decode json: ' . json_last_error_msg());
25
+        }
22 26
 
23 27
         return $map;
24 28
     }
Please login to merge, or discard this patch.
src/Formatter/Nl2br.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,25 +1,25 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Transphporm\Formatter;
3 3
 class Nl2br {
4
-    public function nl2br($var) {
5
-        $parts = explode("\n", $var);
6
-        $doc = new \DomDocument();
7
-        $root = $doc->createElement('root');
8
-        $doc->appendChild($root);
4
+	public function nl2br($var) {
5
+		$parts = explode("\n", $var);
6
+		$doc = new \DomDocument();
7
+		$root = $doc->createElement('root');
8
+		$doc->appendChild($root);
9 9
 
10
-        foreach ($parts as $key => $part) {
11
-            $new = $doc->createTextNode($part);
12
-            $doc->documentElement->appendChild($new);
13
-            if ($key !== count($parts)-1) {
14
-                $br = $doc->createElement('br');
15
-                $doc->documentElement->appendChild($br);
16
-            }
17
-        }
10
+		foreach ($parts as $key => $part) {
11
+			$new = $doc->createTextNode($part);
12
+			$doc->documentElement->appendChild($new);
13
+			if ($key !== count($parts)-1) {
14
+				$br = $doc->createElement('br');
15
+				$doc->documentElement->appendChild($br);
16
+			}
17
+		}
18 18
 
19
-        return $this->getContent($doc);
20
-    }
19
+		return $this->getContent($doc);
20
+	}
21 21
 
22
-    private function getContent($document) {
22
+	private function getContent($document) {
23 23
 		$newNode = $document->documentElement;
24 24
 		$result = [];
25 25
 		if ($newNode->tagName === 'root') {
Please login to merge, or discard this patch.
src/Config.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,12 +67,16 @@
 block discarded – undo
67 67
 	}
68 68
 
69 69
 	public function loadProperties(Hook\PropertyHook $hook) {
70
-		foreach ($this->properties as $name => $property) $hook->registerProperty($name, $property);
70
+		foreach ($this->properties as $name => $property) {
71
+			$hook->registerProperty($name, $property);
72
+		}
71 73
 	}
72 74
 
73 75
 	public function createPseudoMatcher($pseudo) {
74 76
 		$pseudoMatcher = new Hook\PseudoMatcher($pseudo);
75
-		foreach ($this->pseudo as $pseudoFunction) $pseudoMatcher->registerFunction($pseudoFunction);
77
+		foreach ($this->pseudo as $pseudoFunction) {
78
+			$pseudoMatcher->registerFunction($pseudoFunction);
79
+		}
76 80
 		return $pseudoMatcher;
77 81
 	}
78 82
 
Please login to merge, or discard this patch.
src/Parser/ValueData.php 3 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -34,6 +34,9 @@  discard block
 block discarded – undo
34 34
 		return $this->data->$func(...$args);
35 35
 	}
36 36
 
37
+	/**
38
+	 * @param Value $parser
39
+	 */
37 40
 	public function parseNested($parser, $token, $funcName) {
38 41
 		$args = $parser->parseTokens($token['value'], $this->data);
39 42
 		if ($args[0] == $this->data) $args = [];
@@ -49,6 +52,9 @@  discard block
 block discarded – undo
49 52
 		else return call_user_func_array([$obj, $func], $args);
50 53
 	}
51 54
 
55
+	/**
56
+	 * @param boolean $autoLookup
57
+	 */
52 58
 	public function extract($last, $autoLookup) {
53 59
 		if ($autoLookup && isset($this->data->{$last})) {
54 60
 			return $this->data->{$last};
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 
52 52
 	public function extract($last, $autoLookup) {
53 53
 		$value = $this->read($last);
54
-		if ($value && ($autoLookup || is_array($this->data)) ) {
54
+		if ($value && ($autoLookup || is_array($this->data))) {
55 55
 			return $value;
56 56
 		}
57 57
 		throw new \UnexpectedValueException('Not found');
Please login to merge, or discard this patch.
Braces   +20 added lines, -8 removed lines patch added patch discarded remove patch
@@ -14,16 +14,23 @@  discard block
 block discarded – undo
14 14
 	}
15 15
 
16 16
 	public function traverse($key) {
17
-		if (isset($this->data->{$key})) $this->data = $this->data->{$key};
18
-		else if (is_array($this->data) && isset($this->data[$key])) $this->data = $this->data[$key];
17
+		if (isset($this->data->{$key})) {
18
+			$this->data = $this->data->{$key};
19
+		} else if (is_array($this->data) && isset($this->data[$key])) {
20
+			$this->data = $this->data[$key];
21
+		}
19 22
 	}
20 23
 
21 24
 	public function read($value) {
22 25
 		if (is_array($this->data)) {
23
-			if (isset($this->data[$value])) return $this->data[$value];
26
+			if (isset($this->data[$value])) {
27
+				return $this->data[$value];
28
+			}
29
+		} else if (isset($this->data->$value)) {
30
+			return $this->data->$value;
31
+		} else {
32
+			return false;
24 33
 		}
25
-		else if (isset($this->data->$value)) return $this->data->$value;
26
-		else return false;
27 34
 	}
28 35
 
29 36
 	public function isFunctionSet() {
@@ -36,7 +43,9 @@  discard block
 block discarded – undo
36 43
 
37 44
 	public function parseNested($parser, $token, $funcName) {
38 45
 		$args = $parser->parseTokens($token['value'], $this->data);
39
-		if ($args[0] == $this->data) $args = [];
46
+		if ($args[0] == $this->data) {
47
+			$args = [];
48
+		}
40 49
 		return $this->callFunc($funcName, $args, $this->data);
41 50
 	}
42 51
 
@@ -45,8 +54,11 @@  discard block
 block discarded – undo
45 54
 	}
46 55
 
47 56
 	private function callFuncOnObject($obj, $func, $args) {
48
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
49
-		else return call_user_func_array([$obj, $func], $args);
57
+		if (isset($obj->$func) && is_callable($obj->$func)) {
58
+			return call_user_func_array($obj->$func, $args);
59
+		} else {
60
+			return call_user_func_array([$obj, $func], $args);
61
+		}
50 62
 	}
51 63
 
52 64
 	public function extract($last, $autoLookup) {
Please login to merge, or discard this patch.
src/Property/Repeat.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,14 +15,18 @@  discard block
 block discarded – undo
15 15
 	}
16 16
 
17 17
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
18
-		if ($element->getAttribute('transphporm') === 'added') return $element->parentNode->removeChild($element);
18
+		if ($element->getAttribute('transphporm') === 'added') {
19
+			return $element->parentNode->removeChild($element);
20
+		}
19 21
 		$max = $this->getMax($values);
20 22
 		$count = 0;
21 23
 
22 24
 		//What was this if statement for? removing it breaks nothing
23 25
 		//if (empty($values[0])) $values[0] = [];
24 26
 		foreach ($values[0] as $key => $iteration) {
25
-			if ($count+1 > $max) break;
27
+			if ($count+1 > $max) {
28
+				break;
29
+			}
26 30
 			$clone = $this->cloneElement($element, $iteration, $key, $count++);
27 31
 			//Re-run the hook on the new element, but use the iterated data
28 32
 			//Don't run repeat on the clones element or it will loop forever
@@ -46,7 +50,9 @@  discard block
 block discarded – undo
46 50
 
47 51
 	private function tagElement($element, $count) {
48 52
 		//Mark all but one of the nodes as having been added by transphporm, when the hook is run again, these are removed
49
-		if ($count > 0) $element->setAttribute('transphporm', 'added');
53
+		if ($count > 0) {
54
+			$element->setAttribute('transphporm', 'added');
55
+		}
50 56
 	}
51 57
 
52 58
 	private function getMax($values) {
@@ -55,7 +61,9 @@  discard block
 block discarded – undo
55 61
 
56 62
 	private function createHook($newRules, $pseudoMatcher, $properties) {
57 63
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet);
58
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
64
+		foreach ($properties as $name => $property) {
65
+			$hook->registerProperty($name, $property);
66
+		}
59 67
 		return $hook;
60 68
 	}
61 69
 }
Please login to merge, or discard this patch.
src/Pseudo/Attribute.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,9 @@
 block discarded – undo
13 13
 	}
14 14
 
15 15
 	public function match($pseudo, \DomElement $element) {
16
-		if (strpos($pseudo, '[') === false) return true;
16
+		if (strpos($pseudo, '[') === false) {
17
+			return true;
18
+		}
17 19
 
18 20
 		$this->functionSet->setElement($element);
19 21
 		$valueParser = new \Transphporm\Parser\Value($this->functionSet);
Please login to merge, or discard this patch.
src/Hook/PseudoMatcher.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,9 @@
 block discarded – undo
31 31
 	
32 32
 	public function hasFunction($name) {
33 33
 		foreach ($this->pseudo as $pseudo) {
34
-			if (strpos($pseudo, $name) === 0) return true;
34
+			if (strpos($pseudo, $name) === 0) {
35
+				return true;
36
+			}
35 37
 		}
36 38
 	}
37 39
 
Please login to merge, or discard this patch.
src/Hook/Formatter.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,14 +14,18 @@
 block discarded – undo
14 14
 	}
15 15
 
16 16
 	public function format($value, $rules) {
17
-		if (!isset($rules['format'])) return $value;
17
+		if (!isset($rules['format'])) {
18
+			return $value;
19
+		}
18 20
 
19 21
 		$tokenizer = new \Transphporm\Parser\Tokenizer($rules['format']);
20 22
 		$tokens = $tokenizer->getTokens();
21 23
 
22 24
 		$functionName = $tokens[0]['value'];
23 25
 		$options = [];
24
-		for ($i = 1; $i < count($tokens); $i++) $options[] = $tokens[$i]['value'];
26
+		for ($i = 1; $i < count($tokens); $i++) {
27
+			$options[] = $tokens[$i]['value'];
28
+		}
25 29
 
26 30
 		return $this->processFormat($options, $functionName, $value);		
27 31
 	}
Please login to merge, or discard this patch.