Merge pull request #6 from ipublikuj/dropnette2

Drop Nette 2 support

.gitignore

@@ -1,3 +1,4 @@
+.idea
 /vendor
 /composer.lock
 tests/*/output

.scrutinizer.yml

@@ -4,9 +4,7 @@ checks:
 build:
     environment:
         php:
-            version: 7.2
-        variables:
-            NETTE: default
+            version: 7.3
 
     dependencies:
         before:
@@ -16,7 +14,7 @@ build:
     tests:
         override:
             -
-                command: 'vendor/bin/tester tests -p php -c ./tests/php.ini-unix --coverage build/logs/clover.xml --coverage-src src'
+                command: 'vendor/bin/tester -s -p php -c ./tests/php.ini-unix tests --coverage build/logs/clover.xml --coverage-src src'
                 coverage:
                     file: build/logs/clover.xml
                     format: php-clover

.travis.yml

@@ -1,21 +1,19 @@
 language: php
 
-env:
-  - NETTE=default
-  - NETTE=~2.4.0
-
 php:
-  - 7.2
+  - 7.3
 
 before_install:
+  # turn off XDebug
+  - phpenv config-rm xdebug.ini || return 0
   - composer self-update
 
 before_script:
-  - php .travis.composer.php
-  - composer install --no-interaction --prefer-source --dev
+  - travis_retry composer install --no-progress --prefer-dist
 
 script:
   - vendor/bin/tester -s -p php -c ./tests/php.ini-unix tests
 
 after_failure:
-  - 'for i in $(find ./tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done'
+  # Print *.actual content
+  - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done

composer.json

@@ -35,20 +35,18 @@
   "extra" : {
     "ipub" : {
       "configuration" : {
-        "extensions" : {
-          "mqttClient" : "IPub\\MQTTClient\\DI\\MQTTClientExtension"
-        }
+        "extension" : "IPub\\MQTTClient\\DI\\MQTTClientExtension"
       }
     }
   },
 
   "require" : {
     "php" : ">=7.2.0",
 
-    "nette/di" : "~2.4 || ~3.0",
-    "nette/utils" : "~2.5 || ~3.0",
+    "nette/di" : "~3.0",
+    "nette/utils" : "~3.0",
 
-    "binsoul/net-mqtt" : "~0.2",
+    "binsoul/net-mqtt" : "0.2.1",
 
     "react/promise" : "~2.7",
     "react/socket" : "~1.2",
@@ -57,16 +55,16 @@
   },
 
   "require-dev" : {
-    "nette/bootstrap" : "~2.4 || ~3.0",
-    "nette/mail" : "~2.4 || ~3.0",
-    "nette/robot-loader" : "~2.4 || ~3.0",
+    "nette/bootstrap" : "~3.0",
+    "nette/mail" : "~3.0",
+    "nette/robot-loader" : "~3.0",
     "nette/safe-stream" : "~2.3",
     "nette/tester" : "~2.3",
 
     "tracy/tracy" : "~2.4",
 
-    "contributte/event-dispatcher": "~0.5",
-    "contributte/console": "~0.6",
+    "contributte/event-dispatcher" : "~0.5",
+    "contributte/console" : "~0.6",
 
     "pds/skeleton" : "~1.0"
   },

src/IPub/MQTTClient/Client/Client.php

@@ -16,6 +16,8 @@
 
 namespace IPub\MQTTClient\Client;
 
+use Closure;
+
 use Nette;
 
 use React\EventLoop;
@@ -26,6 +28,7 @@
 
 use BinSoul\Net\Mqtt;
 
+use IPub\MQTTClient\Configuration;
 use IPub\MQTTClient\Exceptions;
 use IPub\MQTTClient\Flow;
 
@@ -59,67 +62,67 @@ final class Client implements IClient
 	use Nette\SmartObject;
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onStart = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onOpen = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onConnect = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onDisconnect = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onClose = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onPing = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onPong = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onPublish = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onSubscribe = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onUnsubscribe = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onMessage = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onWarning = [];
 
 	/**
-	 * @var \Closure
+	 * @var Closure
 	 */
 	public $onError = [];
 
