@@ -28,8 +28,7 @@ |
||
28 | 28 | $tokens = $args[0]; |
29 | 29 | $parser = new \Transphporm\Parser\Value($this); |
30 | 30 | return $parser->parseTokens($tokens, $this->elementData->getData($this->element)); |
31 | - } |
|
32 | - else { |
|
31 | + } else { |
|
33 | 32 | return iterator_to_array($args[0]); |
34 | 33 | } |
35 | 34 |
@@ -7,44 +7,44 @@ |
||
7 | 7 | namespace Transphporm; |
8 | 8 | use Transphporm\Parser\Tokenizer; |
9 | 9 | class TSSValidator { |
10 | - private $error; |
|
10 | + private $error; |
|
11 | 11 | |
12 | - public function validate($tss) { |
|
13 | - $this->error = null; |
|
14 | - $tokens = $this->tokenize($tss); |
|
12 | + public function validate($tss) { |
|
13 | + $this->error = null; |
|
14 | + $tokens = $this->tokenize($tss); |
|
15 | 15 | |
16 | - foreach ($tokens as $token) |
|
17 | - if (!$this->validateRule($token)) return false; |
|
16 | + foreach ($tokens as $token) |
|
17 | + if (!$this->validateRule($token)) return false; |
|
18 | 18 | |
19 | - return true; |
|
20 | - } |
|
19 | + return true; |
|
20 | + } |
|
21 | 21 | |
22 | - private function validateRule($token) { |
|
23 | - if ($token['type'] !== Tokenizer::OPEN_BRACE) return true; |
|
22 | + private function validateRule($token) { |
|
23 | + if ($token['type'] !== Tokenizer::OPEN_BRACE) return true; |
|
24 | 24 | |
25 | - return $this->checkBraces($token) && $this->checkSemicolons($token) |
|
26 | - && $this->checkParenthesis($token); |
|
27 | - } |
|
25 | + return $this->checkBraces($token) && $this->checkSemicolons($token) |
|
26 | + && $this->checkParenthesis($token); |
|
27 | + } |
|
28 | 28 | |
29 | - private function checkBraces($token) { |
|
30 | - return strpos($token['string'], '{') === false; |
|
31 | - } |
|
29 | + private function checkBraces($token) { |
|
30 | + return strpos($token['string'], '{') === false; |
|
31 | + } |
|
32 | 32 | |
33 | - private function checkSemicolons($braceToken) { |
|
34 | - $splitTokens = $braceToken['value']->splitOnToken(Tokenizer::COLON); |
|
35 | - array_shift($splitTokens); array_pop($splitTokens); |
|
36 | - foreach ($splitTokens as $tokens) |
|
37 | - if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false; |
|
33 | + private function checkSemicolons($braceToken) { |
|
34 | + $splitTokens = $braceToken['value']->splitOnToken(Tokenizer::COLON); |
|
35 | + array_shift($splitTokens); array_pop($splitTokens); |
|
36 | + foreach ($splitTokens as $tokens) |
|
37 | + if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false; |
|
38 | 38 | |
39 | - return true; |
|
40 | - } |
|
39 | + return true; |
|
40 | + } |
|
41 | 41 | |
42 | - private function checkParenthesis($token) { |
|
43 | - return substr_count($token['string'], '(') === substr_count($token['string'], ')'); |
|
44 | - } |
|
42 | + private function checkParenthesis($token) { |
|
43 | + return substr_count($token['string'], '(') === substr_count($token['string'], ')'); |
|
44 | + } |
|
45 | 45 | |
46 | - private function tokenize($tss) { |
|
47 | - if (is_file($tss)) $tss = file_get_contents($tss); |
|
48 | - return (new Parser\Tokenizer($tss))->getTokens(); |
|
49 | - } |
|
46 | + private function tokenize($tss) { |
|
47 | + if (is_file($tss)) $tss = file_get_contents($tss); |
|
48 | + return (new Parser\Tokenizer($tss))->getTokens(); |
|
49 | + } |
|
50 | 50 | } |
@@ -13,14 +13,17 @@ discard block |
||
13 | 13 | $this->error = null; |
14 | 14 | $tokens = $this->tokenize($tss); |
15 | 15 | |
16 | - foreach ($tokens as $token) |
|
17 | - if (!$this->validateRule($token)) return false; |
|
16 | + foreach ($tokens as $token) { |
|
17 | + if (!$this->validateRule($token)) return false; |
|
18 | + } |
|
18 | 19 | |
19 | 20 | return true; |
20 | 21 | } |
21 | 22 | |
22 | 23 | private function validateRule($token) { |
23 | - if ($token['type'] !== Tokenizer::OPEN_BRACE) return true; |
|
24 | + if ($token['type'] !== Tokenizer::OPEN_BRACE) { |
|
25 | + return true; |
|
26 | + } |
|
24 | 27 | |
25 | 28 | return $this->checkBraces($token) && $this->checkSemicolons($token) |
26 | 29 | && $this->checkParenthesis($token); |
@@ -33,8 +36,9 @@ discard block |
||
33 | 36 | private function checkSemicolons($braceToken) { |
34 | 37 | $splitTokens = $braceToken['value']->splitOnToken(Tokenizer::COLON); |
35 | 38 | array_shift($splitTokens); array_pop($splitTokens); |
36 | - foreach ($splitTokens as $tokens) |
|
37 | - if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false; |
|
39 | + foreach ($splitTokens as $tokens) { |
|
40 | + if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false; |
|
41 | + } |
|
38 | 42 | |
39 | 43 | return true; |
40 | 44 | } |
@@ -44,7 +48,9 @@ discard block |
||
44 | 48 | } |
45 | 49 | |
46 | 50 | private function tokenize($tss) { |
47 | - if (is_file($tss)) $tss = file_get_contents($tss); |
|
51 | + if (is_file($tss)) { |
|
52 | + $tss = file_get_contents($tss); |
|
53 | + } |
|
48 | 54 | return (new Parser\Tokenizer($tss))->getTokens(); |
49 | 55 | } |
50 | 56 | } |
@@ -19,15 +19,15 @@ |
||
19 | 19 | |
20 | 20 | public function getFilePath($filePath) { |
21 | 21 | if (is_file($filePath)) return $filePath; |
22 | - else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath; |
|
22 | + else if (is_file($this->baseDir.DIRECTORY_SEPARATOR.$filePath)) return $this->baseDir.DIRECTORY_SEPARATOR.$filePath; |
|
23 | 23 | else return $this->loadFromPaths($filePath); |
24 | 24 | } |
25 | 25 | |
26 | 26 | private function loadFromPaths($filePath) { |
27 | 27 | foreach ($this->paths as $path) { |
28 | - if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath; |
|
28 | + if (is_file($path.DIRECTORY_SEPARATOR.$filePath)) return $path.DIRECTORY_SEPARATOR.$filePath; |
|
29 | 29 | } |
30 | 30 | |
31 | - throw new \Exception('File ' . $filePath . ' not found in paths (' . implode(', ', $this->paths) . ')'); |
|
31 | + throw new \Exception('File '.$filePath.' not found in paths ('.implode(', ', $this->paths).')'); |
|
32 | 32 | } |
33 | 33 | } |
@@ -18,14 +18,20 @@ |
||
18 | 18 | } |
19 | 19 | |
20 | 20 | public function getFilePath($filePath) { |
21 | - if (is_file($filePath)) return $filePath; |
|
22 | - else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath; |
|
23 | - else return $this->loadFromPaths($filePath); |
|
21 | + if (is_file($filePath)) { |
|
22 | + return $filePath; |
|
23 | + } else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) { |
|
24 | + return $this->baseDir . DIRECTORY_SEPARATOR . $filePath; |
|
25 | + } else { |
|
26 | + return $this->loadFromPaths($filePath); |
|
27 | + } |
|
24 | 28 | } |
25 | 29 | |
26 | 30 | private function loadFromPaths($filePath) { |
27 | 31 | foreach ($this->paths as $path) { |
28 | - if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath; |
|
32 | + if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) { |
|
33 | + return $path . DIRECTORY_SEPARATOR . $filePath; |
|
34 | + } |
|
29 | 35 | } |
30 | 36 | |
31 | 37 | throw new \Exception('File ' . $filePath . ' not found in paths (' . implode(', ', $this->paths) . ')'); |