kadet1090 / KeyLighter

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);
 

Utils/Console.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
     ];
 
     public static function styled($style, $text) {
-        return self::open($style).$text.self::close();
+        return self::open($style) . $text . self::close();
     }
 
     public static function open($style)
@@ -48,7 +48,7 @@ 
     public static function close()
     {
         self::$_current = empty(self::$_stack) ? self::$_default : array_pop(self::$_stack);
-        return "\033[0m".self::_set(array_diff(self::$_current, self::$_default));
+        return "\033[0m" . self::_set(array_diff(self::$_current, self::$_default));
     }
 
     private static function _color($name, $bg = false)
@@ -77,7 +77,7 @@ 
     }
 
     private static function _style($name, $value) {
-        switch($name) {
+        switch ($name) {
             case 'color':
                 return self::_color($value);
             case 'background':
@@ -98,9 +98,9 @@ 
     }
 
     private static function _set($style) {
-        $escape = "\033[".implode(';', array_map(function($style, $name) {
+        $escape = "\033[" . implode(';', array_map(function($style, $name) {
                 return self::_style($style, $name);
-            }, array_keys($style), $style)).'m';
+            }, array_keys($style), $style)) . 'm';
 
         return $escape;
     }

KeyLighter.php

Spacing +4 added lines, -5 removed lines

@@ -37,12 +37,12 @@ 
      */
     public static 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));
         }
 