@@ -129,7 +132,7 @@ final class Client implements IClient
 	private $loop;
 
 	/**
-	 * @var Configuration
+	 * @var Configuration\Broker
 	 */
 	private $configuration;
 
@@ -204,7 +207,7 @@ final class Client implements IClient
 	private $writtenFlow;
 
 	/**
-	 * @var EventLoop\Timer\TimerInterface[]
+	 * @var EventLoop\TimerInterface[]
 	 */
 	private $timer = [];
 
@@ -215,13 +218,13 @@ final class Client implements IClient
 
 	/**
 	 * @param EventLoop\LoopInterface $eventLoop
-	 * @param Configuration $configuration
+	 * @param Configuration\Broker $configuration
 	 * @param Mqtt\IdentifierGenerator|NULL $identifierGenerator
 	 * @param Mqtt\StreamParser|NULL $parser
 	 */
 	public function __construct(
 		EventLoop\LoopInterface $eventLoop,
-		Configuration $configuration,
+		Configuration\Broker $configuration,
 		Mqtt\IdentifierGenerator $identifierGenerator = NULL,
 		Mqtt\StreamParser $parser = NULL
 	) {
@@ -272,8 +275,10 @@ public function getLoop() : EventLoop\LoopInterface
 
 	/**
 	 * {@inheritdoc}
+	 *
+	 * @throws Exceptions\InvalidStateException
 	 */
-	public function setConfiguration(Configuration $configuration) : void
+	public function setConfiguration(Configuration\Broker $configuration) : void
 	{
 		if ($this->isConnected() || $this->isConnecting) {
 			throw new Exceptions\InvalidStateException('Client is connecting or connected to the broker, therefore configuration could not be changed.');
@@ -284,6 +289,8 @@ public function setConfiguration(Configuration $configuration) : void
 
 	/**
 	 * {@inheritdoc}
+	 *
+	 * @throws Exceptions\InvalidStateException
 	 */
 	public function getUri() : string
 	{
@@ -323,7 +330,7 @@ public function connect() : Promise\ExtendedPromiseInterface
 		$connection = $this->configuration->getConnection();
 
 		if ($connection->getClientID() === '') {
-			$connection = $connection->withClientID($this->identifierGenerator->generateClientID());
+			$connection->setClientID($this->identifierGenerator->generateClientID());
 		}
 
 		$deferred = new Promise\Deferred;
@@ -473,6 +480,8 @@ function (\Exception $e) use ($deferred) {
 	 * Establishes a network connection to a server
 	 *
 	 * @return Promise\ExtendedPromiseInterface
+	 *
+	 * @throws Exceptions\InvalidStateException
 	 */
 	private function establishConnection() : Promise\ExtendedPromiseInterface
 	{

src/IPub/MQTTClient/Client/IClient.php

@@ -21,6 +21,8 @@
 
 use BinSoul\Net\Mqtt;
 
+use IPub\MQTTClient\Configuration;
+
 /**
  * Connection client interface
  *
@@ -42,11 +44,11 @@ function setLoop(EventLoop\LoopInterface $loop);
 	function getLoop() : EventLoop\LoopInterface;
 
 	/**
-	 * @param Configuration $configuration
+	 * @param Configuration\Broker $configuration
 	 *
 	 * @return void
 	 */
-	function setConfiguration(Configuration $configuration) : void;
+	function setConfiguration(Configuration\Broker $configuration) : void;
 
 	/**
 	 * Return the host

src/IPub/MQTTClient/Commands/ClientCommand.php

@@ -26,6 +26,7 @@
 use BinSoul\Net\Mqtt;
 
 use IPub\MQTTClient\Client;
+use IPub\MQTTClient\Exceptions;
 use IPub\MQTTClient\Logger;
 
 /**
@@ -73,6 +74,8 @@ public function __construct(
 	 * @param Log\LoggerInterface $logger
 	 *
 	 * @return void
+	 *
+	 * @throws Exceptions\InvalidStateException
 	 */
 	public function setLogger(Log\LoggerInterface $logger) : void
 	{