Completed
Pull Request — master (#236)
by
unknown
03:52
created
src/Property/Display.php 1 patch
Braces   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,8 +7,12 @@
 block discarded – undo
7 7
 namespace Transphporm\Property;
8 8
 class Display implements \Transphporm\Property {
9 9
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
10
-		if ($pseudoMatcher->hasFunction('attr')) $element->removeAttribute($pseudoMatcher->getFuncArgs('attr')[0]);
11
-		else if (strtolower($values[0]) === 'none') $element->setAttribute('transphporm', 'remove');
12
-		else $element->setAttribute('transphporm', 'show');
10
+		if ($pseudoMatcher->hasFunction('attr')) {
11
+			$element->removeAttribute($pseudoMatcher->getFuncArgs('attr')[0]);
12
+		} else if (strtolower($values[0]) === 'none') {
13
+			$element->setAttribute('transphporm', 'remove');
14
+		} else {
15
+			$element->setAttribute('transphporm', 'show');
16
+		}
13 17
 	}
14 18
 }
Please login to merge, or discard this patch.
src/Parser/TokenFilterIterator.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,9 @@
 block discarded – undo
35 35
 
36 36
     public function rewind() {
37 37
         $this->tokens->rewind();
38
-        while ($this->shouldContinue()) $this->tokens->next();
38
+        while ($this->shouldContinue()) {
39
+        	$this->tokens->next();
40
+        }
39 41
     }
40 42
 
41 43
     private function shouldContinue() {
Please login to merge, or discard this patch.
src/Module/Format.php 1 patch
Braces   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,9 +14,13 @@
 block discarded – undo
14 14
 	}
15 15
 
16 16
 	private function getLocale() {
17
-		if (is_array($this->locale)) return $this->locale;
18
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
19
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
17
+		if (is_array($this->locale)) {
18
+			return $this->locale;
19
+		} else if (strlen($this->locale) > 0) {
20
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
21
+		} else {
22
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
23
+		}
20 24
 	}
21 25
 
22 26
 	public function load(\Transphporm\Config $config) {
Please login to merge, or discard this patch.
src/Cache.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,8 @@
 block discarded – undo
21 21
 		$key = md5($key);
22 22
 		if (isset($this->cache[$key]) && $this->cache[$key]['timestamp'] >= $modified) {
23 23
 			return $this->cache[$key]['content'];
24
+		} else {
25
+			return false;
24 26
 		}
25
-		else return false;
26 27
 	}
27 28
 }
28 29
\ No newline at end of file
Please login to merge, or discard this patch.
src/Hook/Formatter.php 1 patch
Braces   +7 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,7 +14,9 @@  discard block
 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
 		$tokens = $rules['format'];
19 21
 
20 22
 		$functionName = $tokens->from(\Transphporm\Parser\Tokenizer::NAME, true)->read();
@@ -27,15 +29,16 @@  discard block
 block discarded – undo
27 29
 
28 30
 		try {
29 31
 			return $this->processFormat($options, $functionName, $value);
30
-		}
31
-		catch (\Exception $e) {
32
+		} catch (\Exception $e) {
32 33
 			throw new \Transphporm\RunException(\Transphporm\Exception::FORMATTER, $functionName, $e);
33 34
 		}
34 35
 	}
35 36
 
36 37
 	//TODO: Abstract all error reporting externally with a method for turning it on/off
37 38
 	private function assert($condition, $error) {
38
-		if (!$condition) throw new \Exception($error);
39
+		if (!$condition) {
40
+			throw new \Exception($error);
41
+		}
39 42
 	}
40 43
 
41 44
 	private function processFormat($format, $functionName, $value) {
Please login to merge, or discard this patch.
src/Pseudo/Nth.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,25 +11,33 @@
 block discarded – undo
11 11
 	private $lastParentNode;
12 12
 
13 13
 	public function match($name, $args, \DomElement $element) {
14
-		if ($element->parentNode !== $this->lastParentNode) $this->count = 0;
14
+		if ($element->parentNode !== $this->lastParentNode) {
15
+			$this->count = 0;
16
+		}
15 17
 
16 18
 		$this->lastParentNode = $element->parentNode;
17 19
 
18 20
 
19 21
 
20
-		if ($name !== 'nth-child') return true;
22
+		if ($name !== 'nth-child') {
23
+			return true;
24
+		}
21 25
 
22 26
 		$this->count++;
23 27
 		$criteria = $args[0];
24 28
 
25
-		if (is_callable([$this, $criteria])) return $this->$criteria($this->count);
29
+		if (is_callable([$this, $criteria])) {
30
+			return $this->$criteria($this->count);
31
+		}
26 32
 		$this->assert(is_numeric($criteria), "Argument passed to 'nth-child' must be 'odd', 'even', or of type int");
27 33
 		return $this->count == $criteria;
28 34
 	}
29 35
 
30 36
 	//TODO: Abstract assertions throughout
31 37
 	private function assert($condition, $error) {
32
-		if (!$condition) throw new \Exception($error);
38
+		if (!$condition) {
39
+			throw new \Exception($error);
40
+		}
33 41
 	}
34 42
 
35 43
 	private function odd($num) {
Please login to merge, or discard this patch.
src/TSSFunction/Data.php 1 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, true);
24 27
 		$return = $parser->parseTokens(new \Transphporm\Parser\Tokens($args), $data);
25 28
 		return $return[0];
Please login to merge, or discard this patch.
src/Pseudo/Not.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,7 +15,9 @@  discard block
 block discarded – undo
15 15
 	}
