- Code cleaning

ipublikuj · Feb 14, 2020 · 5a21baa · 5a21baa
1 parent 8d4d1ae
commit 5a21baa
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 33 deletions.
diff --git a/src/IPub/MQTTClient/Client/Client.php b/src/IPub/MQTTClient/Client/Client.php
@@ -17,6 +17,7 @@
 namespace IPub\MQTTClient\Client;
 
 use Closure;
+use Exception;
 
 use Nette;
 
@@ -51,8 +52,8 @@
  * @method onSubscribe(Mqtt\Subscription $subscription, IClient $client)
  * @method onUnsubscribe(Mqtt\Subscription $subscription, IClient $client)
  * @method onMessage(Mqtt\Message $message, IClient $client)
- * @method onWarning(\Exception $ex, IClient $client)
- * @method onError(\Exception $ex, IClient $client)
+ * @method onWarning(Exception $ex, IClient $client)
+ * @method onError(Exception $ex, IClient $client)
  */
 final class Client implements IClient
 {
@@ -239,7 +240,7 @@ public function __construct(
 			$this->parser = new Mqtt\StreamParser;
 		}
 
-		$this->parser->onError(function (\Exception $ex) {
+		$this->parser->onError(function (Exception $ex) {
 			$this->onError($ex, $this);
 		});
 
@@ -315,6 +316,8 @@ public function isConnected() : bool
 
 	/**
 	 * {@inheritdoc}
+	 *
+	 * @throws Exceptions\InvalidStateException
 	 */
 	public function connect() : Promise\ExtendedPromiseInterface
 	{
@@ -352,7 +355,7 @@ public function connect() : Promise\ExtendedPromiseInterface
 
 						$deferred->resolve($this->connection);
 					})
-					->otherwise(function (\Exception $ex) use ($stream, $deferred, $connection) {
+					->otherwise(function (Exception $ex) use ($stream, $deferred, $connection) {
 						$this->isConnecting = FALSE;
 
 						$this->onError($ex, $this);
@@ -366,7 +369,7 @@ public function connect() : Promise\ExtendedPromiseInterface
 						$this->onClose($connection, $this);
 					});
 			})
-			->otherwise(function (\Exception $ex) use ($deferred) {
+			->otherwise(function (Exception $ex) use ($deferred) {
 				$this->isConnecting = FALSE;
 
 				$this->onError($ex, $this);
@@ -467,7 +470,7 @@ public function publishPeriodically(
 					function ($value) use ($deferred) {
 						$deferred->notify($value);
 					},
-					function (\Exception $e) use ($deferred) {
+					function (Exception $e) use ($deferred) {
 						$deferred->reject($e);
 					}
 				);
@@ -506,13 +509,13 @@ private function establishConnection() : Promise\ExtendedPromiseInterface
 					$this->handleClose();
 				});
 
-				$stream->on('error', function (\Exception $ex) {
+				$stream->on('error', function (Exception $ex) {
 					$this->handleError($ex);
 				});
 
 				$deferred->resolve($stream);
 			})
-			->otherwise(function (\Exception $ex) use ($deferred) {
+			->otherwise(function (Exception $ex) use ($deferred) {
 				$deferred->reject($ex);
 			});
 
@@ -547,7 +550,7 @@ private function registerClient(Mqtt\Connection $connection) : Promise\ExtendedP
 
 				$deferred->resolve($connection);
 
-			})->otherwise(function (\Exception $ex) use ($deferred) {
+			})->otherwise(function (Exception $ex) use ($deferred) {
 				$deferred->reject($ex);
 			});
 
@@ -696,11 +699,11 @@ private function handleClose() : void
 	/**
 	 * Handles errors of the stream
 	 *
-	 * @param \Exception $ex
+	 * @param Exception $ex
 	 *
 	 * @return void
 	 */
-	private function handleError(\Exception $ex) : void
+	private function handleError(Exception $ex) : void
 	{
 		$this->onError($ex, $this);
 	}
@@ -718,7 +721,7 @@ private function startFlow(Mqtt\Flow $flow, bool $isSilent = FALSE) : Promise\Ex
 		try {
 			$packet = $flow->start();
 
-		} catch (\Exception $ex) {
+		} catch (Exception $ex) {
 			$this->onError($ex, $this);
 
 			return new Promise\RejectedPromise($ex);
@@ -760,7 +763,7 @@ private function continueFlow(Flow\Envelope $flow, Mqtt\Packet $packet) : void
 		try {
 			$response = $flow->next($packet);
 
-		} catch (\Exception $ex) {
+		} catch (Exception $ex) {
 			$this->onError($ex, $this);
 
 			return;

diff --git a/src/IPub/MQTTClient/Configuration/Broker.php b/src/IPub/MQTTClient/Configuration/Broker.php
@@ -92,7 +92,7 @@ public function __construct(
 		bool $enableDNS = TRUE,
 		string $dnsAddress = '8.8.8.8',
 		bool $enableSSL = FALSE,
-		array $sslSettings,
+		array $sslSettings = [],
 		Connection $connection
 	) {
 		$this->httpHost = $httpHost;

diff --git a/src/IPub/MQTTClient/Events/ErrorEvent.php b/src/IPub/MQTTClient/Events/ErrorEvent.php
@@ -18,8 +18,6 @@
 
 use Symfony\Contracts\EventDispatcher;
 
-use BinSoul\Net\Mqtt;
-
 use IPub\MQTTClient\Client;
 
 /**

diff --git a/src/IPub/MQTTClient/Events/PingEvent.php b/src/IPub/MQTTClient/Events/PingEvent.php
@@ -28,11 +28,6 @@
  */
 final class PingEvent extends EventDispatcher\Event
 {
-	/**
-	 * @var Mqtt\Connection
-	 */
-	private $connection;
-
 	/**
 	 * @var Client\IClient
 	 */

diff --git a/src/IPub/MQTTClient/Events/PongEvent.php b/src/IPub/MQTTClient/Events/PongEvent.php
@@ -28,11 +28,6 @@
  */
 final class PongEvent extends EventDispatcher\Event
 {
-	/**
-	 * @var Mqtt\Connection
-	 */
-	private $connection;
-
 	/**
 	 * @var Client\IClient
 	 */

diff --git a/src/IPub/MQTTClient/Events/SubscribeEvent.php b/src/IPub/MQTTClient/Events/SubscribeEvent.php
@@ -41,7 +41,7 @@ final class SubscribeEvent extends EventDispatcher\Event
 	private $client;
 
 	/**
-	 * @param Mqtt\Message $message
+	 * @param Mqtt\Subscription $subscription
 	 * @param Client\IClient $client
 	 */
 	public function __construct(

diff --git a/src/IPub/MQTTClient/Events/UnsubscribeEvent.php b/src/IPub/MQTTClient/Events/UnsubscribeEvent.php
@@ -41,7 +41,7 @@ final class UnsubscribeEvent extends EventDispatcher\Event
 	private $client;
 
 	/**
-	 * @param Mqtt\Message $message
+	 * @param Mqtt\Subscription $subscription
 	 * @param Client\IClient $client
 	 */
 	public function __construct(

diff --git a/src/IPub/MQTTClient/Events/WarningEvent.php b/src/IPub/MQTTClient/Events/WarningEvent.php
@@ -18,8 +18,6 @@
 
 use Symfony\Contracts\EventDispatcher;
 
-use BinSoul\Net\Mqtt;
-
 use IPub\MQTTClient\Client;
 
 /**

diff --git a/src/IPub/MQTTClient/Exceptions/InvalidStateException.php b/src/IPub/MQTTClient/Exceptions/InvalidStateException.php
@@ -16,6 +16,8 @@
 
 namespace IPub\MQTTClient\Exceptions;
 
-class InvalidStateException extends \Exception implements IException
+use Exception;
+
+class InvalidStateException extends Exception implements IException
 {
 }
diff --git a/src/IPub/MQTTClient/Logger/Formatter/IFormatter.php b/src/IPub/MQTTClient/Logger/Formatter/IFormatter.php
@@ -17,7 +17,7 @@
 namespace IPub\MQTTClient\Logger\Formatter;
 
 /**
- * Client server output formater interface
+ * Client server output formatter interface
  *
  * @package        iPublikuj:MQTTClient!
  * @subpackage     Logger

diff --git a/src/IPub/MQTTClient/Logger/Formatter/Symfony.php b/src/IPub/MQTTClient/Logger/Formatter/Symfony.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console;
 
 /**
- * Client server symfony console output formater
+ * Client server symfony console output formatter
  *
  * @package        iPublikuj:MQTTClient!
  * @subpackage     Logger