kadet1090 / KeyLighter

Tests/Samples/php/small.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
     public function find($needle) {
         foreach (array_reverse($this->stack, true) as $id => $name) {
-            if($name === $needle) {
+            if ($name === $needle) {
                 return $id;
             }
         }

Tests/Samples/php/huge.php

Spacing +9 added lines, -10 removed lines

@@ -204,7 +204,7 @@ 
      */
     public function __construct(Jid $jid, $password, AbstractConnector $connector = null)
     {
-        if(!$connector)
+        if (!$connector)
             $connector = new TcpConnector($jid->server);
 
         $this->connector = $connector;
@@ -259,7 +259,7 @@ 
             'wrap'             => 0
         ];
 
-        $this->connector->onSend->add(function ($socket, $packet) use ($settings) {
+        $this->connector->onSend->add(function($socket, $packet) use ($settings) {
             $len = strlen($packet);
 
             if (function_exists('tidy_repair_string'))
@@ -272,7 +272,7 @@ 
                 ]);
         });
 
-        $this->connector->onReceive->add(function ($socket, $packet) use ($settings) {
+        $this->connector->onReceive->add(function($socket, $packet) use ($settings) {
             $len = strlen($packet);
 
             if (function_exists('tidy_repair_string'))
@@ -337,11 +337,11 @@ 
         $start = time();
         $packet = null;
 
-        $this->wait($type, $id, function ($pckt) use (&$packet) {
+        $this->wait($type, $id, function($pckt) use (&$packet) {
             $packet = $pckt;
         });
 
-        while(!$packet && time() - $start < $timeout) {
+        while (!$packet && time() - $start < $timeout) {
             $this->process();
             usleep(5000);
         }
@@ -391,7 +391,7 @@ 
     {
         if ($this->logger)
             $this->logger->notice('SASL Auth, available mechanisms: {mechanisms}', [
-                'mechanisms' => implode(', ', array_map(function (XmlBranch $item) {
+                'mechanisms' => implode(', ', array_map(function(XmlBranch $item) {
                     return $item->content;
                 }, (array)$this->connector->features->mechanisms[0]->mechanism))
             ]);
@@ -741,8 +741,7 @@ 
         if (!$user->fromChannel()) return null;
 
         return isset($this->rooms[$user->bare()]->users[$user->resource]) ?
-            $this->rooms[$user->bare()]->users[$user->resource] :
-            null;
+            $this->rooms[$user->bare()]->users[$user->resource] : null;
     }
 
     /**
@@ -823,7 +822,7 @@ 
 
         $xml = new xmlBranch("presence");
         $xml->addAttribute("from", $this->jid->__toString())
-            ->addAttribute("to", $room->bare() . '/' . $nick)
+            ->addAttribute("to", $room->bare().'/'.$nick)
             ->addAttribute("id", uniqid('mucjoin_'));
         $xml->addChild(new xmlBranch("x"))->addAttribute("xmlns", "http://jabber.org/protocol/muc");
         $this->write($xml->asXml());
@@ -1009,7 +1008,7 @@ 
     }
 
     public function __destruct() {
-        if($this->connector->connected)
+        if ($this->connector->connected)
             $this->disconnect();
     }
 }
\ No newline at end of file

Braces +100 added lines, -56 removed lines

@@ -204,8 +204,9 @@ 
      */
     public function __construct(Jid $jid, $password, AbstractConnector $connector = null)
     {
-        if(!$connector)
-            $connector = new TcpConnector($jid->server);
+        if(!$connector) {
+                    $connector = new TcpConnector($jid->server);
+        }
 
         $this->connector = $connector;
         $this->connector->client = $this;
@@ -262,27 +263,31 @@ 
         $this->connector->onSend->add(function ($socket, $packet) use ($settings) {
             $len = strlen($packet);
 
-            if (function_exists('tidy_repair_string'))
-                $packet = trim(tidy_repair_string($packet, $settings));
+            if (function_exists('tidy_repair_string')) {
+                            $packet = trim(tidy_repair_string($packet, $settings));
+            }
 
-            if (isset($this->logger))
-                $this->logger->debug("Sent {length} bytes: \n{packet}", [
+            if (isset($this->logger)) {
+                            $this->logger->debug("Sent {length} bytes: \n{packet}", [
                     'length' => $len,
                     'packet' => $packet
                 ]);
+            }
         });
 
         $this->connector->onReceive->add(function ($socket, $packet) use ($settings) {
             $len = strlen($packet);
 
-            if (function_exists('tidy_repair_string'))
-                $packet = trim(tidy_repair_string($packet, $settings));
+            if (function_exists('tidy_repair_string')) {
+                            $packet = trim(tidy_repair_string($packet, $settings));
+            }
 
-            if (isset($this->logger))
-                $this->logger->debug("Received {length} bytes: \n{packet}", [
+            if (isset($this->logger)) {
+                            $this->logger->debug("Received {length} bytes: \n{packet}", [
                     'length' => $len,
                     'packet' => $packet
                 ]);
+            }
         });
 
         XmlBranch::$bind['iq']       = 'Kadet\\Xmpp\\Stanza\\Iq';
@@ -375,7 +380,9 @@ 
 
     private function startTls()
     {
-        if ($this->logger) $this->logger->notice('Starting TLS negotiation.');
+        if ($this->logger) {
+            $this->logger->notice('Starting TLS negotiation.');
+        }
 
         $xml = new XmlBranch('starttls');
         $xml->addAttribute('xmlns', 'urn:ietf:params:xml:ns:xmpp-tls');
@@ -389,10 +396,11 @@ 
      */
     private function auth()
     {
-        if ($this->logger)
-            $this->logger->notice('SASL Auth, available mechanisms: {mechanisms}', [
+        if ($this->logger) {
+                    $this->logger->notice('SASL Auth, available mechanisms: {mechanisms}', [
                 'mechanisms' => implode(', ', array_map(function (XmlBranch $item) {
                     return $item->content;
+        }
                 }, (array)$this->connector->features->mechanisms[0]->mechanism))
             ]);
 
@@ -402,15 +410,18 @@ 
         $mechanism = null;
         $this->connector->features->mechanisms[0]->mechanism->getIterator();
         foreach ($this->connector->features->mechanisms[0]->mechanism as $current) {
-            if ($mechanism = SaslFactory::get($current->content, $this->jid, $this->password))
-                break;
+            if ($mechanism = SaslFactory::get($current->content, $this->jid, $this->password)) {
+                            break;
+            }
         }
 
-        if (!$mechanism)
-            throw new \RuntimeException('This client is not supporting any of server auth mechanisms.');
+        if (!$mechanism) {
+                    throw new \RuntimeException('This client is not supporting any of server auth mechanisms.');
+        }
 
-        if ($this->logger)
-            $this->logger->notice('Chosen mechanism: {mechanism}', ['mechanism' => $current->content]);
+        if ($this->logger) {
+                    $this->logger->notice('Chosen mechanism: {mechanism}', ['mechanism' => $current->content]);
+        }
 
         $this->_mechanism = $mechanism;
 
@@ -433,13 +444,15 @@ 
     public function _onAuth(XmppClient $client, Stanza $result)
     {
         if ($result->xml->getName() == 'success') {
-            if ($this->logger)
-                $this->logger->info('SASL Auth successful.');
+            if ($this->logger) {
+                            $this->logger->info('SASL Auth successful.');
+            }
 
             $this->connector->streamRestart($this->jid);
             $this->_bind();
-        } elseif ($this->logger)
-            $this->logger->error('SASL Auth failed, reason: {reason}', ['reason' => $result->text[0]]);
+        } elseif ($this->logger) {
+                    $this->logger->error('SASL Auth failed, reason: {reason}', ['reason' => $result->text[0]]);
+        }
     }
 
     /**
@@ -476,13 +489,15 @@ 
     public function _onTls(XmppClient $client, Stanza $result)
     {
         if ($result->tag == 'proceed') {
-            if ($this->logger)
-                $this->logger->info('TLS Connection established.');
+            if ($this->logger) {
+                            $this->logger->info('TLS Connection established.');
+            }
 
             $this->connector->startTls();
             $this->connector->streamRestart($this->jid);
-        } else
-            throw new \RuntimeException('Tls negotiation failed.');
+        } else {
+                    throw new \RuntimeException('Tls negotiation failed.');
+        }
     }
 
     /**
@@ -504,8 +519,9 @@ 
             $this->write($iq->asXml());
             $this->isReady = true;
             $this->onReady->run($this);
-        } else
-            throw new \RuntimeException('Resource binding error.');
+        } else {
+                    throw new \RuntimeException('Resource binding error.');
+        }
     }
 
     /**
@@ -593,10 +609,11 @@ 
             case 'success':
             case 'failure':
             case 'proceed':
-                if ($stanza['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-sasl')
-                    $this->onAuth->run($this, $stanza);
-                elseif ($stanza['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-tls')
-                    $this->onTls->run($this, $stanza);
+                if ($stanza['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-sasl') {
+                                    $this->onAuth->run($this, $stanza);
+                } elseif ($stanza['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-tls') {
+                                    $this->onTls->run($this, $stanza);
+                }
 
                 break;
             case 'challenge':
@@ -635,7 +652,9 @@ 
         $channelJid = $packet->from->bare();
         $jid        = new Jid($channelJid);
 
-        if (!$jid->isChannel()) return;
+        if (!$jid->isChannel()) {
+            return;
+        }
 
         if ($packet->type != 'unavailable') {
             if (isset($this->rooms[$channelJid]->users[$packet->from->resource])) {
@@ -645,7 +664,9 @@ 
                 if (
                     (string)$user->jid == (string)$this->jid ||
                     $this->rooms[$channelJid]->nick == $packet->from->resource
-                ) $user->self = true;
+                ) {
+                    $user->self = true;
+                }
 
                 $this->onJoin->run(
                     $this,
@@ -659,7 +680,9 @@ 
         } elseif (isset($this->rooms[$channelJid])) {
             $item = $packet->xpath('//user:item', ['user' => 'http://jabber.org/protocol/muc#user']);
 
-            if (!isset($item[0])) return;
+            if (!isset($item[0])) {
+                return;
+            }
             $item = $item[0];
 
             // Nickname change
@@ -700,13 +723,18 @@ 
      */
     public function _onMessage(XmppClient $client, Message $packet)
     {
-        if ($packet->type != 'groupchat' || !isset($this->rooms[$packet->from->bare()])) return;
+        if ($packet->type != 'groupchat' || !isset($this->rooms[$packet->from->bare()])) {
+            return;
+        }
 
-        if (isset($packet->subject))
-            $this->rooms[$packet->from->bare()]->subject = $packet->subject;
+        if (isset($packet->subject)) {
+                    $this->rooms[$packet->from->bare()]->subject = $packet->subject;
+        }
 
-        if (!isset($packet->delay) && $this->rooms[$packet->from->bare()]->subject === false)
-            $this->rooms[$packet->from->bare()]->subject = ''; // Some strange workaround, servers doesn't meet specification... ;(
+        if (!isset($packet->delay) && $this->rooms[$packet->from->bare()]->subject === false) {
+                    $this->rooms[$packet->from->bare()]->subject = '';
+        }
+        // Some strange workaround, servers doesn't meet specification... ;(
     }
 
     /**
@@ -714,8 +742,9 @@ 
      */
     public function process()
     {
-        if ($this->isReady)
-            $this->onTick->run($this);
+        if ($this->isReady) {
+                    $this->onTick->run($this);
+        }
 
         Timer::update();
         $this->connector->read();
@@ -738,7 +767,9 @@ 
      */
     public function getUserByJid(Jid $user)
     {
-        if (!$user->fromChannel()) return null;
+        if (!$user->fromChannel()) {
+            return null;
+        }
 
         return isset($this->rooms[$user->bare()]->users[$user->resource]) ?
             $this->rooms[$user->bare()]->users[$user->resource] :
@@ -819,7 +850,10 @@ 
      */
     public function join(Jid $room, $nick)
     {
-        if (!$room->isChannel()) throw new \InvalidArgumentException('room'); // YOU SHALL NOT PASS
+        if (!$room->isChannel()) {
+            throw new \InvalidArgumentException('room');
+        }
+        // YOU SHALL NOT PASS
 
         $xml = new xmlBranch("presence");
         $xml->addAttribute("from", $this->jid->__toString())
@@ -845,7 +879,9 @@ 
      */
     public function leave(Jid $room)
     {
-        if (!$room->isChannel() || !isset($this->rooms[$room->bare()])) throw new \InvalidArgumentException('room');
+        if (!$room->isChannel() || !isset($this->rooms[$room->bare()])) {
+            throw new \InvalidArgumentException('room');
+        }
 
         $xml = new xmlBranch("presence");
         $xml->addAttribute("from", $this->jid->__toString())
@@ -875,8 +911,9 @@ 
      */
     public function role(Jid $room, $nick, $role, $reason = '')
     {
-        if (!in_array($role, array('visitor', 'none', 'participant', 'moderator')))
-            throw new \InvalidArgumentException('role');
+        if (!in_array($role, array('visitor', 'none', 'participant', 'moderator'))) {
+                    throw new \InvalidArgumentException('role');
+        }
 
         $xml = new xmlBranch("iq");
         $xml->addAttribute("type", "set")
@@ -889,7 +926,9 @@ 
         $xml->query[0]->item[0]->addAttribute("nick", $nick);
         $xml->query[0]->item[0]->addAttribute("role", $role);
 
-        if (!empty($reason)) $xml->query[0]->item[0]->addChild(new xmlBranch("reason"))->setContent($reason);
+        if (!empty($reason)) {
+            $xml->query[0]->item[0]->addChild(new xmlBranch("reason"))->setContent($reason);
+        }
 
         $this->write($xml->asXml());
     }
@@ -909,8 +948,9 @@ 
      */
     public function affiliate(Jid $room, Jid $user, $affiliation, $reason = '')
     {
-        if (!in_array($affiliation, array('none', 'outcast', 'member', 'admin', 'owner')))
-            throw new \InvalidArgumentException('affiliation');
+        if (!in_array($affiliation, array('none', 'outcast', 'member', 'admin', 'owner'))) {
+                    throw new \InvalidArgumentException('affiliation');
+        }
 
         $xml = new xmlBranch("iq");
         $xml->addAttribute("type", "set")
@@ -923,7 +963,9 @@ 
         $xml->query[0]->item[0]->addAttribute("jid", $user->bare());
         $xml->query[0]->item[0]->addAttribute("affiliation", $affiliation);
 
-        if (!empty($reason)) $xml->query[0]->item[0]->addChild(new xmlBranch("reason"))->setContent($reason);
+        if (!empty($reason)) {
+            $xml->query[0]->item[0]->addChild(new xmlBranch("reason"))->setContent($reason);
+        }
 
         $this->write($xml->asXml());
     }
@@ -960,8 +1002,9 @@ 
      */
     public function affiliationList(Jid $room, $affiliation, callable $delegate)
     {
-        if (!in_array($affiliation, array('none', 'outcast', 'member', 'admin', 'owner')))
-            throw new \InvalidArgumentException('affiliation');
+        if (!in_array($affiliation, array('none', 'outcast', 'member', 'admin', 'owner'))) {
+                    throw new \InvalidArgumentException('affiliation');
+        }
 
         $xml = new xmlBranch("iq");
         $id  = uniqid('affiliate_');
@@ -1009,7 +1052,8 @@ 
     }
 
     public function __destruct() {
-        if($this->connector->connected)
-            $this->disconnect();
+        if($this->connector->connected) {
+                    $this->disconnect();
+        }
     }
 }
\ No newline at end of file

Tests/Samples/php/big.php

Spacing +12 added lines, -12 removed lines

@@ -148,17 +148,17 @@ 
 
         $this->applyOptions($options);
 
-        $this->on('element', function (Features $element) {
+        $this->on('element', function(Features $element) {
             $this->_features = $element;
             $this->emit('features', [$element]);
         }, Features::class);
 
-        $this->on('element', function (Stanza $stanza) {
-            $this->emit('stanza', [ $stanza ]);
-            $this->emit($stanza->localName, [ $stanza ]);
+        $this->on('element', function(Stanza $stanza) {
+            $this->emit('stanza', [$stanza]);
+            $this->emit($stanza->localName, [$stanza]);
         }, Stanza::class);
 
-        $this->on('close', function () {
+        $this->on('close', function() {
             $this->state = 'disconnected';
         });
     }
@@ -211,7 +211,7 @@ 
         $this->state = 'bound';
 
         $queue = new \SplQueue();
-        $this->emit('init', [ $queue ]);
+        $this->emit('init', [$queue]);
 
         \React\Promise\all(iterator_to_array($queue))->then(function() {
             $this->state = 'ready';
@@ -235,10 +235,10 @@ 
 
         if ($alias === true) {
             $this->_addToContainer($module, array_merge(class_implements($module), array_slice(class_parents($module), 1)));
-        } elseif(is_array($alias)) {
+        } elseif (is_array($alias)) {
             $this->_addToContainer($module, $alias);
         } else {
-            $this->_addToContainer($module, [ $alias === false ? get_class($module) : $alias ]);
+            $this->_addToContainer($module, [$alias === false ? get_class($module) : $alias]);
         }
     }
 
@@ -261,7 +261,7 @@ 
         $deferred = new Deferred();
 
         $this->once('element', function(Stanza $stanza) use ($deferred) {
-            if($stanza->type === "error") {
+            if ($stanza->type === "error") {
                 $deferred->reject($stanza);
             } else {
                 $deferred->resolve($stanza);
@@ -297,12 +297,12 @@ 
     //region Parser
     public function setParser(XmlParser $parser)
     {
-        if($this->state !== "disconnected") {
+        if ($this->state !== "disconnected") {
             throw new \BadMethodCallException('Parser can be changed only when client is disconnected.');
         }
 
         parent::setParser($parser);
-        $this->_parser->factory->load(require __DIR__ . '/XmlElementLookup.php');
+        $this->_parser->factory->load(require __DIR__.'/XmlElementLookup.php');
     }
 
     public function getParser()
@@ -325,7 +325,7 @@ 
             ));
         }
 
-        $this->_connector->on('connect', function ($stream) {
+        $this->_connector->on('connect', function($stream) {
             return $this->handleConnect($stream);
         });
     }

Tests/RuleTest.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
             ->disableOriginalConstructor()
             ->getMock();
 
-        $factory  = $this
+        $factory = $this
             ->getMockBuilder('Kadet\Highlighter\Parser\TokenFactory')
             ->disableOriginalConstructor()
             ->getMock();
@@ -78,7 +78,7 @@ 
     public function testAcceptsCallableAsContext()
     {
         $rule = new Rule(null, [
-            'context' => function () {
+            'context' => function() {
                 return true;
             }
         ]);

Tests/ValidatorTest.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 
     public function testCallableValidator()
     {
-        $validator = new DelegateValidator(function ($context) {
+        $validator = new DelegateValidator(function($context) {
             return in_array('bar', $context->stack) && !in_array('foo', $context->stack);
         });
 

Tests/LanguagesTest.php

Spacing +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
 
     public function testFileProvider()
     {
-        $dir = realpath(__DIR__ . '/Samples');
-        $out = realpath(__DIR__ . '/Expected/Test');
+        $dir = realpath(__DIR__.'/Samples');
+        $out = realpath(__DIR__.'/Expected/Test');
 
         $iterator = new \RecursiveIteratorIterator(
             new \RecursiveDirectoryIterator(
@@ -35,7 +35,7 @@ 
             $pathname = substr($file->getPathname(), strlen($dir) + 1);
             $language = Language::byFilename($pathname);
 
-            yield $pathname => [ $language, $file->getPathname(), "$out/$pathname.tkn" ];
+            yield $pathname => [$language, $file->getPathname(), "$out/$pathname.tkn"];
         }
     }
 

Tests/CliFormatterTest.php

Indentation +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
         ]);
 
         $formatter = new CliFormatter(['styles' => [
-           'token'    => ['color' => 'red'],
-           'operator' => ['color' => 'blue'],
+            'token'    => ['color' => 'red'],
+            'operator' => ['color' => 'blue'],
         ]]);
         $this->assertEquals($expected, $formatter->format($iterator));
     }

Spacing +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@ 
     public function testRendering()
     {
         $source   = 'abc + test';
-        $expected = Console::open(['color' => 'red']) . 'abc' . Console::close() . ' ' .
-            Console::open(['color' => 'blue']) . '+' . Console::close() . ' ' .
-            Console::open(['color' => 'red']) . 'test' . Console::close() . Console::reset();
+        $expected = Console::open(['color' => 'red']).'abc'.Console::close().' '.
+            Console::open(['color' => 'blue']).'+'.Console::close().' '.
+            Console::open(['color' => 'red']).'test'.Console::close().Console::reset();
 
         $first    = $this->_factory->create('token', ['pos' => 0, 'length' => 3]);
         $operator = $this->_factory->create('operator', ['pos' => 4, 'length' => 1]);
@@ -67,7 +67,7 @@ 
         $this->markTestSkipped('This test requires callback mocks, that are not yet implemented.');
 
         $source   = 'abc';
-        $expected = Console::open(['color' => 'red']) . 'abc' . Console::close() . Console::reset();
+        $expected = Console::open(['color' => 'red']).'abc'.Console::close().Console::reset();
 
         $token    = $this->_factory->create('token', ['pos' => 0, 'length' => 3]);
 

Tests/ArrayHelperTest.php

Spacing +2 added lines, -2 removed lines

@@ -54,11 +54,11 @@
             'c' => 4
         ];
 
-        $this->assertEquals('b', ArrayHelper::find($array, function ($k, $v) {
+        $this->assertEquals('b', ArrayHelper::find($array, function($k, $v) {
             return $k == 'b';
         }));
 
-        $this->assertFalse(ArrayHelper::find($array, function ($k, $v) {
+        $this->assertFalse(ArrayHelper::find($array, function($k, $v) {
             return $k == 'b' && $v == 3;
         }));
     }

Tests/ConsoleHelperTest.php

Spacing +13 added lines, -13 removed lines

@@ -40,10 +40,10 @@ 
         $console = new ConsoleHelper();
         $this->assertEquals(
             "\e[31mtest\e[32mtest2\e[0m\e[31mtest3\e[0m",
-            $console->open(["color" => "red"]) .
-                "test" .
-                    $console->open(["color" => "green"]) . "test2" . $console->close() .
-                "test3" .
+            $console->open(["color" => "red"]).
+                "test".
+                    $console->open(["color" => "green"])."test2".$console->close().
+                "test3".
             $console->close()
         );
     }
@@ -61,18 +61,18 @@ 
     {
         return [
             'background red' => ["\033[41m", ["background" => "red"]],
-            'bold'           => ["\033[1m",  ["bold" => true]],
-            'dim'            => ["\033[2m",  ["dim" => true]],
-            'italic'         => ["\033[3m",  ["italic" => true]],
-            'underline'      => ["\033[4m",  ["underline" => true]],
-            'blink'          => ["\033[5m",  ["blink" => true]],
-            'invert'         => ["\033[7m",  ["invert" => true]],
+            'bold'           => ["\033[1m", ["bold" => true]],
+            'dim'            => ["\033[2m", ["dim" => true]],
+            'italic'         => ["\033[3m", ["italic" => true]],
+            'underline'      => ["\033[4m", ["underline" => true]],
+            'blink'          => ["\033[5m", ["blink" => true]],
+            'invert'         => ["\033[7m", ["invert" => true]],
 
-            'wrong'         => [null,  ["wrong" => true]],
+            'wrong'         => [null, ["wrong" => true]],
 
-            'bg and bold' => ["\033[41;1m",  ["background" => "red", 'bold' => true]],
+            'bg and bold' => ["\033[41;1m", ["background" => "red", 'bold' => true]],
 
-            'color, bg and bold' => ["\033[31;41;1m",  ["color" => "red", "background" => "red", 'bold' => true]],
+            'color, bg and bold' => ["\033[31;41;1m", ["color" => "red", "background" => "red", 'bold' => true]],
         ];
     }
 }