-        if(!isset(self::$_languages[$name])) {
+        if (!isset(self::$_languages[$name])) {
             throw new \InvalidArgumentException("Language $name is not defined.");
         }
 
@@ -68,7 +68,7 @@ 
     public static function highlight($source, $language, FormatterInterface $formatter = null) {
         $formatter = $formatter ?: self::getDefaultFormatter();
 
-        if(!$language instanceof Language) {
+        if (!$language instanceof Language) {
             $language = self::getLanguage($language);
         }
 
@@ -80,8 +80,7 @@ 
 
 Highlighter::setDefaultFormatter(
     php_sapi_name() === 'cli' ?
-        new CliFormatter() :
-        new HtmlFormatter()
+        new CliFormatter() : new HtmlFormatter()
 );
 
 Highlighter::registerLanguage('Kadet\\Highlighter\\Language\\PhpLanguage', ['php']);

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,

bin/keylighter.php

Spacing +41 added lines, -41 removed lines

@@ -17,9 +17,9 @@ 
 
 use Kadet\Highlighter\Utils\Console;
 
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
-$title = Console::styled(['color' => 'yellow'], 'KeyLighter ').'v'.\Kadet\Highlighter\KeyLighter::VERSION.' by Kadet';
+$title = Console::styled(['color' => 'yellow'], 'KeyLighter ') . 'v' . \Kadet\Highlighter\KeyLighter::VERSION . ' by Kadet';
 $formatters = [
     'html' => new \Kadet\Highlighter\Formatter\HtmlFormatter(),
     'cli'  => new \Kadet\Highlighter\Formatter\CliFormatter(),
@@ -27,17 +27,17 @@ 
 
 function printTable($table, $spacing = 4) {
     $max = [];
-    foreach(array_keys(reset($table)) as $key) {
+    foreach (array_keys(reset($table)) as $key) {
         $max[$key] = max(array_map(function($option) use ($key) { return strlen($option[$key]); }, $table)) + $spacing;
     }
 
-    if(isset($key)) {
+    if (isset($key)) {
         $max[$key] = 0; // Reset last
     }
 
     foreach ($table as $option) {
         echo "\t";
-        foreach($option as $key => $cell) {
+        foreach ($option as $key => $cell) {
             echo str_pad($cell, $max[$key], ' ', STR_PAD_RIGHT);
         }
         echo PHP_EOL;
@@ -53,12 +53,12 @@ 
 function getOption($options, $value = true, $default = null) {
     global $argv;
 
-    foreach($options as $option) {
-        if($pos = array_search($option, $argv)) {
+    foreach ($options as $option) {
+        if ($pos = array_search($option, $argv)) {
             $return = !$value || !isset($argv[$pos + 1]) ? $default : $argv[$pos + 1];
 
-            if($value && isset($argv[$pos + 1])) {
-                unset($argv[$pos+1]);
+            if ($value && isset($argv[$pos + 1])) {
+                unset($argv[$pos + 1]);
             }
             unset($argv[$pos]);
 
@@ -70,29 +70,29 @@ 
 }
 
 function benchmark($description, callable $callable) {
-    echo Console::styled(['color' => 'yellow'], $description.'... ');
+    echo Console::styled(['color' => 'yellow'], $description . '... ');
     $start = microtime(true);
         $return = $callable();
     $done = microtime(true) - $start;
-    echo Console::styled(['color' => 'green'], 'Done! ').number_format($done, 3).'s'.PHP_EOL;
+    echo Console::styled(['color' => 'green'], 'Done! ') . number_format($done, 3) . 's' . PHP_EOL;
 
     return $return;
 }
 
-if($argc == 1) {
+if ($argc == 1) {
     echo $title, PHP_EOL, PHP_EOL;
 
-    echo Console::styled(['color' => 'green'], 'Usage: '), 'php '.$argv[0].' [options] file', PHP_EOL;
+    echo Console::styled(['color' => 'green'], 'Usage: '), 'php ' . $argv[0] . ' [options] file', PHP_EOL;
 
     echo Console::styled(['color' => 'green'], 'Options: '), PHP_EOL;
     printTable([
-        ['-l, --language',    'language', 'Source Language to highlight, default: xml > php'],
-        ['-f, --format',      'format',   'Formatter used to highlight source, for example: html, default: cli'],
-        ['-h, --help',         null,      'This screen'],
-        ['-v, --verbose',     'level',    'Verbose mode'],
-        ['-lf, --formatters',  null,      'List available formatters'],
-        ['-ll, --languages',   null,      'List available languages'],
-        ['-s, --silent',       null,      'No output, '],
+        ['-l, --language', 'language', 'Source Language to highlight, default: xml > php'],
+        ['-f, --format', 'format', 'Formatter used to highlight source, for example: html, default: cli'],
+        ['-h, --help', null, 'This screen'],
+        ['-v, --verbose', 'level', 'Verbose mode'],
+        ['-lf, --formatters', null, 'List available formatters'],
+        ['-ll, --languages', null, 'List available languages'],
+        ['-s, --silent', null, 'No output, '],
 
     ]);
     exit(0);
@@ -100,19 +100,19 @@ 
 
 unset($argv[0]);
 
-if(getOption(['-ll', '--languages'], false, true)) {
+if (getOption(['-ll', '--languages'], false, true)) {
     $languages = \Kadet\Highlighter\KeyLighter::registeredLanguages();
 
     $result = [];
-    foreach($languages as $alias => $class) {
-        if(!isset($result[$class])) {
+    foreach ($languages as $alias => $class) {
+        if (!isset($result[$class])) {
             $result[$class] = ['aliases' => [], 'class' => $class];
         }
 
         $result[$class]['aliases'][] = $alias;
     }
 
-    echo Console::styled(['color' => 'green'], 'Available languages: ').PHP_EOL;
+    echo Console::styled(['color' => 'green'], 'Available languages: ') . PHP_EOL;
 
     printTable(array_map(function($language) {
         return [
@@ -125,8 +125,8 @@ 
     exit(0);
 }
 
-if(getOption(['-lf', '--formatters'], false, true)) {
-    echo Console::styled(['color' => 'green'], 'Available formatters: ').PHP_EOL;
+if (getOption(['-lf', '--formatters'], false, true)) {
+    echo Console::styled(['color' => 'green'], 'Available formatters: ') . PHP_EOL;
     printTable(array_map(function($name, $formatter) {
         return [
             Console::styled(['color' => 'yellow'], $name),
@@ -138,43 +138,43 @@ 
 }
 
 $language  = \Kadet\Highlighter\KeyLighter::getLanguage(getOption(['-l', '--language']) ?: 'php');
-$verbose   = getOption(['-v', '--verbose'], true, 1)  ?: 0;
+$verbose   = getOption(['-v', '--verbose'], true, 1) ?: 0;
 $formatter = getFormatter(getOption(['-f', '--format'])) ?: \Kadet\Highlighter\KeyLighter::getDefaultFormatter();
 $silent    = getOption(['-s', '--silent'], false, true);
 
 $file = reset($argv);
 
-if($verbose > 0) {
-    echo $title.PHP_EOL;
+if ($verbose > 0) {
+    echo $title . PHP_EOL;
     echo PHP_EOL;
-    echo Console::styled(['color' => 'green'], 'Language:  ').get_class($language).PHP_EOL;
+    echo Console::styled(['color' => 'green'], 'Language:  ') . get_class($language) . PHP_EOL;
 
     $embedded = $language->getEmbedded();
-    if(!empty($embedded)) {
-        echo Console::styled(['color' => 'green'], '    With:  ').implode(', ', array_map('get_class', $embedded)).PHP_EOL;
+    if (!empty($embedded)) {
+        echo Console::styled(['color' => 'green'], '    With:  ') . implode(', ', array_map('get_class', $embedded)) . PHP_EOL;
 
     }
 
-    echo Console::styled(['color' => 'green'], 'Formatter: ').get_class($formatter).PHP_EOL;
-    echo Console::styled(['color' => 'green'], 'File:      ').$file.PHP_EOL;
+    echo Console::styled(['color' => 'green'], 'Formatter: ') . get_class($formatter) . PHP_EOL;
+    echo Console::styled(['color' => 'green'], 'File:      ') . $file . PHP_EOL;
     echo PHP_EOL;
 }
 
-if(!file_exists($file)) {
-    echo Console::styled(['color' => 'red'], 'File not exists.').PHP_EOL;
+if (!file_exists($file)) {
+    echo Console::styled(['color' => 'red'], 'File not exists.') . PHP_EOL;
     die(1);
 }
 
 $source = file_get_contents($file);
-if($verbose > 1) {
+if ($verbose > 1) {
     $tokens    = benchmark('Tokenization', function() use($language, $source) { return $language->tokenize($source); });
     $tokens    = benchmark('Parsing', function() use($language, $tokens) { return $language->parse($tokens); });
     $formatted = benchmark('Formatting', function() use($formatter, $tokens, $source) {
         return $formatter->format($source, new ArrayIterator($tokens));
     });
 
-    if(function_exists('xdebug_peak_memory_usage')) {
-        echo Console::styled(['color' => 'green'], 'Max memory usage: ').number_format(xdebug_peak_memory_usage()/1024/1024, 4).'MBytes'.PHP_EOL;
+    if (function_exists('xdebug_peak_memory_usage')) {
+        echo Console::styled(['color' => 'green'], 'Max memory usage: ') . number_format(xdebug_peak_memory_usage() / 1024 / 1024, 4) . 'MBytes' . PHP_EOL;
     }
 
     echo PHP_EOL;
@@ -182,6 +182,6 @@ 
     $formatted = \Kadet\Highlighter\KeyLighter::highlight($source, $language, $formatter);
 }
 
-if(!$silent) {
-    echo $formatted.PHP_EOL;
+if (!$silent) {
+    echo $formatted . PHP_EOL;
 }
\ No newline at end of file

Language/Language.php

Spacing +7 added lines, -7 removed lines

@@ -72,7 +72,7 @@ 
     {
         if (is_string($tokens)) {
             $tokens = $this->tokenize($tokens);
-        } elseif(!$tokens instanceof TokenIterator) {
+        } elseif (!$tokens instanceof TokenIterator) {
             throw new \InvalidArgumentException('$tokens must be string or TokenIterator');
         }
 
@@ -85,7 +85,7 @@ 
         $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)) {
@@ -109,7 +109,7 @@ 
                 if ($token instanceof LanguageToken && $token->getRule()->getLanguage() === $this) {
                     $result[0]->setEnd($token);
 
-                    if($result[0]->getRule()->postProcess) {
+                    if ($result[0]->getRule()->postProcess) {
                         $embed = $this
                             ->parse(substr($tokens->getSource(), $result[0]->pos, $result[0]->getLength()))
                             ->getTokens($result[0]->pos);
@@ -118,7 +118,7 @@ 
                     }
 
                     # closing unclosed tokens
-                    foreach(array_reverse($context) as $hash => $name) {
+                    foreach (array_reverse($context) as $hash => $name) {
                         $result[$hash]->setEnd(new Token([$name, 'pos' => $token->pos]));
                     }
 
@@ -129,7 +129,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;
                         });
 
@@ -166,7 +166,7 @@ 
 
             /** @var Rule $rule */
             foreach ($rules as $rule) {
-                if(strpos($name, 'language.') === false) {
+                if (strpos($name, 'language.') === false) {
                     $rule->setLanguage($this);
                 }
 
@@ -176,7 +176,7 @@ 
             }
         }
 
-        foreach($this->getEmbedded() as $language) {
+        foreach ($this->getEmbedded() as $language) {
             $result = array_merge($result, $language->_tokens($source));
         }
 

Parser/TokenIterator.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         $result = $this->getArrayCopy();
 
         // Array map would be cool, but is a lot slower
-        if($offset) {
+        if ($offset) {
             foreach ($result as $item) {
                 $item->pos += $offset;
             }

Parser/Token.php

Spacing +3 added lines, -3 removed lines

@@ -91,13 +91,13 @@
             $multiplier = $a->isEnd() ? -1 : 1;
 
             if (($rule = Helper::cmp($b->_rule->getPriority(), $a->_rule->getPriority())) !== 0) {
-                return $multiplier*$rule;
+                return $multiplier * $rule;
             } elseif (($a->isStart() && !$b->isStart()) || ($a->isEnd() && !$b->isEnd())) {
                 return $multiplier;
             } 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);
             }
         }