16 16
 
17 17
 	public function match($name, $args, \DomElement $element) {
18
-		if ($name !== 'not') return true;
18
+		if ($name !== 'not') {
19
+			return true;
20
+		}
19 21
 
20 22
 		$xpath = new \DomXpath($element->ownerDocument);
21 23
 		return $this->notElement($args, $xpath, $element);
@@ -28,7 +30,9 @@  discard block
 block discarded – undo
28 30
 			$xpathString = $this->cssToXpath->getXpath($tokenizer->getTokens());
29 31
             $pseudo = $this->cssToXpath->getPseudo($tokenizer->getTokens());
30 32
             $pseudoMatcher = $this->config->createPseudoMatcher($pseudo);
31
-			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) return false;
33
+			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) {
34
+				return false;
35
+			}
32 36
 		}
33 37
 		return true;
34 38
 	}
@@ -37,7 +41,9 @@  discard block
 block discarded – undo
37 41
         //Find all nodes matched by the expressions in the brackets :not(EXPR)
38 42
         foreach ($foundElements as $matchedElement) {
39 43
             //Check to see whether this node was matched by the not query
40
-            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) return true;
44
+            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) {
45
+            	return true;
46
+            }
41 47
         }
42 48
         return false;
43 49
     }
Please login to merge, or discard this patch.
src/Hook/PropertyHook.php 1 patch
Braces   +14 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,15 +31,18 @@  discard block
 block discarded – undo
31 31
 
32 32
 	public function run(\DomElement $element) {
33 33
 		//Set the baseDir so that all files for this rule are relative to the file it came from
34
-        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)));
34
+        if ($this->file !== null) {
35
+        	$this->filePath->setBaseDir(dirname(realpath($this->file)));
36
+        }
35 37
 		$this->functionSet->setElement($element);
36 38
 		$this->configLine = $this->line;
37 39
 		try {
38 40
 			//Don't run if there's a pseudo element like nth-child() and this element doesn't match it
39
-			if (!$this->pseudoMatcher->matches($element)) return;
41
+			if (!$this->pseudoMatcher->matches($element)) {
42
+				return;
43
+			}
40 44
 			$this->callProperties($element);
41
-		}
42
-		catch (\Transphporm\RunException $e) {
45
+		} catch (\Transphporm\RunException $e) {
43 46
 			throw new \Transphporm\Exception($e, $this->file, $this->line);
44 47
 		}
45 48
 	}
@@ -50,7 +53,9 @@  discard block
 block discarded – undo
50 53
 	private function callProperties($element) {
51 54
 		foreach ($this->rules as $name => $value) {
52 55
 			$result = $this->callProperty($name, $element, $this->getArgs($value));
53
-			if ($result === false) break;
56
+			if ($result === false) {
57
+				break;
58
+			}
54 59
 		}
55 60
 	}
56 61
 	private function getArgs($value) {
@@ -65,9 +70,10 @@  discard block
 block discarded – undo
65 70
 		if (isset($this->properties[$name])) {
66 71
 			try {
67 72
 				return $this->properties[$name]->run($value, $element, $this->rules, $this->pseudoMatcher, $this->properties);
68
-			}
69
-			catch (\Exception $e) {
70
-				if ($e instanceof \Transphporm\RunException) throw $e;
73
+			} catch (\Exception $e) {
74
+				if ($e instanceof \Transphporm\RunException) {
75
+					throw $e;
76
+				}
71 77
 				throw new \Transphporm\RunException(\Transphporm\Exception::PROPERTY, $name, $e);
72 78
 			}
73 79
 		}
Please login to merge, or discard this patch.