kadet1090 / KeyLighter

Language/Language.php

Doc Comments +4 added lines, -1 removed lines

@@ -164,6 +164,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $source
+     */
     public function tokenize($source)
     {
         $iterator = new \ArrayIterator($this->_tokens($source));
@@ -182,7 +185,7 @@ 
     /**
      * Language range Rule(s)
      *
-     * @return Rule|Rule[]
+     * @return Rule
      */
     public function getOpenClose()
     {

Spacing +10 added lines, -10 removed lines

@@ -48,11 +48,11 @@ 
      * @param array $options
      */
     public function __construct(array $options = []) {
-        $this->_options  = array_merge([
+        $this->_options = array_merge([
             'embedded' => [],
         ], $this->_options, $options);
 
-        $this->_rules    = $this->getRules();
+        $this->_rules = $this->getRules();
     }
 
     /**
@@ -76,7 +76,7 @@ 
     {
         if (is_string($tokens)) {
             $tokens = $this->tokenize($tokens, $additional, $embedded);
-        } elseif(!$tokens instanceof TokenIterator) {
+        } elseif (!$tokens instanceof TokenIterator) {
             // Todo: Own Exceptions
             throw new \InvalidArgumentException('$tokens must be string or TokenIterator');
         }
@@ -90,7 +90,7 @@ 
         /** @var Token[] $all */    $all    = [];
 
         /** @var Token $token */
-        for($tokens->next(); $tokens->valid(); $tokens->next()) {
+        for ($tokens->next(); $tokens->valid(); $tokens->next()) {
             $token = $tokens->current();
 
             if (!$token->isValid($this, $context)) {
@@ -115,7 +115,7 @@ 
                 if ($token instanceof LanguageToken && $token->getLanguage() === $this) {
                     $result[0]->setEnd($token);
 
-                    if($result[0]->getRule()->postProcess) {
+                    if ($result[0]->getRule()->postProcess) {
                         $source = substr($tokens->getSource(), $result[0]->pos, $result[0]->getLength());
 
                         $tokens = $this->tokenize($source, $result, $result[0]->pos, true);
@@ -123,7 +123,7 @@ 
                     }
 
                     # closing unclosed tokens
-                    foreach(array_reverse($context) as $hash => $name) {
+                    foreach (array_reverse($context) as $hash => $name) {
                         $end = new Token([$name, 'pos' => $token->pos]);
                         $all[$hash]->setEnd($end);
                         $result[] = $end;
@@ -136,7 +136,7 @@ 
                         unset($context[spl_object_hash($start)]);
                     } else {
                         /** @noinspection PhpUnusedParameterInspection */
-                        $start = ArrayHelper::find(array_reverse($context), function ($k, $v) use ($token) {
+                        $start = ArrayHelper::find(array_reverse($context), function($k, $v) use ($token) {
                             return $v === $token->name;
                         });
 
@@ -169,7 +169,7 @@ 
     private function _tokens($source, $offset = 0, $additional = [], $embedded = false)
     {
         $all = $this->_rules;
-        if(!$embedded) {
+        if (!$embedded) {
             $all['language.' . $this->getIdentifier()] = $this->getOpenClose();
         }
 
@@ -181,7 +181,7 @@ 
 
             /** @var Rule $rule */
             foreach ($rules as $rule) {
-                if($rule->language === false) {
+                if ($rule->language === false) {
                     $rule->language = $this;
                 }
 
@@ -192,7 +192,7 @@ 
             }
         }
 
-        foreach($this->getEmbedded() as $language) {
+        foreach ($this->getEmbedded() as $language) {
             $result = array_merge($result, $language->_tokens($source, $offset));
         }
 

Formatter/CliFormatter.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,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($source, \Traversable $tokens)
@@ -51,7 +51,7 @@ 
 
             $last = $token->pos;
         }
-        $result .= substr($source, $last).Console::reset();
+        $result .= substr($source, $last) . Console::reset();
 
         return $result;
     }
@@ -59,7 +59,7 @@ 
     public function getColor($token)
     {
         do {
-            if(isset($this->_styles[$token])) {
+            if (isset($this->_styles[$token])) {
                 return $this->_styles[$token];
             }
 

Parser/Rule.php

Spacing +2 added lines, -2 removed lines

@@ -128,7 +128,7 @@ 
         reset($required);
         while (list($rule, $type) = each($required)) {
             $matched = !($type & self::CONTEXT_EXACTLY) ?
-                count(array_filter($context, function ($a) use ($rule) {
+                count(array_filter($context, function($a) use ($rule) {
                     return $a === $rule || fnmatch($rule . '.*', $a);
                 })) > 0 :
                 in_array($rule, $context, true);
@@ -159,7 +159,7 @@ 
     private function _unsetUnnecessaryRules($rule, &$required)
     {
         if (strpos($rule, '.') !== false) {
-            foreach (array_filter(array_keys($this->_context), function ($key) use ($rule) {
+            foreach (array_filter(array_keys($this->_context), function($key) use ($rule) {
                 return fnmatch($key . '.*', $rule);
             }) as $remove) {
                 unset($required[$remove]);

Parser/CloseRule.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 {
     public function match($source)
     {
-        return array_filter(parent::match($source), function (Token $token) {
+        return array_filter(parent::match($source), function(Token $token) {
             if ($token->isEnd()) {
                 $token->setStart(null);
 

Matcher/WordMatcher.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         ], $options);
 
         if ($options['escape']) {
-            $words = array_map(function ($word) {
+            $words = array_map(function($word) {
                 return preg_quote($word, '/');
             }, $words);
         }

Matcher/CommentMatcher.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         $all = [];
 
         foreach ($this->multiLine as $name => $comment) {
-            $comment = array_map(function ($e) { return preg_quote($e, '/'); }, $comment);
+            $comment = array_map(function($e) { return preg_quote($e, '/'); }, $comment);
 
             $all[] = [$name, "/{$comment[0]}(.*?){$comment[1]}/ms"];
         }

Utils/ArrayHelper.php

Spacing +2 added lines, -2 removed lines

@@ -45,14 +45,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)

Parser/OpenRule.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 {
     public function match($source)
     {
-        return array_filter(parent::match($source), function (Token $token) {
+        return array_filter(parent::match($source), function(Token $token) {
             if ($token->isEnd()) {
                 $token->setStart(null);
 

Language/HtmlLanguage.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         $js = new JavaScriptLanguage();
 
         return array_merge(parent::getRules(), [
-            'language.'.$js->getIdentifier() => [
+            'language.' . $js->getIdentifier() => [
                 new OpenRule(new RegexMatcher('/<script.*?>()/'), [
                     'factory'     => new TokenFactory('Kadet\\Highlighter\\Parser\\LanguageToken'),
                     'inject'      => $js,