@@ -27,7 +27,7 @@ |
||
| 27 | 27 | * @return ConsoleHelper |
| 28 | 28 | */ |
| 29 | 29 | public static function get() { |
| 30 | - if(!isset(self::$_instance)) { |
|
| 30 | + if (!isset(self::$_instance)) { |
|
| 31 | 31 | self::$_instance = new ConsoleHelper(); |
| 32 | 32 | } |
| 33 | 33 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | ]; |
| 32 | 32 | |
| 33 | 33 | public function styled($style, $text) { |
| 34 | - return $this->open($style).$text.$this->close(); |
|
| 34 | + return $this->open($style) . $text . $this->close(); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function open($style) |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | public function close() |
| 49 | 49 | { |
| 50 | 50 | $this->_current = empty($this->_stack) ? $this->_default : array_pop($this->_stack); |
| 51 | - return "\033[0m".$this->_set(array_diff($this->_current, $this->_default)); |
|
| 51 | + return "\033[0m" . $this->_set(array_diff($this->_current, $this->_default)); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | private function _color($name, $bg = false) |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | private function _style($name, $value) { |
| 80 | - switch($name) { |
|
| 80 | + switch ($name) { |
|
| 81 | 81 | case 'color': |
| 82 | 82 | return $this->_color($value); |
| 83 | 83 | case 'background': |
@@ -98,9 +98,9 @@ discard block |
||
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | private function _set($style) { |
| 101 | - $escape = "\e[".implode(';', array_map(function($style, $name) { |
|
| 101 | + $escape = "\e[" . implode(';', array_map(function($style, $name) { |
|
| 102 | 102 | return $this->_style($style, $name); |
| 103 | - }, array_keys($style), $style)).'m'; |
|
| 103 | + }, array_keys($style), $style)) . 'm'; |
|
| 104 | 104 | |
| 105 | 105 | return $escape === "\e[m" ? null : $escape; |
| 106 | 106 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | { |
| 73 | 73 | if (is_string($tokens)) { |
| 74 | 74 | $tokens = $this->tokenize($tokens, $additional, $embedded); |
| 75 | - } elseif(!$tokens instanceof TokenIterator) { |
|
| 75 | + } elseif (!$tokens instanceof TokenIterator) { |
|
| 76 | 76 | // Todo: Own Exceptions |
| 77 | 77 | throw new \InvalidArgumentException('$tokens must be string or TokenIterator'); |
| 78 | 78 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | /** @var Token[] $all */ $all = []; |
| 87 | 87 | |
| 88 | 88 | /** @var Token $token */ |
| 89 | - for($tokens->next(); $tokens->valid(); $tokens->next()) { |
|
| 89 | + for ($tokens->next(); $tokens->valid(); $tokens->next()) { |
|
| 90 | 90 | $token = $tokens->current(); |
| 91 | 91 | |
| 92 | 92 | if (!$token->isValid($this, $context)) { |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | if ($token instanceof LanguageToken && $token->getLanguage() === $this) { |
| 112 | 112 | $result[0]->setEnd($token); |
| 113 | 113 | |
| 114 | - if($result[0]->getRule()->postProcess) { |
|
| 114 | + if ($result[0]->getRule()->postProcess) { |
|
| 115 | 115 | $source = substr($tokens->getSource(), $result[0]->pos, $result[0]->getLength()); |
| 116 | 116 | |
| 117 | 117 | $tokens = $this->tokenize($source, $result, $result[0]->pos, true); |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | # closing unclosed tokens |
| 122 | - foreach(array_reverse($context) as $hash => $name) { |
|
| 122 | + foreach (array_reverse($context) as $hash => $name) { |
|
| 123 | 123 | $end = new Token([$name, 'pos' => $token->pos]); |
| 124 | 124 | $all[$hash]->setEnd($end); |
| 125 | 125 | $result[] = $end; |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | unset($context[spl_object_hash($start)]); |
| 133 | 133 | } else { |
| 134 | 134 | /** @noinspection PhpUnusedParameterInspection */ |
| 135 | - $start = ArrayHelper::find(array_reverse($context), function ($k, $v) use ($token) { |
|
| 135 | + $start = ArrayHelper::find(array_reverse($context), function($k, $v) use ($token) { |
|
| 136 | 136 | return $v === $token->name; |
| 137 | 137 | }); |
| 138 | 138 | |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | private function _tokens($source, $offset = 0, $additional = [], $embedded = false) |
| 166 | 166 | { |
| 167 | 167 | $all = $this->_rules; |
| 168 | - if(!$embedded) { |
|
| 168 | + if (!$embedded) { |
|
| 169 | 169 | $all['language.' . $this->getIdentifier()] = $this->getOpenClose(); |
| 170 | 170 | } |
| 171 | 171 | |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | /** @var Rule $rule */ |
| 179 | 179 | foreach ($rules as $rule) { |
| 180 | - if($rule->language === false) { |
|
| 180 | + if ($rule->language === false) { |
|
| 181 | 181 | $rule->language = $this; |
| 182 | 182 | } |
| 183 | 183 | |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - foreach($this->getEmbedded() as $language) { |
|
| 191 | + foreach ($this->getEmbedded() as $language) { |
|
| 192 | 192 | $result = array_merge($result, $language->_tokens($source, $offset)); |
| 193 | 193 | } |
| 194 | 194 | |
@@ -39,11 +39,11 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | public function create($params) { |
| 41 | 41 | $params[0] = !empty($params[0]) ? $this->getName($params[0]) : $this->_base; |
| 42 | - if(empty($params['rule'])) { |
|
| 42 | + if (empty($params['rule'])) { |
|
| 43 | 43 | $params['rule'] = $this->_rule; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - if(isset($params['pos'])) { |
|
| 46 | + if (isset($params['pos'])) { |
|
| 47 | 47 | $params['pos'] += $this->getOffset(); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | */ |
| 125 | 125 | public function setClass($class) |
| 126 | 126 | { |
| 127 | - if(!is_a($class, 'Kadet\Highlighter\Parser\Token', true)) { |
|
| 127 | + if (!is_a($class, 'Kadet\Highlighter\Parser\Token', true)) { |
|
| 128 | 128 | throw new \InvalidArgumentException('$class must extend Kadet\Highlighter\Parser\Token'); |
| 129 | 129 | } |
| 130 | 130 | |
@@ -34,9 +34,9 @@ |
||
| 34 | 34 | |
| 35 | 35 | if ($this->isStart()) { |
| 36 | 36 | $lang = $this->_rule->language; |
| 37 | - if($lang === null && $this->getInjected() !== $language) { |
|
| 37 | + if ($lang === null && $this->getInjected() !== $language) { |
|
| 38 | 38 | $valid = true; |
| 39 | - } elseif($language === $lang && $this->_rule->validateContext($context)) { |
|
| 39 | + } elseif ($language === $lang && $this->_rule->validateContext($context)) { |
|
| 40 | 40 | $valid = true; |
| 41 | 41 | } |
| 42 | 42 | } else { |
@@ -93,19 +93,19 @@ |
||
| 93 | 93 | $multiplier = $a->isEnd() ? -1 : 1; |
| 94 | 94 | |
| 95 | 95 | if (($a->isStart() && $b->isEnd()) || ($a->isEnd() && $b->isStart())) { |
| 96 | - if($a->getEnd() == $b) { |
|
| 96 | + if ($a->getEnd() == $b) { |
|
| 97 | 97 | return -1; |
| 98 | - } elseif($a->getStart() == $b) { |
|
| 98 | + } elseif ($a->getStart() == $b) { |
|
| 99 | 99 | return 1; |
| 100 | 100 | } else { |
| 101 | 101 | return $multiplier; |
| 102 | 102 | } |
| 103 | 103 | } elseif (($rule = Helper::cmp($b->_rule->priority, $a->_rule->priority)) !== 0) { |
| 104 | - return $multiplier*$rule; |
|
| 104 | + return $multiplier * $rule; |
|
| 105 | 105 | } elseif (($rule = Helper::cmp($b->index, $a->index)) !== 0) { |
| 106 | - return $multiplier*$rule; |
|
| 106 | + return $multiplier * $rule; |
|
| 107 | 107 | } else { |
| 108 | - return $multiplier*($a->id < $b->id ? -1 : 1); |
|
| 108 | + return $multiplier * ($a->id < $b->id ? -1 : 1); |
|
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | * @return ConsoleHelper |
| 28 | 28 | */ |
| 29 | 29 | public static function get() { |
| 30 | - if(!isset(self::$_instance)) { |
|
| 30 | + if (!isset(self::$_instance)) { |
|
| 31 | 31 | self::$_instance = new ConsoleHelper(); |
| 32 | 32 | } |
| 33 | 33 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function getLanguage($name) { |
| 41 | 41 | $embedded = []; |
| 42 | - if(($pos = strpos($name, '>')) !== false) { |
|
| 42 | + if (($pos = strpos($name, '>')) !== false) { |
|
| 43 | 43 | $embedded[] = self::getLanguage(trim(substr($name, $pos + 1))); |
| 44 | 44 | $name = trim(substr($name, 0, $pos)); |
| 45 | 45 | } |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | public function highlight($source, $language, FormatterInterface $formatter = null) { |
| 74 | 74 | $formatter = $formatter ?: $this->getDefaultFormatter(); |
| 75 | 75 | |
| 76 | - if(!$language instanceof Language) { |
|
| 76 | + if (!$language instanceof Language) { |
|
| 77 | 77 | $language = $this->getLanguage($language); |
| 78 | 78 | } |
| 79 | 79 | |
@@ -83,8 +83,7 @@ discard block |
||
| 83 | 83 | public function __construct() { |
| 84 | 84 | $this->setDefaultFormatter( |
| 85 | 85 | php_sapi_name() === 'cli' ? |
| 86 | - new CliFormatter() : |
|
| 87 | - new HtmlFormatter() |
|
| 86 | + new CliFormatter() : new HtmlFormatter() |
|
| 88 | 87 | ); |
| 89 | 88 | |
| 90 | 89 | $this->registerLanguage('Kadet\\Highlighter\\Language\\PhpLanguage', ['php']); |