kadet1090 / KeyLighter

Parser/TokenList.php

Spacing +2 added lines, -2 removed lines

@@ -56,10 +56,10 @@
     public function sort() {
         ksort($this->_tokens);
 
-        foreach(array_keys($this->_pending) as $position) {
+        foreach (array_keys($this->_pending) as $position) {
             uasort(
                 $this->_tokens[$position],
-                Token::class.'::compare'
+                Token::class . '::compare'
             );
         }
         $this->_pending = [];

Parser/TokenFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
     }
 
     /**
-     * @param mixed $class
+     * @param string $class
      *
      * @throws \InvalidArgumentException
      */

Spacing +5 added lines, -5 removed lines

@@ -46,11 +46,11 @@ 
      */
     public function create($params) {
         $params[0] = !empty($params[0]) ? $this->getName($params[0]) : $this->_base;
-        if(empty($params['rule'])) {
+        if (empty($params['rule'])) {
             $params['rule'] = $this->_rule;
         }
 
-        if(isset($params['pos'])) {
+        if (isset($params['pos'])) {
             $params['pos'] += $this->_offset;
         }
 
@@ -66,11 +66,11 @@ 
         /** @var Token $token */
         $token = new $this->_class($params);
 
-        if($this->_type == 0x3) {
+        if ($this->_type == 0x3) {
             return $token;
         }
 
-        if($this->_type === Token::START) {
+        if ($this->_type === Token::START) {
             $token->setEnd(false);
             return $token;
         } else {
@@ -119,7 +119,7 @@ 
      */
     public function setClass($class)
     {
-        if(!is_a($class, 'Kadet\Highlighter\Parser\Token', true)) {
+        if (!is_a($class, 'Kadet\Highlighter\Parser\Token', true)) {
             throw new \InvalidArgumentException('$class must extend Kadet\Highlighter\Parser\Token');
         }
 

Parser/Token.php

Spacing +5 added lines, -5 removed lines

@@ -91,19 +91,19 @@
         $multiplier = $a->isEnd() ? -1 : 1;
 
         if (($a->isStart() && $b->isEnd()) || ($a->isEnd() && $b->isStart())) {
-            if($a->getStart() == $b) {
+            if ($a->getStart() == $b) {
                 return 1;
-            } elseif($a->getEnd() == $b) {
+            } elseif ($a->getEnd() == $b) {
                 return -1;
             } else {
                 return $multiplier;
             }
         } elseif (($rule = Helper::cmp($b->_rule->priority, $a->_rule->priority)) !== 0) {
-            return $multiplier*$rule;
+            return $multiplier * $rule;
         } elseif (($rule = Helper::cmp($b->index, $a->index)) !== 0) {
-            return $multiplier*$rule;
+            return $multiplier * $rule;
         } else {
-            return $multiplier*($a->id < $b->id ? -1 : 1);
+            return $multiplier * ($a->id < $b->id ? -1 : 1);
         }
     }
 

Formatter/CliFormatter.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
      * @param $styles
      */
     public function __construct($styles = false) {
-        $this->_styles = $styles ?: include __DIR__.'/../Styles/Cli/Default.php';
+        $this->_styles = $styles ?: include __DIR__ . '/../Styles/Cli/Default.php';
     }
 
     public function format(TokenIterator $tokens)
@@ -55,7 +55,7 @@ 
 
             $last = $token->pos;
         }
-        $result .= substr($source, $last).Console::reset();
+        $result .= substr($source, $last) . Console::reset();
 
         return $result;
     }

KeyLighter.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function getLanguage($name) {
         $embedded = [];
-        if(($pos = strpos($name, '>')) !== false) {
+        if (($pos = strpos($name, '>')) !== false) {
             $embedded[] = self::getLanguage(trim(substr($name, $pos + 1)));
             $name       = trim(substr($name, 0, $pos));
         }
@@ -83,7 +83,7 @@ 
     public function highlight($source, $language, FormatterInterface $formatter = null) {
         $formatter = $formatter ?: $this->getDefaultFormatter();
 
-        if(!$language instanceof Language) {
+        if (!$language instanceof Language) {
             $language = $this->getLanguage($language);
         }
 

Language/Sql.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         'INTERSECT', 'INTERVAL', 'INTO', 'IS', 'ITERATE', 'LANGUAGE', 'LARGE', 'LATERAL', 'LEADING',
         'LEAVE', 'LEFT', 'LIKE', 'LOCAL', 'LOOP', 'MATCH', 'MEMBER', 'MERGE', 'METHOD', 'MODIFIES',
         'MODULE', 'MONTH', 'MULTISET', 'NATIONAL', 'NATURAL', 'NCHAR', 'NCLOB', 'NEW', 'NO', 'NONE', 'NOT',
-        'OF', 'OLD', 'ON', 'ONLY', 'OPEN', 'OR', 'ORDER', 'OUT','OUTER', 'OUTPUT', 'OVER',
+        'OF', 'OLD', 'ON', 'ONLY', 'OPEN', 'OR', 'ORDER', 'OUT', 'OUTER', 'OUTPUT', 'OVER',
         'OVERLAPS', 'PARAMETER', 'PARTITION', 'PRECISION', 'PREPARE', 'PRIMARY', 'PROCEDURE', 'RANGE', 'READS',
         'RECURSIVE', 'REF', 'REFERENCES', 'REFERENCING', 'RELEASE',
         'REPEAT', 'RESIGNAL', 'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'RIGHT', 'ROLLBACK', 'ROLLUP', 'ROW',

Utils/ArrayHelper.php

Spacing +3 added lines, -3 removed lines

@@ -20,14 +20,14 @@ 
 {
     public static function rearrange(array $array, array $keys)
     {
-        return array_combine($keys, array_map(function ($key) use ($array) {
+        return array_combine($keys, array_map(function($key) use ($array) {
             return $array[$key];
         }, $keys));
     }
 
     public static function column(array $array, $index)
     {
-        return array_map(function ($e) use ($index) { return $e[$index]; }, $array);
+        return array_map(function($e) use ($index) { return $e[$index]; }, $array);
     }
 
     public static function find(array $array, callable $tester)
@@ -43,7 +43,7 @@ 
 
     public static function resolve(array $array, $key, $fallback = null) {
         do {
-            if(isset($array[$key])) {
+            if (isset($array[$key])) {
                 return $array[$key];
             }
 

Language/Language.php

Doc Comments +5 added lines, -2 removed lines

@@ -158,6 +158,9 @@ 
         return new TokenIterator($result, $tokens->getSource());
     }
 
+    /**
+     * @param string $source
+     */
     public function tokenize($source, $additional = [], $offset = 0, $embedded = false)
     {
         $iterator = new TokenIterator(
@@ -197,7 +200,7 @@ 
     /**
      * @param bool $embedded
      *
-     * @return Rule[]
+     * @return \Generator
      */
     private function _rules($embedded = false)
     {
@@ -241,7 +244,7 @@ 
     /**
      * Language range Rule(s)
      *
-     * @return Rule|Rule[]
+     * @return Rule
      */
     public function getOpenClose()
     {

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
                     } else {
                         /** @noinspection PhpUnusedParameterInspection */
                         $start = ArrayHelper::find(
-                            array_reverse($context), function ($k, $v) use ($token) {
+                            array_reverse($context), function($k, $v) use ($token) {
                             return $v === $token->name;
                         });