@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | foreach ($lookup['<predicate>'] as list($class, $predicate)) { |
| 36 | - if($predicate($tag, $namespace)) { |
|
| 36 | + if ($predicate($tag, $namespace)) { |
|
| 37 | 37 | return $class; |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | { |
| 65 | 65 | $result = ['<predicate>' => []]; |
| 66 | 66 | foreach ($dictionary as $element) { |
| 67 | - if($element['name'] instanceof \Closure || $element['uri'] instanceof \Closure) { |
|
| 67 | + if ($element['name'] instanceof \Closure || $element['uri'] instanceof \Closure) { |
|
| 68 | 68 | $result['<predicate>'][] = [$element[0], \Kadet\Xmpp\Utils\filter\consecutive( |
| 69 | 69 | \Kadet\Xmpp\Utils\filter\predicate($element['name']), |
| 70 | 70 | \Kadet\Xmpp\Utils\filter\predicate($element['uri']) |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | protected function appendChild($element) |
| 50 | 50 | { |
| 51 | - if(count($this->children) > 0) { |
|
| 51 | + if (count($this->children) > 0) { |
|
| 52 | 52 | throw new \RuntimeException('Iq stanzas cannot have more than one child.'); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | public static function getXmlCollocations() : array |
| 78 | 78 | { |
| 79 | 79 | return array_merge( |
| 80 | - [[ Query::class, 'name' => pass(), 'uri' => pass() ]], |
|
| 80 | + [[Query::class, 'name' => pass(), 'uri' => pass()]], |
|
| 81 | 81 | parent::getXmlCollocations() |
| 82 | 82 | ); |
| 83 | 83 | } |
@@ -19,7 +19,6 @@ |
||
| 19 | 19 | use Kadet\Xmpp\Jid; |
| 20 | 20 | use Kadet\Xmpp\Stanza\Iq\Query; |
| 21 | 21 | use function Kadet\Xmpp\Utils\filter\pass; |
| 22 | -use Kadet\Xmpp\Xml\XmlElement; |
|
| 23 | 22 | |
| 24 | 23 | /** |
| 25 | 24 | * Represents IQ Stanza |
@@ -184,7 +184,6 @@ |
||
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | /** |
| 187 | - * @param callable(Item $item) $mapper |
|
| 188 | 187 | * @return array |
| 189 | 188 | */ |
| 190 | 189 | public function map(callable $mapper) |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | public function setClient(XmppClient $client) |
| 49 | 49 | { |
| 50 | - if($this->_client !== null) { |
|
| 50 | + if ($this->_client !== null) { |
|
| 51 | 51 | throw new BadMethodCallException("You cannot change rosters XmppClient instance."); |
| 52 | 52 | } |
| 53 | 53 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | private function handleSet(Iq\Query\Roster $query) |
| 73 | 73 | { |
| 74 | 74 | foreach ($query->items as $item) { |
| 75 | - if($item->subscription == 'remove') { |
|
| 75 | + if ($item->subscription == 'remove') { |
|
| 76 | 76 | $this->removeItem($item->jid); |
| 77 | 77 | } else { |
| 78 | 78 | $this->setItem($item); |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | $iq = new Iq('remove', ['query' => new Iq\Query\Roster()]); |
| 171 | 171 | /** @var Iq\Query\Roster\Item $item */ |
| 172 | - foreach($remove as $item) { |
|
| 172 | + foreach ($remove as $item) { |
|
| 173 | 173 | $iq->query->append(new Iq\Query\Roster\Item($item->jid, ['subscription' => 'remove'])); |
| 174 | 174 | } |
| 175 | 175 | |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | public function update(Iq\Query\Roster\Item $item) |
| 187 | 187 | { |
| 188 | 188 | $iq = new Iq('set', ['query' => new Iq\Query\Roster([ |
| 189 | - 'items' => [ $item ] |
|
| 189 | + 'items' => [$item] |
|
| 190 | 190 | ])]); |
| 191 | 191 | |
| 192 | 192 | return $this->_client->send($iq); |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | |
| 275 | 275 | private function setItem(Iq\Query\Roster\Item $item) |
| 276 | 276 | { |
| 277 | - $this->emit('item', [ $item ]); |
|
| 277 | + $this->emit('item', [$item]); |
|
| 278 | 278 | $this->_items[(string)$item->jid] = $item; |
| 279 | 279 | } |
| 280 | 280 | |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | return; |
| 288 | 288 | } |
| 289 | 289 | |
| 290 | - $this->emit('remove', [ $this->_items[(string)$jid] ]); |
|
| 290 | + $this->emit('remove', [$this->_items[(string)$jid]]); |
|
| 291 | 291 | unset($this->_items[(string)$jid]); |
| 292 | 292 | } |
| 293 | 293 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | protected function appendChild($element) |
| 88 | 88 | { |
| 89 | - if(!$element instanceof Item) { |
|
| 89 | + if (!$element instanceof Item) { |
|
| 90 | 90 | throw new InvalidArgumentException(format('Only instances of roster item ({expected}) can be added into roster, tried to add {actual}', [ |
| 91 | 91 | 'expected' => Item::class, |
| 92 | 92 | 'actual' => get_class($element) |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | public static function getXmlCollocations() : array |
| 100 | 100 | { |
| 101 | 101 | return [ |
| 102 | - [ Item::class, 'name' => 'item', 'uri' => 'jabber:iq:roster' ] |
|
| 102 | + [Item::class, 'name' => 'item', 'uri' => 'jabber:iq:roster'] |
|
| 103 | 103 | ]; |
| 104 | 104 | } |
| 105 | 105 | } |
@@ -148,17 +148,17 @@ discard block |
||
| 148 | 148 | |
| 149 | 149 | $this->applyOptions($options); |
| 150 | 150 | |
| 151 | - $this->on('element', function (Features $element) { |
|
| 151 | + $this->on('element', function(Features $element) { |
|
| 152 | 152 | $this->_features = $element; |
| 153 | 153 | $this->emit('features', [$element]); |
| 154 | 154 | }, Features::class); |
| 155 | 155 | |
| 156 | - $this->on('element', function (Stanza $stanza) { |
|
| 157 | - $this->emit('stanza', [ $stanza ]); |
|
| 158 | - $this->emit($stanza->localName, [ $stanza ]); |
|
| 156 | + $this->on('element', function(Stanza $stanza) { |
|
| 157 | + $this->emit('stanza', [$stanza]); |
|
| 158 | + $this->emit($stanza->localName, [$stanza]); |
|
| 159 | 159 | }, Stanza::class); |
| 160 | 160 | |
| 161 | - $this->on('close', function () { |
|
| 161 | + $this->on('close', function() { |
|
| 162 | 162 | $this->state = 'disconnected'; |
| 163 | 163 | }); |
| 164 | 164 | } |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | $this->state = 'bound'; |
| 212 | 212 | |
| 213 | 213 | $queue = new \SplQueue(); |
| 214 | - $this->emit('init', [ $queue ]); |
|
| 214 | + $this->emit('init', [$queue]); |
|
| 215 | 215 | |
| 216 | 216 | \React\Promise\all(iterator_to_array($queue))->then(function() { |
| 217 | 217 | $this->state = 'ready'; |
@@ -235,10 +235,10 @@ discard block |
||
| 235 | 235 | |
| 236 | 236 | if ($alias === true) { |
| 237 | 237 | $this->_addToContainer($module, array_merge(class_implements($module), array_slice(class_parents($module), 1))); |
| 238 | - } elseif(is_array($alias)) { |
|
| 238 | + } elseif (is_array($alias)) { |
|
| 239 | 239 | $this->_addToContainer($module, $alias); |
| 240 | 240 | } else { |
| 241 | - $this->_addToContainer($module, [ $alias === false ? get_class($module) : $alias ]); |
|
| 241 | + $this->_addToContainer($module, [$alias === false ? get_class($module) : $alias]); |
|
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | 244 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | $deferred = new Deferred(); |
| 262 | 262 | |
| 263 | 263 | $this->once('element', function(Stanza $stanza) use ($deferred) { |
| 264 | - if($stanza->type === "error") { |
|
| 264 | + if ($stanza->type === "error") { |
|
| 265 | 265 | $deferred->reject($stanza); |
| 266 | 266 | } else { |
| 267 | 267 | $deferred->resolve($stanza); |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | //region Parser |
| 298 | 298 | public function setParser(XmlParser $parser) |
| 299 | 299 | { |
| 300 | - if($this->state !== "disconnected") { |
|
| 300 | + if ($this->state !== "disconnected") { |
|
| 301 | 301 | throw new \BadMethodCallException('Parser can be changed only when client is disconnected.'); |
| 302 | 302 | } |
| 303 | 303 | |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | )); |
| 326 | 326 | } |
| 327 | 327 | |
| 328 | - $this->_connector->on('connect', function ($stream) { |
|
| 328 | + $this->_connector->on('connect', function($stream) { |
|
| 329 | 329 | return $this->handleConnect($stream); |
| 330 | 330 | }); |
| 331 | 331 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function createResponse($challenge = null) |
| 30 | 30 | { |
| 31 | - if(strpos($challenge, 'rspauth=') !== false) { |
|
| 31 | + if (strpos($challenge, 'rspauth=') !== false) { |
|
| 32 | 32 | return ''; |
| 33 | 33 | } |
| 34 | 34 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | { |
| 42 | 42 | $predicate = $uri instanceof \Closure ? $uri : \Kadet\Xmpp\Utils\filter\same($uri); |
| 43 | 43 | |
| 44 | - return function ($element) use ($predicate) { |
|
| 44 | + return function($element) use ($predicate) { |
|
| 45 | 45 | if (!$element instanceof XmlElement) { |
| 46 | 46 | return false; |
| 47 | 47 | } |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | { |
| 75 | 75 | $predicate = $name instanceof \Closure ? $name : \Kadet\Xmpp\Utils\filter\same($name); |
| 76 | 76 | |
| 77 | - return function ($element) use ($predicate) { |
|
| 77 | + return function($element) use ($predicate) { |
|
| 78 | 78 | if (!$element instanceof XmlElement) { |
| 79 | 79 | return false; |
| 80 | 80 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | { |
| 109 | 109 | $predicate = $value instanceof \Closure ? $value : \Kadet\Xmpp\Utils\filter\equals($value); |
| 110 | 110 | |
| 111 | - return function ($element) use ($name, $predicate) { |
|
| 111 | + return function($element) use ($name, $predicate) { |
|
| 112 | 112 | if (!$element instanceof XmlElement) { |
| 113 | 113 | return false; |
| 114 | 114 | } |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | continue; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - $this->_results = array_merge($this->_results, array_map(function ($record) use($type) { |
|
| 59 | + $this->_results = array_merge($this->_results, array_map(function($record) use($type) { |
|
| 60 | 60 | return $type === DNS_SRV |
| 61 | 61 | ? [$record['target'], $record['port']] |
| 62 | 62 | : [$record['ip'], $this->_port]; |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | /** |
| 56 | 56 | * Sends subscription removal request presence to server. |
| 57 | 57 | * |
| 58 | - * @param Jid|string $jid |
|
| 58 | + * @param Jid $jid |
|
| 59 | 59 | * @return \React\Promise\ExtendedPromiseInterface |
| 60 | 60 | */ |
| 61 | 61 | public function unsubscribe(Jid $jid) |
@@ -74,6 +74,9 @@ discard block |
||
| 74 | 74 | return $this->_client->send($this->presence('unsubscribed', $jid)); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | + /** |
|
| 78 | + * @param string $type |
|
| 79 | + */ |
|
| 77 | 80 | private function presence($type, $jid) |
| 78 | 81 | { |
| 79 | 82 | $jid = $jid instanceof Jid ? $jid : new Jid($jid); |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | |
| 39 | 39 | private function handleSubscriptionRequest(Presence $presence) |
| 40 | 40 | { |
| 41 | - $this->emit('request', [ $presence ]); |
|
| 41 | + $this->emit('request', [$presence]); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |