@@ -44,8 +44,11 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | $diffDays = $diff->invert === 1 ? $diff->days : 0- $diff->days; |
| 46 | 46 | |
| 47 | - if ($diffDays !== 0) return $this->dayOffset($diffDays); |
|
| 48 | - else return $this->timeOffset($diff); |
|
| 47 | + if ($diffDays !== 0) { |
|
| 48 | + return $this->dayOffset($diffDays); |
|
| 49 | + } else { |
|
| 50 | + return $this->timeOffset($diff); |
|
| 51 | + } |
|
| 49 | 52 | } |
| 50 | 53 | |
| 51 | 54 | /** Calculates offset in hours/minutes/seconds */ |
@@ -80,15 +83,22 @@ discard block |
||
| 80 | 83 | [-365, -28, $strings['future'], 28, 'months'], |
| 81 | 84 | [-999999, -365, $strings['future'], 365, 'years'], |
| 82 | 85 | ]; |
| 83 | - if (isset($strings['day_before_yesterday'])) array_unshift($ranges, [2, 2, $strings['day_before_yesterday'], 1, '']); |
|
| 84 | - if (isset($strings['day_after_tomorrow'])) array_unshift($ranges, [-2, -2, $strings['day_after_tomorrow'], 1, '']); |
|
| 86 | + if (isset($strings['day_before_yesterday'])) { |
|
| 87 | + array_unshift($ranges, [2, 2, $strings['day_before_yesterday'], 1, '']); |
|
| 88 | + } |
|
| 89 | + if (isset($strings['day_after_tomorrow'])) { |
|
| 90 | + array_unshift($ranges, [-2, -2, $strings['day_after_tomorrow'], 1, '']); |
|
| 91 | + } |
|
| 85 | 92 | return $ranges; |
| 86 | 93 | } |
| 87 | 94 | |
| 88 | 95 | /** Converts "week" to "weeks", "month" to "months" etc when plural is required using language from $locale */ |
| 89 | 96 | private function getPlural($strings, $num, $interval) { |
| 90 | - if ($interval !== '') return $num == 1 ? $strings[$interval . '_singular'] : $strings[$interval . '_plural']; |
|
| 91 | - else return ''; |
|
| 97 | + if ($interval !== '') { |
|
| 98 | + return $num == 1 ? $strings[$interval . '_singular'] : $strings[$interval . '_plural']; |
|
| 99 | + } else { |
|
| 100 | + return ''; |
|
| 101 | + } |
|
| 92 | 102 | } |
| 93 | 103 | |
| 94 | 104 | /** Calculates offset in days/weeks/month/years */ |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | /** Converts $val into a \DateTime object if it's not already */ |
| 17 | 17 | private function getDate($val) { |
| 18 | 18 | $tz = new \DateTimeZone($this->locale['timezone']); |
| 19 | - $date = $val instanceof \DateTimeInterface ? $val : new \DateTime($val, $tz); |
|
| 19 | + $date = $val instanceof \DateTimeInterface ? $val : new \DateTime($val, $tz); |
|
| 20 | 20 | $date->setTimeZone($tz); |
| 21 | 21 | return $date; |
| 22 | 22 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | /** Formats \DateTime as Date and Time using formats from $locale */ |
| 37 | 37 | public function dateTime($val) { |
| 38 | - return $this->date($val, $this->locale['date_format'] . ' ' . $this->locale['time_format']); |
|
| 38 | + return $this->date($val, $this->locale['date_format'].' '.$this->locale['time_format']); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** Generates relative time offsets based on system clock. e.g "10 minutes ago" or "In 6 months" |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | $diff = $now->diff($date); |
| 48 | 48 | |
| 49 | 49 | |
| 50 | - $diffDays = $diff->invert === 1 ? $diff->days : 0- $diff->days; |
|
| 50 | + $diffDays = $diff->invert === 1 ? $diff->days : 0-$diff->days; |
|
| 51 | 51 | |
| 52 | 52 | if ($diffDays !== 0) return $this->dayOffset($diffDays); |
| 53 | 53 | else return $this->timeOffset($diff); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | /** Gets date ranges to represent uses of weeks/months/days/etc */ |
| 77 | 77 | private function getRanges($strings) { |
| 78 | - $ranges = [ |
|
| 78 | + $ranges = [ |
|
| 79 | 79 | [1, 1, $strings['yesterday'], 1, ''], |
| 80 | 80 | [1, 13, $strings['past'], 1, 'days'], |
| 81 | 81 | [13, 28, $strings['past'], 7, 'weeks'], |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | /** Converts "week" to "weeks", "month" to "months" etc when plural is required using language from $locale */ |
| 96 | 96 | private function getPlural($strings, $num, $interval) { |
| 97 | - if ($interval !== '') return $num == 1 ? $strings[$interval . '_singular'] : $strings[$interval . '_plural']; |
|
| 97 | + if ($interval !== '') return $num == 1 ? $strings[$interval.'_singular'] : $strings[$interval.'_plural']; |
|
| 98 | 98 | else return ''; |
| 99 | 99 | } |
| 100 | 100 | |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | |
| 14 | 14 | public function currency($num) { |
| 15 | 15 | $num = $this->decimal($num, $this->locale['currency_decimals']); |
| 16 | - if ($this->locale['currency_position'] === 'before') return $this->locale['currency'] . $num; |
|
| 17 | - else return $num . $this->locale['currency']; |
|
| 16 | + if ($this->locale['currency_position'] === 'before') return $this->locale['currency'].$num; |
|
| 17 | + else return $num.$this->locale['currency']; |
|
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | \ No newline at end of file |
@@ -13,7 +13,10 @@ |
||
| 13 | 13 | |
| 14 | 14 | public function currency($num) { |
| 15 | 15 | $num = $this->decimal($num, $this->locale['currency_decimals']); |
| 16 | - if ($this->locale['currency_position'] === 'before') return $this->locale['currency'] . $num; |
|
| 17 | - else return $num . $this->locale['currency']; |
|
| 16 | + if ($this->locale['currency_position'] === 'before') { |
|
| 17 | + return $this->locale['currency'] . $num; |
|
| 18 | + } else { |
|
| 19 | + return $num . $this->locale['currency']; |
|
| 20 | + } |
|
| 18 | 21 | } |
| 19 | 22 | } |
| 20 | 23 | \ No newline at end of file |
@@ -39,9 +39,9 @@ |
||
| 39 | 39 | $num = (int) $frequency; |
| 40 | 40 | $unit = strtoupper(trim(str_replace($num, '', $frequency))); |
| 41 | 41 | |
| 42 | - $offset = $num * constant(self::class . '::' . $unit); |
|
| 42 | + $offset = $num * constant(self::class.'::'.$unit); |
|
| 43 | 43 | |
| 44 | - if ($time > $this->lastRun + $offset) return true; |
|
| 44 | + if ($time > $this->lastRun+$offset) return true; |
|
| 45 | 45 | else return false; |
| 46 | 46 | } |
| 47 | 47 | |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | private $pseudo; |
| 11 | 11 | private $depth; |
| 12 | 12 | private $index; |
| 13 | - private $file; |
|
| 13 | + private $file; |
|
| 14 | 14 | private $line; |
| 15 | 15 | private $properties = []; |
| 16 | 16 | private $lastRun = 0; |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | $this->pseudo = $pseudo; |
| 27 | 27 | $this->depth = $depth; |
| 28 | 28 | $this->index = $index; |
| 29 | - $this->file = $file; |
|
| 29 | + $this->file = $file; |
|
| 30 | 30 | $this->line = $line; |
| 31 | 31 | $this->properties = $properties; |
| 32 | 32 | } |
@@ -44,23 +44,32 @@ |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | private function timeFrequency($frequency, $time = null) { |
| 47 | - if ($time === null) $time = time(); |
|
| 47 | + if ($time === null) { |
|
| 48 | + $time = time(); |
|
| 49 | + } |
|
| 48 | 50 | $num = (int) $frequency; |
| 49 | 51 | $unit = strtoupper(trim(str_replace($num, '', $frequency))); |
| 50 | 52 | |
| 51 | 53 | $offset = $num * constant(self::class . '::' . $unit); |
| 52 | 54 | |
| 53 | - if ($time > $this->lastRun + $offset) return true; |
|
| 54 | - else return false; |
|
| 55 | + if ($time > $this->lastRun + $offset) { |
|
| 56 | + return true; |
|
| 57 | + } else { |
|
| 58 | + return false; |
|
| 59 | + } |
|
| 55 | 60 | } |
| 56 | 61 | |
| 57 | 62 | public function shouldRun($time = null) { |
| 58 | 63 | if (isset($this->properties['update-frequency']) && $this->lastRun !== 0) { |
| 59 | 64 | $frequency = $this->properties['update-frequency']->read(); |
| 60 | 65 | $static = ['always' => true, 'never' => false]; |
| 61 | - if (isset($static[$frequency])) return $static[$frequency]; |
|
| 62 | - else return $this->timeFrequency($frequency, $time); |
|
| 66 | + if (isset($static[$frequency])) { |
|
| 67 | + return $static[$frequency]; |
|
| 68 | + } else { |
|
| 69 | + return $this->timeFrequency($frequency, $time); |
|
| 70 | + } |
|
| 71 | + } else { |
|
| 72 | + return true; |
|
| 63 | 73 | } |
| 64 | - else return true; |
|
| 65 | 74 | } |
| 66 | 75 | } |
@@ -9,9 +9,13 @@ |
||
| 9 | 9 | class PostProcess implements \Transphporm\Hook { |
| 10 | 10 | public function run(\DomElement $element) { |
| 11 | 11 | $transphporm = $element->getAttribute('transphporm'); |
| 12 | - if ($transphporm === 'remove') $element->parentNode->removeChild($element); |
|
| 13 | - else if ($transphporm === 'text') $element->parentNode->replaceChild($element->firstChild, $element); |
|
| 14 | - else $element->removeAttribute('transphporm'); |
|
| 12 | + if ($transphporm === 'remove') { |
|
| 13 | + $element->parentNode->removeChild($element); |
|
| 14 | + } else if ($transphporm === 'text') { |
|
| 15 | + $element->parentNode->replaceChild($element->firstChild, $element); |
|
| 16 | + } else { |
|
| 17 | + $element->removeAttribute('transphporm'); |
|
| 18 | + } |
|
| 15 | 19 | } |
| 16 | 20 | |
| 17 | 21 | } |
| 18 | 22 | \ No newline at end of file |
@@ -31,7 +31,9 @@ |
||
| 31 | 31 | /** Returns the data that has been bound to $element, or, if no data is bound to $element climb the DOM tree to find the data bound to a parent node*/ |
| 32 | 32 | public function getData(\DomElement $element = null, $type = 'data') { |
| 33 | 33 | while ($element) { |
| 34 | - if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) return $this->elementMap[$element][$type]; |
|
| 34 | + if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) { |
|
| 35 | + return $this->elementMap[$element][$type]; |
|
| 36 | + } |
|
| 35 | 37 | $element = $element->parentNode; |
| 36 | 38 | } |
| 37 | 39 | return $this->data; |
@@ -6,7 +6,7 @@ |
||
| 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; |
@@ -18,8 +18,11 @@ |
||
| 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]; |
@@ -7,8 +7,12 @@ |
||
| 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 | } |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | if ($token['type'] === $tokenType) $i++; |
| 79 | 79 | else $splitTokens[$i][] = $token; |
| 80 | 80 | } |
| 81 | - return array_map(function ($tokens) { |
|
| 81 | + return array_map(function($tokens) { |
|
| 82 | 82 | return new Tokens($tokens); |
| 83 | 83 | }, $splitTokens); |
| 84 | 84 | //return $splitTokens; |
@@ -6,28 +6,28 @@ discard block |
||
| 6 | 6 | * @version 1.0 */ |
| 7 | 7 | namespace Transphporm\Parser; |
| 8 | 8 | class Tokens implements \Iterator, \Countable { |
| 9 | - private $tokens; |
|
| 10 | - private $iterator = 0; |
|
| 9 | + private $tokens; |
|
| 10 | + private $iterator = 0; |
|
| 11 | 11 | |
| 12 | - public function __construct(array $tokens) { |
|
| 13 | - $this->tokens = $tokens; |
|
| 14 | - } |
|
| 12 | + public function __construct(array $tokens) { |
|
| 13 | + $this->tokens = $tokens; |
|
| 14 | + } |
|
| 15 | 15 | |
| 16 | - public function count() { |
|
| 17 | - return count($this->tokens); |
|
| 18 | - } |
|
| 16 | + public function count() { |
|
| 17 | + return count($this->tokens); |
|
| 18 | + } |
|
| 19 | 19 | |
| 20 | - // Iterator Functions |
|
| 21 | - public function current() { |
|
| 22 | - return $this->tokens[$this->iterator]; |
|
| 23 | - } |
|
| 20 | + // Iterator Functions |
|
| 21 | + public function current() { |
|
| 22 | + return $this->tokens[$this->iterator]; |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - public function key() { |
|
| 26 | - return $this->iterator; |
|
| 27 | - } |
|
| 25 | + public function key() { |
|
| 26 | + return $this->iterator; |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | - public function next() { |
|
| 30 | - ++$this->iterator; |
|
| 29 | + public function next() { |
|
| 30 | + ++$this->iterator; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | public function valid() { |
@@ -38,73 +38,73 @@ discard block |
||
| 38 | 38 | $this->iterator = 0; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - private function getKeysOfTokenType($tokenType) { |
|
| 42 | - return array_keys(array_column($this->tokens, 'type'), $tokenType); |
|
| 43 | - } |
|
| 44 | - |
|
| 45 | - private function getKeyToSlice($tokenType) { |
|
| 46 | - $keys = $this->getKeysOfTokenType($tokenType); |
|
| 47 | - if (empty($keys)) return false; |
|
| 48 | - $key = $keys[0]; |
|
| 49 | - for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i]; |
|
| 50 | - return $key; |
|
| 51 | - } |
|
| 52 | - |
|
| 53 | - public function from($tokenType, $inclusive = false) { |
|
| 54 | - $key = $this->getKeyToSlice($tokenType); |
|
| 55 | - if ($key === false) return new Tokens([]); |
|
| 56 | - if (!$inclusive) $key++; |
|
| 57 | - return new Tokens(array_slice($this->tokens, $key)); |
|
| 58 | - } |
|
| 59 | - |
|
| 60 | - public function to($tokenType, $inclusive = false) { |
|
| 61 | - $key = $this->getKeyToSlice($tokenType); |
|
| 62 | - if ($key === false) return new Tokens([]); |
|
| 63 | - if ($inclusive) $key++; |
|
| 64 | - return new Tokens(array_slice($this->tokens, $this->iterator, $key)); |
|
| 65 | - } |
|
| 66 | - |
|
| 67 | - public function skip($count) { |
|
| 68 | - $this->iterator += $count; |
|
| 69 | - } |
|
| 70 | - |
|
| 71 | - public function splitOnToken($tokenType) { |
|
| 72 | - $splitTokens = []; |
|
| 41 | + private function getKeysOfTokenType($tokenType) { |
|
| 42 | + return array_keys(array_column($this->tokens, 'type'), $tokenType); |
|
| 43 | + } |
|
| 44 | + |
|
| 45 | + private function getKeyToSlice($tokenType) { |
|
| 46 | + $keys = $this->getKeysOfTokenType($tokenType); |
|
| 47 | + if (empty($keys)) return false; |
|
| 48 | + $key = $keys[0]; |
|
| 49 | + for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i]; |
|
| 50 | + return $key; |
|
| 51 | + } |
|
| 52 | + |
|
| 53 | + public function from($tokenType, $inclusive = false) { |
|
| 54 | + $key = $this->getKeyToSlice($tokenType); |
|
| 55 | + if ($key === false) return new Tokens([]); |
|
| 56 | + if (!$inclusive) $key++; |
|
| 57 | + return new Tokens(array_slice($this->tokens, $key)); |
|
| 58 | + } |
|
| 59 | + |
|
| 60 | + public function to($tokenType, $inclusive = false) { |
|
| 61 | + $key = $this->getKeyToSlice($tokenType); |
|
| 62 | + if ($key === false) return new Tokens([]); |
|
| 63 | + if ($inclusive) $key++; |
|
| 64 | + return new Tokens(array_slice($this->tokens, $this->iterator, $key)); |
|
| 65 | + } |
|
| 66 | + |
|
| 67 | + public function skip($count) { |
|
| 68 | + $this->iterator += $count; |
|
| 69 | + } |
|
| 70 | + |
|
| 71 | + public function splitOnToken($tokenType) { |
|
| 72 | + $splitTokens = []; |
|
| 73 | 73 | $i = 0; |
| 74 | 74 | foreach ($this->tokens as $token) { |
| 75 | 75 | if ($token['type'] === $tokenType) $i++; |
| 76 | 76 | else $splitTokens[$i][] = $token; |
| 77 | 77 | } |
| 78 | - return array_map(function ($tokens) { |
|
| 79 | - return new Tokens($tokens); |
|
| 80 | - }, $splitTokens); |
|
| 78 | + return array_map(function ($tokens) { |
|
| 79 | + return new Tokens($tokens); |
|
| 80 | + }, $splitTokens); |
|
| 81 | 81 | //return $splitTokens; |
| 82 | - } |
|
| 83 | - |
|
| 84 | - public function trim() { |
|
| 85 | - $tokens = $this->tokens; |
|
| 86 | - // Remove end whitespace |
|
| 87 | - while (end($tokens)['type'] === Tokenizer::WHITESPACE) { |
|
| 88 | - array_pop($tokens); |
|
| 89 | - } |
|
| 90 | - // Remove begining whitespace |
|
| 91 | - while (isset($tokens[0]) && $tokens[0]['type'] === Tokenizer::WHITESPACE) { |
|
| 92 | - array_shift($tokens); |
|
| 93 | - } |
|
| 94 | - return new Tokens($tokens); |
|
| 95 | - } |
|
| 96 | - |
|
| 97 | - public function removeLine() { |
|
| 98 | - $tokens = $this->tokens; |
|
| 99 | - foreach ($tokens as &$token) unset($token['line']); |
|
| 100 | - return new Tokens($tokens); |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - public function read($offset = 0) { |
|
| 104 | - return isset($this->tokens[$offset]) ? $this->tokens[$offset]['value'] : false; |
|
| 105 | - } |
|
| 106 | - |
|
| 107 | - public function type($offset = 0) { |
|
| 108 | - return isset($this->tokens[$offset]) ? $this->tokens[$offset]['type'] : false; |
|
| 109 | - } |
|
| 82 | + } |
|
| 83 | + |
|
| 84 | + public function trim() { |
|
| 85 | + $tokens = $this->tokens; |
|
| 86 | + // Remove end whitespace |
|
| 87 | + while (end($tokens)['type'] === Tokenizer::WHITESPACE) { |
|
| 88 | + array_pop($tokens); |
|
| 89 | + } |
|
| 90 | + // Remove begining whitespace |
|
| 91 | + while (isset($tokens[0]) && $tokens[0]['type'] === Tokenizer::WHITESPACE) { |
|
| 92 | + array_shift($tokens); |
|
| 93 | + } |
|
| 94 | + return new Tokens($tokens); |
|
| 95 | + } |
|
| 96 | + |
|
| 97 | + public function removeLine() { |
|
| 98 | + $tokens = $this->tokens; |
|
| 99 | + foreach ($tokens as &$token) unset($token['line']); |
|
| 100 | + return new Tokens($tokens); |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + public function read($offset = 0) { |
|
| 104 | + return isset($this->tokens[$offset]) ? $this->tokens[$offset]['value'] : false; |
|
| 105 | + } |
|
| 106 | + |
|
| 107 | + public function type($offset = 0) { |
|
| 108 | + return isset($this->tokens[$offset]) ? $this->tokens[$offset]['type'] : false; |
|
| 109 | + } |
|
| 110 | 110 | } |
@@ -44,23 +44,35 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | private function getKeyToSlice($tokenType) { |
| 46 | 46 | $keys = $this->getKeysOfTokenType($tokenType); |
| 47 | - if (empty($keys)) return false; |
|
| 47 | + if (empty($keys)) { |
|
| 48 | + return false; |
|
| 49 | + } |
|
| 48 | 50 | $key = $keys[0]; |
| 49 | - for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i]; |
|
| 51 | + for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) { |
|
| 52 | + $key = $keys[$i]; |
|
| 53 | + } |
|
| 50 | 54 | return $key; |
| 51 | 55 | } |
| 52 | 56 | |
| 53 | 57 | public function from($tokenType, $inclusive = false) { |
| 54 | 58 | $key = $this->getKeyToSlice($tokenType); |
| 55 | - if ($key === false) return new Tokens([]); |
|
| 56 | - if (!$inclusive) $key++; |
|
| 59 | + if ($key === false) { |
|
| 60 | + return new Tokens([]); |
|
| 61 | + } |
|
| 62 | + if (!$inclusive) { |
|
| 63 | + $key++; |
|
| 64 | + } |
|
| 57 | 65 | return new Tokens(array_slice($this->tokens, $key)); |
| 58 | 66 | } |
| 59 | 67 | |
| 60 | 68 | public function to($tokenType, $inclusive = false) { |
| 61 | 69 | $key = $this->getKeyToSlice($tokenType); |
| 62 | - if ($key === false) return new Tokens([]); |
|
| 63 | - if ($inclusive) $key++; |
|
| 70 | + if ($key === false) { |
|
| 71 | + return new Tokens([]); |
|
| 72 | + } |
|
| 73 | + if ($inclusive) { |
|
| 74 | + $key++; |
|
| 75 | + } |
|
| 64 | 76 | return new Tokens(array_slice($this->tokens, $this->iterator, $key)); |
| 65 | 77 | } |
| 66 | 78 | |
@@ -72,8 +84,11 @@ discard block |
||
| 72 | 84 | $splitTokens = []; |
| 73 | 85 | $i = 0; |
| 74 | 86 | foreach ($this->tokens as $token) { |
| 75 | - if ($token['type'] === $tokenType) $i++; |
|
| 76 | - else $splitTokens[$i][] = $token; |
|
| 87 | + if ($token['type'] === $tokenType) { |
|
| 88 | + $i++; |
|
| 89 | + } else { |
|
| 90 | + $splitTokens[$i][] = $token; |
|
| 91 | + } |
|
| 77 | 92 | } |
| 78 | 93 | return array_map(function ($tokens) { |
| 79 | 94 | return new Tokens($tokens); |
@@ -96,7 +111,9 @@ discard block |
||
| 96 | 111 | |
| 97 | 112 | public function removeLine() { |
| 98 | 113 | $tokens = $this->tokens; |
| 99 | - foreach ($tokens as &$token) unset($token['line']); |
|
| 114 | + foreach ($tokens as &$token) { |
|
| 115 | + unset($token['line']); |
|
| 116 | + } |
|
| 100 | 117 | return new Tokens($tokens); |
| 101 | 118 | } |
| 102 | 119 | |
@@ -102,14 +102,14 @@ |
||
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | private function getProperties($tokens) { |
| 105 | - $rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON); |
|
| 105 | + $rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON); |
|
| 106 | 106 | |
| 107 | - $return = []; |
|
| 108 | - foreach ($rules as $rule) { |
|
| 109 | - $name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read(); |
|
| 110 | - $return[$name] = $rule->from(Tokenizer::COLON)->trim(); |
|
| 111 | - } |
|
| 107 | + $return = []; |
|
| 108 | + foreach ($rules as $rule) { |
|
| 109 | + $name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read(); |
|
| 110 | + $return[$name] = $rule->from(Tokenizer::COLON)->trim(); |
|
| 111 | + } |
|
| 112 | 112 | |
| 113 | - return $return; |
|
| 114 | - } |
|
| 113 | + return $return; |
|
| 114 | + } |
|
| 115 | 115 | } |
@@ -42,6 +42,9 @@ discard block |
||
| 42 | 42 | return $this->cache->write($this->file, $rules, $this->import); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | + /** |
|
| 46 | + * @param integer $indexStart |
|
| 47 | + */ |
|
| 45 | 48 | private function parseTokens($indexStart) { |
| 46 | 49 | $this->rules = []; |
| 47 | 50 | foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) { |
@@ -66,6 +69,9 @@ discard block |
||
| 66 | 69 | if (empty($rules) && count($this->tss) > 0) throw new \Exception('No TSS rules parsed'); |
| 67 | 70 | } |
| 68 | 71 | |
| 72 | + /** |
|
| 73 | + * @param integer $index |
|
| 74 | + */ |
|
| 69 | 75 | private function CssToRules($selector, $index, $properties, $line) { |
| 70 | 76 | $parts = $selector->trim()->splitOnToken(Tokenizer::ARG); |
| 71 | 77 | $rules = []; |
@@ -89,6 +95,9 @@ discard block |
||
| 89 | 95 | return $rules; |
| 90 | 96 | } |
| 91 | 97 | |
| 98 | + /** |
|
| 99 | + * @param integer $indexStart |
|
| 100 | + */ |
|
| 92 | 101 | private function processingInstructions($token, $indexStart) { |
| 93 | 102 | if ($token['type'] !== Tokenizer::AT_SIGN) return false; |
| 94 | 103 | $tokens = $this->tss->from(Tokenizer::AT_SIGN, false)->to(Tokenizer::SEMI_COLON, false); |
@@ -119,6 +128,10 @@ discard block |
||
| 119 | 128 | return ($a->depth < $b->depth) ? -1 : 1; |
| 120 | 129 | } |
| 121 | 130 | |
| 131 | + /** |
|
| 132 | + * @param string $open |
|
| 133 | + * @param string $close |
|
| 134 | + */ |
|
| 122 | 135 | private function stripComments($str, $open, $close) { |
| 123 | 136 | $pos = 0; |
| 124 | 137 | while (($pos = strpos($str, $open, $pos)) !== false) { |
@@ -25,8 +25,11 @@ discard block |
||
| 25 | 25 | $this->file = $tss; |
| 26 | 26 | $this->rules = $this->cache->load($tss); |
| 27 | 27 | $this->filePath->addPath(dirname(realpath($tss))); |
| 28 | - if (empty($this->rules)) $tss = file_get_contents($tss); |
|
| 29 | - else return; |
|
| 28 | + if (empty($this->rules)) { |
|
| 29 | + $tss = file_get_contents($tss); |
|
| 30 | + } else { |
|
| 31 | + return; |
|
| 32 | + } |
|
| 30 | 33 | } |
| 31 | 34 | $this->tss = $this->stripComments($tss, '//', "\n"); |
| 32 | 35 | $this->tss = $this->stripComments($this->tss, '/*', '*/'); |
@@ -35,7 +38,9 @@ discard block |
||
| 35 | 38 | } |
| 36 | 39 | |
| 37 | 40 | public function parse($indexStart = 0) { |
| 38 | - if (!empty($this->rules)) return $this->rules['rules']; |
|
| 41 | + if (!empty($this->rules)) { |
|
| 42 | + return $this->rules['rules']; |
|
| 43 | + } |
|
| 39 | 44 | $rules = $this->parseTokens($indexStart); |
| 40 | 45 | usort($rules, [$this, 'sortRules']); |
| 41 | 46 | $this->checkError($rules); |
@@ -47,8 +52,9 @@ discard block |
||
| 47 | 52 | foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) { |
| 48 | 53 | if ($processing = $this->processingInstructions($token, count($this->rules)+$indexStart)) { |
| 49 | 54 | $this->rules = array_merge($this->rules, $processing); |
| 55 | + } else if ($token['type'] !== Tokenizer::NEW_LINE) { |
|
| 56 | + $this->addRules($token, $indexStart); |
|
| 50 | 57 | } |
| 51 | - else if ($token['type'] !== Tokenizer::NEW_LINE) $this->addRules($token, $indexStart); |
|
| 52 | 58 | } |
| 53 | 59 | return $this->rules; |
| 54 | 60 | } |
@@ -56,14 +62,18 @@ discard block |
||
| 56 | 62 | private function addRules($token, $indexStart) { |
| 57 | 63 | $selector = $this->tss->from($token['type'], true)->to(Tokenizer::OPEN_BRACE); |
| 58 | 64 | $this->tss->skip(count($selector)); |
| 59 | - if (count($selector) === 0) return; |
|
| 65 | + if (count($selector) === 0) { |
|
| 66 | + return; |
|
| 67 | + } |
|
| 60 | 68 | |
| 61 | 69 | $newRules = $this->cssToRules($selector, count($this->rules)+$indexStart, $this->getProperties($this->tss->current()['value']), $token['line']); |
| 62 | 70 | $this->rules = $this->writeRule($this->rules, $newRules); |
| 63 | 71 | } |
| 64 | 72 | |
| 65 | 73 | private function checkError($rules) { |
| 66 | - if (empty($rules) && count($this->tss) > 0) throw new \Exception('No TSS rules parsed'); |
|
| 74 | + if (empty($rules) && count($this->tss) > 0) { |
|
| 75 | + throw new \Exception('No TSS rules parsed'); |
|
| 76 | + } |
|
| 67 | 77 | } |
| 68 | 78 | |
| 69 | 79 | private function CssToRules($selector, $index, $properties, $line) { |
@@ -90,7 +100,9 @@ discard block |
||
| 90 | 100 | } |
| 91 | 101 | |
| 92 | 102 | private function processingInstructions($token, $indexStart) { |
| 93 | - if ($token['type'] !== Tokenizer::AT_SIGN) return false; |
|
| 103 | + if ($token['type'] !== Tokenizer::AT_SIGN) { |
|
| 104 | + return false; |
|
| 105 | + } |
|
| 94 | 106 | $tokens = $this->tss->from(Tokenizer::AT_SIGN, false)->to(Tokenizer::SEMI_COLON, false); |
| 95 | 107 | $funcName = $tokens->from(Tokenizer::NAME, true)->read(); |
| 96 | 108 | $args = $this->valueParser->parseTokens($tokens->from(Tokenizer::NAME)); |
@@ -110,7 +122,9 @@ discard block |
||
| 110 | 122 | |
| 111 | 123 | private function sortRules($a, $b) { |
| 112 | 124 | //If they have the same depth, compare on index |
| 113 | - if ($a->depth === $b->depth) return $a->index < $b->index ? -1 : 1; |
|
| 125 | + if ($a->depth === $b->depth) { |
|
| 126 | + return $a->index < $b->index ? -1 : 1; |
|
| 127 | + } |
|
| 114 | 128 | |
| 115 | 129 | return ($a->depth < $b->depth) ? -1 : 1; |
| 116 | 130 | } |
@@ -119,7 +133,9 @@ discard block |
||
| 119 | 133 | $pos = 0; |
| 120 | 134 | while (($pos = strpos($str, $open, $pos)) !== false) { |
| 121 | 135 | $end = strpos($str, $close, $pos); |
| 122 | - if ($end === false) break; |
|
| 136 | + if ($end === false) { |
|
| 137 | + break; |
|
| 138 | + } |
|
| 123 | 139 | $str = substr_replace($str, '', $pos, $end-$pos+strlen($close)); |
| 124 | 140 | } |
| 125 | 141 | |