From dc7b2762c6e651ccca65fdc5e45c2214b7afbaeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20=C4=8Cevela?= <spamer@spameri.cz>
Date: Wed, 27 Mar 2019 22:59:20 +0100
Subject: [PATCH 01/20] composer: bump php to ^7.1

---
 .travis.yml   | 19 +++----------------
 composer.json |  2 +-
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62be8d60..92f03bc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,39 +7,26 @@ cache:
         - $HOME/.composer/cache
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 services:
   - rabbitmq
 
 env:
   matrix:
-    - NETTE=nette-2.4-dev
     - NETTE=nette-2.4
 
 matrix:
   include:
-    - php: 5.6
+    - php: 7.1
       env: NETTE=nette-2.4 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
-    - php: 7.0
+    - php: 7.3
       env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
-  exclude:
-    - php: 7.1
-      env: NETTE=nette-2.4-dev
-    - php: 7.1
-      env: NETTE=nette-2.4
-    - php: 7.2
-      env: NETTE=nette-2.4-dev
-    - php: 7.2
-      env: NETTE=nette-2.4
 
 before_install:
   - travis_retry composer self-update
-  - wget -O /tmp/composer-nette https://raw.githubusercontent.com/Kdyby/TesterExtras/master/bin/composer-nette.php
-  - php /tmp/composer-nette
 
 install:
   - travis_retry composer update --no-interaction --prefer-dist $COMPOSER_EXTRA_ARGS
diff --git a/composer.json b/composer.json
index 8634d68b..b92a784a 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4",
+		"php": "^7.1",
 		"nette/di": "~2.4@dev",
 		"nette/utils": "~2.4@dev",
 

From 008b823d49d9fcb4f5298eefe0eb5e4579e20780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Pudil?= <me@jiripudil.cz>
Date: Thu, 21 Mar 2019 22:12:13 +0100
Subject: [PATCH 02/20] travis: drop kdyby/code-checker

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 92f03bc4..8715ec23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,13 +31,11 @@ before_install:
 install:
   - travis_retry composer update --no-interaction --prefer-dist $COMPOSER_EXTRA_ARGS
   - travis_retry composer create-project --no-interaction jakub-onderka/php-parallel-lint /tmp/php-parallel-lint
-  - travis_retry composer create-project --no-interaction kdyby/code-checker /tmp/code-checker
   - travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
 
 script:
   - vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/
   - php /tmp/php-parallel-lint/parallel-lint.php -e php,phpt --exclude vendor .
-  - php /tmp/code-checker/src/code-checker.php --short-arrays
 
 after_script:
   - if [ "$COVERAGE" != "" ]; then php /tmp/coveralls.phar --verbose --config tests/.coveralls.yml || true; fi

From 9c0aafe65d72590fd50dd1cdb2053cf221f9678b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Pudil?= <me@jiripudil.cz>
Date: Thu, 21 Mar 2019 23:17:47 +0100
Subject: [PATCH 03/20] travis: run parallel-lint from vendor

---
 .travis.yml   | 3 +--
 composer.json | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8715ec23..079c3feb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,12 +30,11 @@ before_install:
 
 install:
   - travis_retry composer update --no-interaction --prefer-dist $COMPOSER_EXTRA_ARGS
-  - travis_retry composer create-project --no-interaction jakub-onderka/php-parallel-lint /tmp/php-parallel-lint
   - travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
 
 script:
   - vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/
-  - php /tmp/php-parallel-lint/parallel-lint.php -e php,phpt --exclude vendor .
+  - vendor/bin/parallel-lint -e php,phpt --exclude vendor .
 
 after_script:
   - if [ "$COVERAGE" != "" ]; then php /tmp/coveralls.phar --verbose --config tests/.coveralls.yml || true; fi
diff --git a/composer.json b/composer.json
index b92a784a..7fdcecc9 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,8 @@
 
 		"nette/tester": "~1.3@rc",
 		"mockery/mockery": "~0.9.1",
-		"kdyby/console": "~2.5@dev"
+		"kdyby/console": "~2.5@dev",
+		"jakub-onderka/php-parallel-lint": "~1.0@dev"
 	},
 	"support": {
 		"email": "filip@prochazka.su",

From a0acf162a2748518aa2abc12e69c9e7b27fe379a Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Fri, 29 Mar 2019 01:07:52 +0100
Subject: [PATCH 04/20] Travis and Composer cleanup - Unified travis.yml -
 Added PHPStan to travis - Added CodingStandard to travis - removed unused
 nette libraries - bump Nette/Utils to 3.0 - Added PHPStan - Added
 Kdyby/CodingStandard - Moved PHPCoveralls to composer - Added
 Typo3/ClassAliasLoader - Autoload set to PSR4

---
 .travis.yml   | 30 +++++++++++++++++++++---------
 composer.json | 50 +++++++++++++++++++-------------------------------
 phpstan.neon  |  7 +++++++
 3 files changed, 47 insertions(+), 40 deletions(-)
 create mode 100644 phpstan.neon

diff --git a/.travis.yml b/.travis.yml
index 079c3feb..0801c176 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ sudo: false
 cache:
     directories:
         - $HOME/.composer/cache
+        - $HOME/phpcs-cache
 
 php:
   - 7.1
@@ -16,28 +17,39 @@ services:
 
 env:
   matrix:
-    - NETTE=nette-2.4
+    - RUN_TESTS=1 # dev
+    - RUN_TESTS=1 COMPOSER_EXTRA_ARGS="" # after nette/di release add --prefer-stable
+    - RUN_TESTS=1 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
 
 matrix:
+  fast_finish: true
   include:
-    - php: 7.1
-      env: NETTE=nette-2.4 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
     - php: 7.3
-      env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
+      env: COMPOSER_EXTRA_ARGS="" COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
+    - php: 7.3
+      env: COMPOSER_EXTRA_ARGS="" PHPSTAN=1 RUN_TESTS=0
+    - php: 7.3
+      env: COMPOSER_EXTRA_ARGS="" CODING_STANDARD=1 RUN_TESTS=0
+  exclude:
+    - php: 7.3
+      env: COMPOSER_EXTRA_ARGS=""
+  allow_failures:
+    - env:
 
 before_install:
   - travis_retry composer self-update
 
 install:
-  - travis_retry composer update --no-interaction --prefer-dist $COMPOSER_EXTRA_ARGS
-  - travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
+  - travis_retry composer update --no-interaction --no-suggest --no-progress --prefer-dist $COMPOSER_EXTRA_ARGS # update because we may need --prefer-lowest option
 
 script:
-  - vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/
-  - vendor/bin/parallel-lint -e php,phpt --exclude vendor .
+  - if [ "$PHPSTAN" = "1" ]; then vendor/bin/phpstan analyse -l 2 -c phpstan.neon src tests/KdybyTests; fi
+  - if [ "$CODING_STANDARD" = "1" ]; then php vendor/bin/phpcs --standard=vendor/kdyby/coding-standard/ruleset.xml --cache=$HOME/phpcs-cache/.phpcs-cache --encoding=utf-8 -sp src tests/KdybyTests; fi
+  - if [ "$CODING_STANDARD" = "1" ]; then vendor/bin/parallel-lint -e php,phpt --exclude vendor .; fi
+  - if [ "$RUN_TESTS" = "1" ]; then vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/; fi
 
 after_script:
-  - if [ "$COVERAGE" != "" ]; then php /tmp/coveralls.phar --verbose --config tests/.coveralls.yml || true; fi
+  - if [ "$COVERAGE" != "" ]; then vendor/bin/php-coveralls --verbose --config tests/.coveralls.yml || true; fi
 
 after_failure:
   - 'for i in $(find ./tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done'
diff --git a/composer.json b/composer.json
index 7fdcecc9..9ac62f2b 100644
--- a/composer.json
+++ b/composer.json
@@ -17,51 +17,39 @@
 	],
 	"require": {
 		"php": "^7.1",
-		"nette/di": "~2.4@dev",
-		"nette/utils": "~2.4@dev",
+		"nette/di": "~2.4 || ^3.0@rc",
+		"nette/utils": "^3.0",
 
 		"php-amqplib/php-amqplib": "~2.6.2"
 	},
 	"require-dev": {
-		"nette/application": "~2.4@dev",
-		"nette/bootstrap": "~2.4@dev",
-		"nette/caching": "~2.4@dev",
-		"nette/component-model": "~2.3@dev",
-		"nette/database": "~2.4@dev",
-		"nette/deprecated": "~2.3@dev",
-		"nette/di": "~2.4@dev",
-		"nette/finder": "~2.4@dev",
-		"nette/forms": "~2.4@dev",
-		"nette/http": "~2.4@dev",
-		"nette/mail": "~2.4@dev",
-		"nette/neon": "~2.4@dev",
-		"nette/php-generator": "~2.4@dev",
-		"nette/reflection": "~2.4@dev",
-		"nette/robot-loader": "~2.4@dev",
-		"nette/safe-stream": "~2.3@dev",
-		"nette/security": "~2.4@dev",
-		"nette/tokenizer": "~2.3@dev",
-		"nette/utils": "~2.4@dev",
-		"latte/latte": "~2.4@dev",
-		"tracy/tracy": "~2.4@dev",
+        "kdyby/console": "~2.5@dev",
 
+        "nette/bootstrap": "~2.4 || ~3.0",
+        "latte/latte": "~2.4",
+		"tracy/tracy": "~2.4",
+		"phpstan/phpstan-shim": "^0.11.4",
+		"kdyby/coding-standard": "dev-master",
+		"php-coveralls/php-coveralls": "^2.1",
 		"nette/tester": "~1.3@rc",
 		"mockery/mockery": "~0.9.1",
-		"kdyby/console": "~2.5@dev",
-		"jakub-onderka/php-parallel-lint": "~1.0@dev"
+		"jakub-onderka/php-parallel-lint": "^1.0",
+        "typo3/class-alias-loader": "^1.0"
 	},
 	"support": {
 		"email": "filip@prochazka.su",
 		"issues": "https://github.com/Kdyby/RabbitMq/issues"
 	},
 	"autoload": {
-		"psr-0": {
-			"Kdyby\\RabbitMq\\": "src/"
-		},
-		"classmap": [
-			"src/Kdyby/RabbitMq/exceptions.php"
-		]
+		"psr-4": {
+			"Kdyby\\RabbitMq\\": "src/Kdyby/RabbitMq"
+		}
 	},
+    "autoload-dev": {
+        "psr-4": {
+            "KdybyTests\\RabbitMq\\": "tests/KdybyTests/RabbitMq"
+        }
+    },
 	"extra": {
 		"branch-alias": {
 			"dev-master": "1.0-dev"
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 00000000..64932b44
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,7 @@
+parameters:
+	ignoreErrors:
+
+	excludes_analyse:
+		- *src/Kdyby/RabbitMq/DI/ClassAliasMap.php
+
+

From e90ff892971eb81f20065fd43dea247f42e63219 Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Fri, 29 Mar 2019 01:14:31 +0100
Subject: [PATCH 05/20] Exception split to own files - Old namespaces aliased

---
 composer.json                                 |  7 +-
 .../RabbitMq/Command/AnonConsumerCommand.php  |  2 +-
 src/Kdyby/RabbitMq/Connection.php             |  1 +
 src/Kdyby/RabbitMq/Consumer.php               |  1 +
 src/Kdyby/RabbitMq/DI/ClassAliasMap.php       | 10 +++
 src/Kdyby/RabbitMq/Exception/Exception.php    | 14 ++++
 .../Exception/InvalidArgumentException.php    | 12 ++++
 .../Exception/QueueNotFoundException.php      | 12 ++++
 .../RabbitMq/Exception/TerminateException.php | 33 ++++++++++
 src/Kdyby/RabbitMq/MultipleConsumer.php       |  3 +
 src/Kdyby/RabbitMq/exceptions.php             | 66 -------------------
 11 files changed, 93 insertions(+), 68 deletions(-)
 create mode 100644 src/Kdyby/RabbitMq/DI/ClassAliasMap.php
 create mode 100644 src/Kdyby/RabbitMq/Exception/Exception.php
 create mode 100644 src/Kdyby/RabbitMq/Exception/InvalidArgumentException.php
 create mode 100644 src/Kdyby/RabbitMq/Exception/QueueNotFoundException.php
 create mode 100644 src/Kdyby/RabbitMq/Exception/TerminateException.php
 delete mode 100644 src/Kdyby/RabbitMq/exceptions.php

diff --git a/composer.json b/composer.json
index 9ac62f2b..1e3d09fa 100644
--- a/composer.json
+++ b/composer.json
@@ -53,6 +53,11 @@
 	"extra": {
 		"branch-alias": {
 			"dev-master": "1.0-dev"
-		}
+		},
+        "typo3/class-alias-loader": {
+            "class-alias-maps": [
+                "src/Kdyby/RabbitMq/DI/ClassAliasMap.php"
+            ]
+        }
 	}
 }
diff --git a/src/Kdyby/RabbitMq/Command/AnonConsumerCommand.php b/src/Kdyby/RabbitMq/Command/AnonConsumerCommand.php
index 59ea5678..ccc4c322 100644
--- a/src/Kdyby/RabbitMq/Command/AnonConsumerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/AnonConsumerCommand.php
@@ -3,7 +3,7 @@
 namespace Kdyby\RabbitMq\Command;
 
 use Kdyby\RabbitMq\AnonymousConsumer;
-use Kdyby\RabbitMq\InvalidArgumentException;
+use Kdyby\RabbitMq\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/src/Kdyby/RabbitMq/Connection.php b/src/Kdyby/RabbitMq/Connection.php
index 6fbe36b5..aa1a5f1e 100644
--- a/src/Kdyby/RabbitMq/Connection.php
+++ b/src/Kdyby/RabbitMq/Connection.php
@@ -3,6 +3,7 @@
 namespace Kdyby\RabbitMq;
 
 use Kdyby;
+use Kdyby\RabbitMq\Exception\InvalidArgumentException;
 use Nette;
 use PhpAmqpLib;
 
diff --git a/src/Kdyby/RabbitMq/Consumer.php b/src/Kdyby/RabbitMq/Consumer.php
index 8fe5aa94..2d631147 100644
--- a/src/Kdyby/RabbitMq/Consumer.php
+++ b/src/Kdyby/RabbitMq/Consumer.php
@@ -2,6 +2,7 @@
 
 namespace Kdyby\RabbitMq;
 
+use Kdyby\RabbitMq\Exception\TerminateException;
 use PhpAmqpLib\Exception\AMQPExceptionInterface;
 use PhpAmqpLib\Exception\AMQPRuntimeException;
 use PhpAmqpLib\Exception\AMQPTimeoutException;
diff --git a/src/Kdyby/RabbitMq/DI/ClassAliasMap.php b/src/Kdyby/RabbitMq/DI/ClassAliasMap.php
new file mode 100644
index 00000000..7596bd28
--- /dev/null
+++ b/src/Kdyby/RabbitMq/DI/ClassAliasMap.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types = 1);
+
+return [
+	\Kdyby\RabbitMq\Exception::class                => \Kdyby\RabbitMq\Exception\Exception::class,
+	\Kdyby\RabbitMq\InvalidArgumentException::class => \Kdyby\RabbitMq\Exception\InvalidArgumentException::class,
+	\Kdyby\RabbitMq\QueueNotFoundException::class   => \Kdyby\RabbitMq\Exception\QueueNotFoundException::class,
+	\Kdyby\RabbitMq\TerminateException::class       => \Kdyby\RabbitMq\Exception\TerminateException::class,
+];
diff --git a/src/Kdyby/RabbitMq/Exception/Exception.php b/src/Kdyby/RabbitMq/Exception/Exception.php
new file mode 100644
index 00000000..8835b557
--- /dev/null
+++ b/src/Kdyby/RabbitMq/Exception/Exception.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Kdyby\RabbitMq\Exception;
+
+
+/**
+ * Common interface for caching github exceptions
+ *
+ * @author Filip Procházka <filip@prochazka.com>
+ */
+interface Exception
+{
+
+}
diff --git a/src/Kdyby/RabbitMq/Exception/InvalidArgumentException.php b/src/Kdyby/RabbitMq/Exception/InvalidArgumentException.php
new file mode 100644
index 00000000..ed25f6aa
--- /dev/null
+++ b/src/Kdyby/RabbitMq/Exception/InvalidArgumentException.php
@@ -0,0 +1,12 @@
+<?php declare(strict_types = 1);
+
+namespace Kdyby\RabbitMq\Exception;
+
+
+/**
+ * @author Filip Procházka <filip@prochazka.com>
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements \Kdyby\RabbitMq\Exception\Exception
+{
+
+}
diff --git a/src/Kdyby/RabbitMq/Exception/QueueNotFoundException.php b/src/Kdyby/RabbitMq/Exception/QueueNotFoundException.php
new file mode 100644
index 00000000..8ed280c6
--- /dev/null
+++ b/src/Kdyby/RabbitMq/Exception/QueueNotFoundException.php
@@ -0,0 +1,12 @@
+<?php declare(strict_types = 1);
+
+namespace Kdyby\RabbitMq\Exception;
+
+
+/**
+ * @author Alvaro Videla <videlalvaro@gmail.com>
+ */
+class QueueNotFoundException extends \RuntimeException implements \Kdyby\RabbitMq\Exception\Exception
+{
+
+}
\ No newline at end of file
diff --git a/src/Kdyby/RabbitMq/Exception/TerminateException.php b/src/Kdyby/RabbitMq/Exception/TerminateException.php
new file mode 100644
index 00000000..89773a60
--- /dev/null
+++ b/src/Kdyby/RabbitMq/Exception/TerminateException.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types = 1);
+
+namespace Kdyby\RabbitMq\Exception;
+
+
+class TerminateException extends \RuntimeException implements \Kdyby\RabbitMq\Exception\Exception
+{
+
+	private $response = \Kdyby\RabbitMq\IConsumer::MSG_REJECT_REQUEUE;
+
+
+	/**
+	 * @param int $response
+	 * @return TerminateException
+	 */
+	public static function withResponse($response)
+	{
+		$e = new self();
+		$e->response = $response;
+
+		return $e;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function getResponse()
+	{
+		return $this->response;
+	}
+
+}
\ No newline at end of file
diff --git a/src/Kdyby/RabbitMq/MultipleConsumer.php b/src/Kdyby/RabbitMq/MultipleConsumer.php
index ba0f6481..ec839f09 100644
--- a/src/Kdyby/RabbitMq/MultipleConsumer.php
+++ b/src/Kdyby/RabbitMq/MultipleConsumer.php
@@ -2,6 +2,9 @@
 
 namespace Kdyby\RabbitMq;
 
+use Kdyby\RabbitMq\Exception\InvalidArgumentException;
+use Kdyby\RabbitMq\Exception\QueueNotFoundException;
+use Kdyby\RabbitMq\Exception\TerminateException;
 use Nette\Utils\Callback;
 use PhpAmqpLib\Message\AMQPMessage;
 
diff --git a/src/Kdyby/RabbitMq/exceptions.php b/src/Kdyby/RabbitMq/exceptions.php
deleted file mode 100644
index b450fc5a..00000000
--- a/src/Kdyby/RabbitMq/exceptions.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Kdyby\RabbitMq;
-
-
-/**
- * Common interface for caching github exceptions
- *
- * @author Filip Procházka <filip@prochazka.com>
- */
-interface Exception
-{
-
-}
-
-
-
-/**
- * @author Filip Procházka <filip@prochazka.com>
- */
-class InvalidArgumentException extends \InvalidArgumentException implements Exception
-{
-
-}
-
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- */
-class QueueNotFoundException extends \RuntimeException implements Exception
-{
-
-}
-
-
-
-class TerminateException extends \RuntimeException implements Exception
-{
-
-	private $response = IConsumer::MSG_REJECT_REQUEUE;
-
-
-
-	/**
-	 * @param int $response
-	 * @return TerminateException
-	 */
-	public static function withResponse($response)
-	{
-		$e = new self();
-		$e->response = $response;
-		return $e;
-	}
-
-
-
-	/**
-	 * @return int
-	 */
-	public function getResponse()
-	{
-		return $this->response;
-	}
-
-}

From 730446e86cb49a58bd534cae7f5719d22eab6a28 Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Fri, 29 Mar 2019 01:25:47 +0100
Subject: [PATCH 06/20] Tests cleanup PHPStan style - Fixed PSR4 autoloading -
 removed unnecessary methods from bootstrap - Split mock classes to own files
 - ExtensionTest - removed register method, extension added directly

---
 tests/KdybyTests/RabbitMq/BaseAmqpTest.php    |   8 +-
 .../{Consumer.phpt => ConsumerTest.phpt}      |   5 +-
 .../{Extension.phpt => ExtensionTest.phpt}    |  23 +-
 tests/KdybyTests/RabbitMq/Mock/Callback.php   |  29 +++
 .../{mocks.php => Mock/ChannelMock.php}       | 222 +++++++++---------
 .../RabbitMq/Mock/ConnectionMock.php          |  25 ++
 ...onsumer.phpt => MultipleConsumerTest.phpt} |   5 +-
 tests/KdybyTests/RabbitMq/TestCase.php        |   4 -
 tests/KdybyTests/bootstrap.php                |  14 +-
 9 files changed, 198 insertions(+), 137 deletions(-)
 rename tests/KdybyTests/RabbitMq/{Consumer.phpt => ConsumerTest.phpt} (97%)
 rename tests/KdybyTests/RabbitMq/{Extension.phpt => ExtensionTest.phpt} (77%)
 create mode 100644 tests/KdybyTests/RabbitMq/Mock/Callback.php
 rename tests/KdybyTests/RabbitMq/{mocks.php => Mock/ChannelMock.php} (63%)
 create mode 100644 tests/KdybyTests/RabbitMq/Mock/ConnectionMock.php
 rename tests/KdybyTests/RabbitMq/{MultipleConsumer.phpt => MultipleConsumerTest.phpt} (97%)

diff --git a/tests/KdybyTests/RabbitMq/BaseAmqpTest.php b/tests/KdybyTests/RabbitMq/BaseAmqpTest.php
index 649de47f..c962db03 100644
--- a/tests/KdybyTests/RabbitMq/BaseAmqpTest.php
+++ b/tests/KdybyTests/RabbitMq/BaseAmqpTest.php
@@ -13,13 +13,11 @@
 use Kdyby\RabbitMq\Connection;
 use Kdyby\RabbitMq\Consumer;
 use KdybyTests;
-use Nette;
-use Tester;
 use Tester\Assert;
 
 
+require_once __DIR__ . '/../bootstrap.php';
 
-require_once __DIR__ . '/TestCase.php';
 
 class BaseAmqpTest extends TestCase
 {
@@ -31,9 +29,9 @@ public function testLazyConnection()
 
 		Assert::exception(function () use ($consumer) {
 			$consumer->getChannel();
-		}, 'PhpAmqpLib\Exception\AMQPRuntimeException', 'Error Connecting to server(111): Connection refused');
+		}, \PhpAmqpLib\Exception\AMQPRuntimeException::class, 'Error Connecting to server(111): Connection refused');
 	}
 
 }
 
-\run(new BaseAmqpTest());
+(new BaseAmqpTest())->run();
diff --git a/tests/KdybyTests/RabbitMq/Consumer.phpt b/tests/KdybyTests/RabbitMq/ConsumerTest.phpt
similarity index 97%
rename from tests/KdybyTests/RabbitMq/Consumer.phpt
rename to tests/KdybyTests/RabbitMq/ConsumerTest.phpt
index f95bcde0..d75ba203 100644
--- a/tests/KdybyTests/RabbitMq/Consumer.phpt
+++ b/tests/KdybyTests/RabbitMq/ConsumerTest.phpt
@@ -20,8 +20,7 @@ use Tester;
 use Tester\Assert;
 
 
-
-require_once __DIR__ . '/TestCase.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 class ConsumerTest extends TestCase
 {
@@ -81,4 +80,4 @@ class ConsumerTest extends TestCase
 
 }
 
-\run(new ConsumerTest());
+(new ConsumerTest())->run();
diff --git a/tests/KdybyTests/RabbitMq/Extension.phpt b/tests/KdybyTests/RabbitMq/ExtensionTest.phpt
similarity index 77%
rename from tests/KdybyTests/RabbitMq/Extension.phpt
rename to tests/KdybyTests/RabbitMq/ExtensionTest.phpt
index 803909c4..a8646765 100644
--- a/tests/KdybyTests/RabbitMq/Extension.phpt
+++ b/tests/KdybyTests/RabbitMq/ExtensionTest.phpt
@@ -17,7 +17,8 @@ use PhpAmqpLib\Connection\AMQPStreamConnection;
 use Tester;
 use Tester\Assert;
 
-require_once __DIR__ . '/TestCase.php';
+
+require_once __DIR__ . '/../bootstrap.php';
 
 
 
@@ -28,13 +29,15 @@ class ExtensionTest extends TestCase
 {
 
 	/**
-	 * @return \SystemContainer|\Nette\DI\Container
+	 * @return \Nette\DI\Container
 	 */
 	protected function createContainer()
 	{
 		$config = new Nette\Configurator();
 		$config->setTempDirectory(TEMP_DIR);
-		Kdyby\RabbitMq\DI\RabbitMqExtension::register($config);
+		$config->onCompile[] = static function ($config, Nette\DI\Compiler $compiler) : void {
+			$compiler->addExtension('rabbitmq', new Kdyby\RabbitMq\DI\RabbitMqExtension());
+		};
 		$config->addConfig(__DIR__ . '/files/nette-reset.neon');
 		$config->addConfig(__DIR__ . '/files/default.neon');
 
@@ -48,12 +51,18 @@ class ExtensionTest extends TestCase
 		$dic = $this->createContainer();
 
 		// foo was defined first in config
-		Assert::true($dic->getByType('Kdyby\RabbitMq\Connection') instanceof AMQPStreamConnection);
-		Assert::same($dic->getByType('Kdyby\RabbitMq\Connection'), $dic->getService('rabbitmq.foo_connection.connection'));
+		Assert::true($dic->getByType(\Kdyby\RabbitMq\Connection::class) instanceof AMQPStreamConnection);
+		Assert::same(
+			$dic->getByType(\Kdyby\RabbitMq\Connection::class),
+			$dic->getService('rabbitmq.foo_connection.connection')
+		);
 
 		// only the first defined connection is autowired
 		Assert::true($dic->getService('rabbitmq.default.connection') instanceof AMQPStreamConnection);
-		Assert::notSame($dic->getByType('Kdyby\RabbitMq\Connection'), $dic->getService('rabbitmq.default.connection'));
+		Assert::notSame(
+			$dic->getByType(\Kdyby\RabbitMq\Connection::class),
+			$dic->getService('rabbitmq.default.connection')
+		);
 
 		Assert::true($dic->getService('rabbitmq.producer.foo_producer') instanceof Kdyby\RabbitMq\Producer);
 		Assert::true($dic->getService('rabbitmq.producer.default_producer') instanceof Kdyby\RabbitMq\Producer);
@@ -74,4 +83,4 @@ class ExtensionTest extends TestCase
 
 }
 
-\run(new ExtensionTest());
+(new ExtensionTest())->run();
diff --git a/tests/KdybyTests/RabbitMq/Mock/Callback.php b/tests/KdybyTests/RabbitMq/Mock/Callback.php
new file mode 100644
index 00000000..920112dc
--- /dev/null
+++ b/tests/KdybyTests/RabbitMq/Mock/Callback.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace KdybyTests\RabbitMq\Mock;
+
+
+class Callback
+{
+
+	public static $accepted = [];
+
+
+	public function __invoke($message)
+	{
+		self::$accepted[] = func_get_args();
+	}
+
+
+	public function process($message)
+	{
+		self::$accepted[] = func_get_args();
+	}
+
+
+	public static function staticProcess($message)
+	{
+		self::$accepted[] = func_get_args();
+	}
+
+}
\ No newline at end of file
diff --git a/tests/KdybyTests/RabbitMq/mocks.php b/tests/KdybyTests/RabbitMq/Mock/ChannelMock.php
similarity index 63%
rename from tests/KdybyTests/RabbitMq/mocks.php
rename to tests/KdybyTests/RabbitMq/Mock/ChannelMock.php
index e03c4699..7b8a3ca0 100644
--- a/tests/KdybyTests/RabbitMq/mocks.php
+++ b/tests/KdybyTests/RabbitMq/Mock/ChannelMock.php
@@ -1,38 +1,14 @@
-<?php
+<?php declare(strict_types = 1);
 
-/**
- * This file is part of the Kdyby (http://www.kdyby.org)
- *
- * Copyright (c) 2008 Filip Procházka (filip@prochazka.su)
- *
- * For the full copyright and license information, please view the file license.txt that was distributed with this source code.
- */
+namespace KdybyTests\RabbitMq\Mock;
 
-namespace KdybyTests\RabbitMq;
 
-use Kdyby;
-
-
-
-class ConnectionMock extends Kdyby\RabbitMq\Connection
-{
-
-	protected function doCreateChannel($id)
-	{
-		return new ChannelMock($this, $id);
-	}
-
-}
-
-
-
-class ChannelMock extends Kdyby\RabbitMq\Channel
+class ChannelMock extends \Kdyby\RabbitMq\Channel
 {
 
 	public $calls = [];
 
 
-
 	protected function channel_alert($args)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
@@ -40,7 +16,6 @@ protected function channel_alert($args)
 	}
 
 
-
 	protected function channel_close($args)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
@@ -48,7 +23,6 @@ protected function channel_close($args)
 	}
 
 
-
 	protected function channel_flow($args)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
@@ -56,7 +30,6 @@ protected function channel_flow($args)
 	}
 
 
-
 	public function exchange_declare(
 		$exchange,
 		$type,
@@ -67,27 +40,29 @@ public function exchange_declare(
 		$nowait = FALSE,
 		$arguments = NULL,
 		$ticket = NULL
-	) {
+	)
+	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
-		return parent::exchange_declare($exchange, $type, $passive, $durable, $auto_delete, $internal, $nowait, $arguments, $ticket);
+		return parent::exchange_declare(
+			$exchange, $type, $passive, $durable, $auto_delete, $internal, $nowait, $arguments, $ticket
+		);
 	}
 
 
-
 	public function exchange_delete(
 		$exchange,
 		$if_unused = FALSE,
 		$nowait = FALSE,
 		$ticket = NULL
-	) {
+	)
+	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
 		return parent::exchange_delete($exchange, $if_unused, $nowait, $ticket);
 	}
 
 
-
 	public function exchange_bind(
 		$destination,
 		$source,
@@ -95,15 +70,21 @@ public function exchange_bind(
 		$nowait = FALSE,
 		$arguments = NULL,
 		$ticket = NULL
-	) {
+	)
+	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
 		return parent::exchange_bind($destination, $source, $routing_key, $nowait, $arguments, $ticket);
 	}
 
 
-
-	public function exchange_unbind($destination, $source, $routing_key = "", $arguments = NULL, $ticket = NULL)
+	public function exchange_unbind(
+		$destination,
+		$source,
+		$routing_key = "",
+		$arguments = NULL,
+		$ticket = NULL
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
@@ -111,8 +92,14 @@ public function exchange_unbind($destination, $source, $routing_key = "", $argum
 	}
 
 
-
-	public function queue_bind($queue, $exchange, $routing_key = "", $nowait = FALSE, $arguments = NULL, $ticket = NULL)
+	public function queue_bind(
+		$queue,
+		$exchange,
+		$routing_key = "",
+		$nowait = FALSE,
+		$arguments = NULL,
+		$ticket = NULL
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
@@ -120,8 +107,13 @@ public function queue_bind($queue, $exchange, $routing_key = "", $nowait = FALSE
 	}
 
 
-
-	public function queue_unbind($queue, $exchange, $routing_key = "", $arguments = NULL, $ticket = NULL)
+	public function queue_unbind(
+		$queue,
+		$exchange,
+		$routing_key = "",
+		$arguments = NULL,
+		$ticket = NULL
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
@@ -129,7 +121,6 @@ public function queue_unbind($queue, $exchange, $routing_key = "", $arguments =
 	}
 
 
-
 	public function queue_declare(
 		$queue = "",
 		$passive = FALSE,
@@ -139,15 +130,23 @@ public function queue_declare(
 		$nowait = FALSE,
 		$arguments = NULL,
 		$ticket = NULL
-	) {
+	)
+	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
-		return parent::queue_declare($queue, $passive, $durable, $exclusive, $auto_delete, $nowait, $arguments, $ticket);
+		return parent::queue_declare(
+			$queue, $passive, $durable, $exclusive, $auto_delete, $nowait, $arguments, $ticket
+		);
 	}
 
 
-
-	public function queue_delete($queue = "", $if_unused = FALSE, $if_empty = FALSE, $nowait = FALSE, $ticket = NULL)
+	public function queue_delete(
+		$queue = "",
+		$if_unused = FALSE,
+		$if_empty = FALSE,
+		$nowait = FALSE,
+		$ticket = NULL
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
@@ -155,8 +154,11 @@ public function queue_delete($queue = "", $if_unused = FALSE, $if_empty = FALSE,
 	}
 
 
-
-	public function queue_purge($queue = "", $nowait = FALSE, $ticket = NULL)
+	public function queue_purge(
+		$queue = "",
+		$nowait = FALSE,
+		$ticket = NULL
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
@@ -164,24 +166,32 @@ public function queue_purge($queue = "", $nowait = FALSE, $ticket = NULL)
 	}
 
 
-
-	public function basic_ack($delivery_tag, $multiple = FALSE)
+	public function basic_ack(
+		$delivery_tag,
+		$multiple = FALSE
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 		parent::basic_ack($delivery_tag, $multiple);
 	}
 
 
-
-	public function basic_nack($delivery_tag, $multiple = FALSE, $requeue = FALSE)
+	public function basic_nack(
+		$delivery_tag,
+		$multiple = FALSE,
+		$requeue = FALSE
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 		parent::basic_nack($delivery_tag, $multiple, $requeue);
 	}
 
 
-
-	public function basic_cancel($consumer_tag, $nowait = FALSE, $noreturn = false)
+	public function basic_cancel(
+		$consumer_tag,
+		$nowait = FALSE,
+		$noreturn = FALSE
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
@@ -189,7 +199,20 @@ public function basic_cancel($consumer_tag, $nowait = FALSE, $noreturn = false)
 	}
 
 
-
+	/**
+	 * Starts a queue consumer
+	 *
+	 * @param string $queue
+	 * @param string $consumer_tag
+	 * @param bool $no_local
+	 * @param bool $no_ack
+	 * @param bool $exclusive
+	 * @param bool $nowait
+	 * @param callable|null $callback
+	 * @param int|null $ticket
+	 * @param array $arguments
+	 * @return mixed|string
+	 */
 	public function basic_consume(
 		$queue = "",
 		$consumer_tag = "",
@@ -200,15 +223,21 @@ public function basic_consume(
 		$callback = NULL,
 		$ticket = NULL,
 		$arguments = []
-	) {
+	)
+	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
-		return parent::basic_consume($queue, $consumer_tag, $no_local, $no_ack, $exclusive, $nowait, $callback, $ticket, $arguments);
+		return parent::basic_consume(
+			$queue, $consumer_tag, $no_local, $no_ack, $exclusive, $nowait, $callback, $ticket, $arguments
+		);
 	}
 
 
-
-	public function basic_get($queue = "", $no_ack = FALSE, $ticket = NULL)
+	public function basic_get(
+		$queue = "",
+		$no_ack = FALSE,
+		$ticket = NULL
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
@@ -216,8 +245,11 @@ public function basic_get($queue = "", $no_ack = FALSE, $ticket = NULL)
 	}
 
 
-
-	public function basic_qos($prefetch_size, $prefetch_count, $a_global)
+	public function basic_qos(
+		$prefetch_size,
+		$prefetch_count,
+		$a_global
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
@@ -225,7 +257,6 @@ public function basic_qos($prefetch_size, $prefetch_count, $a_global)
 	}
 
 
-
 	public function basic_recover($requeue = FALSE)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
@@ -234,23 +265,26 @@ public function basic_recover($requeue = FALSE)
 	}
 
 
-
-	public function basic_reject($delivery_tag, $requeue)
+	public function basic_reject(
+		$delivery_tag,
+		$requeue
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 		parent::basic_reject($delivery_tag, $requeue);
 	}
 
 
-
-	protected function basic_return($args, $msg)
+	protected function basic_return(
+		$args,
+		$msg
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 		parent::basic_return($args, $msg);
 	}
 
 
-
 	public function tx_commit()
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
@@ -259,7 +293,6 @@ public function tx_commit()
 	}
 
 
-
 	public function tx_rollback()
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
@@ -268,7 +301,6 @@ public function tx_rollback()
 	}
 
 
-
 	public function confirm_select($nowait = FALSE)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
@@ -277,7 +309,6 @@ public function confirm_select($nowait = FALSE)
 	}
 
 
-
 	public function tx_select()
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
@@ -286,8 +317,11 @@ public function tx_select()
 	}
 
 
-
-	public function dispatch($method_sig, $args, $content)
+	public function dispatch(
+		$method_sig,
+		$args,
+		$content
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 
@@ -295,41 +329,17 @@ public function dispatch($method_sig, $args, $content)
 	}
 
 
-
-	public function basic_publish($msg, $exchange = '', $routingKey = '', $mandatory = FALSE, $immediate = FALSE, $ticket = NULL)
+	public function basic_publish(
+		$msg,
+		$exchange = '',
+		$routingKey = '',
+		$mandatory = FALSE,
+		$immediate = FALSE,
+		$ticket = NULL
+	)
 	{
 		$this->calls[] = [__FUNCTION__] + get_defined_vars();
 		parent::basic_publish($msg, $exchange, $routingKey, $mandatory, $immediate, $ticket);
 	}
 
-}
-
-
-
-class Callback
-{
-
-	public static $accepted = [];
-
-
-
-	public function __invoke($message)
-	{
-		self::$accepted[] = func_get_args();
-	}
-
-
-
-	public function process($message)
-	{
-		self::$accepted[] = func_get_args();
-	}
-
-
-
-	public static function staticProcess($message)
-	{
-		self::$accepted[] = func_get_args();
-	}
-
-}
+}
\ No newline at end of file
diff --git a/tests/KdybyTests/RabbitMq/Mock/ConnectionMock.php b/tests/KdybyTests/RabbitMq/Mock/ConnectionMock.php
new file mode 100644
index 00000000..f5d6a098
--- /dev/null
+++ b/tests/KdybyTests/RabbitMq/Mock/ConnectionMock.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of the Kdyby (http://www.kdyby.org)
+ *
+ * Copyright (c) 2008 Filip Procházka (filip@prochazka.su)
+ *
+ * For the full copyright and license information, please view the file license.txt that was distributed with this source code.
+ */
+
+namespace KdybyTests\RabbitMq\Mock;
+
+use Kdyby;
+
+
+
+class ConnectionMock extends Kdyby\RabbitMq\Connection
+{
+
+	protected function doCreateChannel($id)
+	{
+		return new ChannelMock($this, $id);
+	}
+
+}
diff --git a/tests/KdybyTests/RabbitMq/MultipleConsumer.phpt b/tests/KdybyTests/RabbitMq/MultipleConsumerTest.phpt
similarity index 97%
rename from tests/KdybyTests/RabbitMq/MultipleConsumer.phpt
rename to tests/KdybyTests/RabbitMq/MultipleConsumerTest.phpt
index f0ad7d64..a0e8b30b 100644
--- a/tests/KdybyTests/RabbitMq/MultipleConsumer.phpt
+++ b/tests/KdybyTests/RabbitMq/MultipleConsumerTest.phpt
@@ -20,8 +20,7 @@ use Tester;
 use Tester\Assert;
 
 
-
-require_once __DIR__ . '/TestCase.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 class MultipleConsumerTest extends TestCase
 {
@@ -83,4 +82,4 @@ class MultipleConsumerTest extends TestCase
 
 }
 
-\run(new MultipleConsumerTest());
+(new MultipleConsumerTest())->run();
diff --git a/tests/KdybyTests/RabbitMq/TestCase.php b/tests/KdybyTests/RabbitMq/TestCase.php
index e2c06d45..6c94a9d7 100644
--- a/tests/KdybyTests/RabbitMq/TestCase.php
+++ b/tests/KdybyTests/RabbitMq/TestCase.php
@@ -16,10 +16,6 @@
 use Tester;
 
 
-
-require_once __DIR__ . '/../bootstrap.php';
-require_once __DIR__ . '/mocks.php';
-
 /**
  * @author Filip Procházka <filip@prochazka.su>
  */
diff --git a/tests/KdybyTests/bootstrap.php b/tests/KdybyTests/bootstrap.php
index b2c4aa81..9ed44cfa 100755
--- a/tests/KdybyTests/bootstrap.php
+++ b/tests/KdybyTests/bootstrap.php
@@ -8,14 +8,15 @@
  * For the full copyright and license information, please view the file license.md that was distributed with this source code.
  */
 
-if (@!include __DIR__ . '/../../vendor/autoload.php') {
+$loader = include __DIR__ . '/../../vendor/autoload.php';
+if ( ! $loader) {
 	echo 'Install Nette Tester using `composer update --dev`';
 	exit(1);
 }
 
 // configure environment
 Tester\Environment::setup();
-class_alias('Tester\Assert', 'Assert');
+class_alias(\Tester\Assert::class, 'Assert');
 date_default_timezone_set('Europe/Prague');
 
 // create temporary directory
@@ -27,12 +28,7 @@ class_alias('Tester\Assert', 'Assert');
 $_SERVER = array_intersect_key($_SERVER, array_flip([
 	'PHP_SELF', 'SCRIPT_NAME', 'SERVER_ADDR', 'SERVER_SOFTWARE', 'HTTP_HOST', 'DOCUMENT_ROOT', 'OS', 'argc', 'argv']));
 $_SERVER['REQUEST_TIME'] = 1234567890;
+// phpcs:disable SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
 $_ENV = $_GET = $_POST = [];
 
-function id($val) {
-	return $val;
-}
-
-function run(Tester\TestCase $testCase) {
-	$testCase->run(isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : NULL);
-}
+return $loader;

From 3e224983e3fc0f3129ecc91f5e48de75fe788d56 Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Fri, 29 Mar 2019 01:28:49 +0100
Subject: [PATCH 07/20] BaseConsumer replaced in type hints with Consumer -
 Consumer has all used methods

---
 src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php | 3 +--
 src/Kdyby/RabbitMq/Connection.php                  | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php b/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
index b63978fd..e2e2b68a 100644
--- a/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
@@ -2,7 +2,6 @@
 
 namespace Kdyby\RabbitMq\Command;
 
-use Kdyby\RabbitMq\BaseConsumer as Consumer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -25,7 +24,7 @@ abstract class BaseConsumerCommand extends Command
 	public $connection;
 
 	/**
-	 * @var Consumer|\Kdyby\RabbitMq\Consumer
+	 * @var \Kdyby\RabbitMq\Consumer
 	 */
 	protected $consumer;
 
diff --git a/src/Kdyby/RabbitMq/Connection.php b/src/Kdyby/RabbitMq/Connection.php
index aa1a5f1e..4e2f1311 100644
--- a/src/Kdyby/RabbitMq/Connection.php
+++ b/src/Kdyby/RabbitMq/Connection.php
@@ -34,7 +34,7 @@ class Connection extends PhpAmqpLib\Connection\AMQPLazyConnection implements ICo
 
 	/**
 	 * @param string $name
-	 * @return BaseConsumer
+	 * @return \Kdyby\RabbitMq\Consumer
 	 */
 	public function getConsumer($name)
 	{
@@ -48,7 +48,7 @@ public function getConsumer($name)
 
 
 	/**
-	 * @param $name
+	 * @param string $name
 	 * @return Producer
 	 */
 	public function getProducer($name)
@@ -63,7 +63,7 @@ public function getProducer($name)
 
 
 	/**
-	 * @param $name
+	 * @param string $name
 	 * @return RpcClient
 	 */
 	public function getRpcClient($name)
@@ -78,7 +78,7 @@ public function getRpcClient($name)
 
 
 	/**
-	 * @param $name
+	 * @param string $name
 	 * @return RpcServer
 	 */
 	public function getRpcServer($name)

From 6f94cb0278d2ea5785cd79a03fea10847b0e4bc5 Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Fri, 29 Mar 2019 01:32:25 +0100
Subject: [PATCH 08/20] Nette 3.0 compatibility - Decoupled constants from
 console to be less dependant - changed removed setClass -> setType - setType
 has only one argument, arguments are passed in setArguments method - Replaced
 removed Nette constants Nette\DI\Config\Helpers::EXTENDS_KEY - Removed unused
 register method

---
 src/Kdyby/RabbitMq/DI/RabbitMqExtension.php | 62 +++++++++++----------
 src/Kdyby/RabbitMq/Diagnostics/Panel.php    |  6 +-
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
index 2a6cf5eb..89de552c 100644
--- a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
+++ b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
@@ -12,8 +12,6 @@
 
 use Kdyby;
 use Nette;
-use Nette\DI\Compiler;
-use Nette\PhpGenerator as Code;
 use Nette\DI\Config;
 use Nette\Utils\Validators;
 
@@ -26,6 +24,8 @@
 class RabbitMqExtension extends Nette\DI\CompilerExtension
 {
 
+	public const TAG_COMMAND_KDYBY = 'kdyby.console.command';
+	public const TAG_COMMAND = 'console.command';
 	const TAG_PRODUCER = 'kdyby.rabbitmq.producer';
 	const TAG_CONSUMER = 'kdyby.rabbitmq.consumer';
 	const TAG_RPC_CLIENT = 'kdyby.rabbitmq.rpc.client';
@@ -193,11 +193,12 @@ public function loadConfiguration()
 		$this->loadRpcServers($config['rpcServers']);
 
 		foreach ($this->connectionsMeta as $name => $meta) {
+			/** @var \Nette\DI\Definitions\ServiceDefinition $connection */
 			$connection = $builder->getDefinition($meta['serviceId']);
 
 			if ($config['debugger']) {
 				$builder->addDefinition($panelService = $meta['serviceId'] . '.panel')
-					->setClass('Kdyby\RabbitMq\Diagnostics\Panel')
+					->setType('Kdyby\RabbitMq\Diagnostics\Panel')
 					->addSetup('injectServiceMap', [
 						$meta['consumers'],
 						$meta['rpcServers'],
@@ -245,7 +246,7 @@ protected function loadConnections($connections)
 			Nette\Utils\Validators::assertField($config, 'password', 'string:3..', "The config item '%' of connection {$this->name}.{$name}");
 
 			$connection = $builder->addDefinition($serviceName = $this->prefix($name . '.connection'))
-				->setClass('Kdyby\RabbitMq\Connection')
+				->setType('Kdyby\RabbitMq\Connection')
 				->setArguments([
 					$config['host'],
 					$config['port'],
@@ -284,7 +285,7 @@ protected function loadProducers($producers)
 
 			$producer = $builder->addDefinition($serviceName = $this->prefix('producer.' . $name))
 				->setFactory($config['class'], ['@' . $this->connectionsMeta[$config['connection']]['serviceId']])
-				->setClass('Kdyby\RabbitMq\IProducer')
+				->setType('Kdyby\RabbitMq\IProducer')
 				->addSetup('setContentType', [$config['contentType']])
 				->addSetup('setDeliveryMode', [$config['deliveryMode']])
 				->addSetup('setRoutingKey', [$config['routingKey']])
@@ -344,18 +345,18 @@ protected function loadConsumers($consumers)
 				}
 
 				$consumer
-					->setClass('Kdyby\RabbitMq\MultipleConsumer')
+					->setType('Kdyby\RabbitMq\MultipleConsumer')
 					->addSetup('setQueues', [$config['queues']]);
 
 			} elseif (empty($config['queues']) && !empty($config['queue'])) {
 				$consumer
-					->setClass('Kdyby\RabbitMq\Consumer')
+					->setType('Kdyby\RabbitMq\Consumer')
 					->addSetup('setQueueOptions', [$this->mergeConfig($config['queue'], $this->queueDefaults)])
 					->addSetup('setCallback', [self::fixCallback($config['callback'])]);
 
 			} else {
 				$consumer
-					->setClass('Kdyby\RabbitMq\AnonymousConsumer')
+					->setType('Kdyby\RabbitMq\AnonymousConsumer')
 					->addSetup('setCallback', [self::fixCallback($config['callback'])]);
 			}
 
@@ -386,8 +387,8 @@ protected function loadConsumers($consumers)
 
 	private function extendConsumerFromProducer(&$consumerName, $config)
 	{
-		if (isset($config[Config\Helpers::EXTENDS_KEY])) {
-			$producerName = $config[Config\Helpers::EXTENDS_KEY];
+		if (isset($config['_extends'])) {
+			$producerName = $config['_extends'];
 
 		} elseif ($m = Nette\Utils\Strings::match($consumerName, '~^(?P<consumerName>[^>\s]+)\s*\<\s*(?P<producerName>[^>\s]+)\z~')) {
 			$consumerName = $m['consumerName'];
@@ -427,7 +428,10 @@ protected function loadRpcClients($clients)
 			}
 
 			$builder->addDefinition($serviceName = $this->prefix('rpcClient.' . $name))
-				->setClass('Kdyby\RabbitMq\RpcClient', ['@' . $this->connectionsMeta[$config['connection']]['serviceId']])
+				->setType(\Kdyby\RabbitMq\RpcClient::class)
+				->setArguments([
+					'@' . $this->connectionsMeta[$config['connection']]['serviceId'],
+                ])
 				->addSetup('initClient', [$config['expectSerializedResponse']])
 				->addTag(self::TAG_RPC_CLIENT)
 				->setAutowired(FALSE);
@@ -450,7 +454,8 @@ protected function loadRpcServers($servers)
 			}
 
 			$rpcServer = $builder->addDefinition($serviceName = $this->prefix('rpcServer.' . $name))
-				->setClass('Kdyby\RabbitMq\RpcServer', ['@' . $this->connectionsMeta[$config['connection']]['serviceId']])
+				->setType(\Kdyby\RabbitMq\RpcServer::class)
+				->setArguments(['@' . $this->connectionsMeta[$config['connection']]['serviceId']])
 				->addSetup('initServer', [$name])
 				->addSetup('setCallback', [self::fixCallback($config['callback'])])
 				->addTag(self::TAG_RPC_SERVER)
@@ -480,15 +485,16 @@ private function loadConsole()
 		$builder = $this->getContainerBuilder();
 
 		foreach ([
-			'Kdyby\RabbitMq\Command\ConsumerCommand',
-			'Kdyby\RabbitMq\Command\PurgeConsumerCommand',
-			'Kdyby\RabbitMq\Command\RpcServerCommand',
-			'Kdyby\RabbitMq\Command\SetupFabricCommand',
-			'Kdyby\RabbitMq\Command\StdInProducerCommand',
+			\Kdyby\RabbitMq\Command\ConsumerCommand::class,
+			\Kdyby\RabbitMq\Command\PurgeConsumerCommand::class,
+			\Kdyby\RabbitMq\Command\RpcServerCommand::class,
+			\Kdyby\RabbitMq\Command\SetupFabricCommand::class,
+			\Kdyby\RabbitMq\Command\StdInProducerCommand::class,
 		] as $i => $class) {
 			$builder->addDefinition($this->prefix('console.' . $i))
-				->setClass($class)
-				->addTag(Kdyby\Console\DI\ConsoleExtension::COMMAND_TAG);
+				->setType($class)
+				->addTag(\Kdyby\RabbitMq\DI\RabbitMqExtension::TAG_COMMAND_KDYBY)
+				->addTag(\Kdyby\RabbitMq\DI\RabbitMqExtension::TAG_COMMAND);
 		}
 	}
 
@@ -496,7 +502,10 @@ private function loadConsole()
 
 	protected function mergeConfig($config, $defaults)
 	{
-		return Config\Helpers::merge($config, $this->compiler->getContainerBuilder()->expand($defaults));
+		return Config\Helpers::merge(
+			$config,
+			\Nette\DI\Helpers::expand($defaults, $this->compiler->getContainerBuilder()->parameters)
+		);
 	}
 
 
@@ -519,16 +528,9 @@ protected static function fixCallback($callback)
 	 */
 	protected static function filterArgs($statement)
 	{
-		return Nette\DI\Compiler::filterArguments([is_string($statement) ? new Nette\DI\Statement($statement) : $statement]);
-	}
-
-
-
-	public static function register(Nette\Configurator $configurator)
-	{
-		$configurator->onCompile[] = function ($config, Compiler $compiler) {
-			$compiler->addExtension('rabbitmq', new RabbitMqExtension());
-		};
+		return Nette\DI\Helpers::filterArguments([
+			\is_string($statement) ? new Nette\DI\Statement($statement) : $statement
+        ]);
 	}
 
 }
diff --git a/src/Kdyby/RabbitMq/Diagnostics/Panel.php b/src/Kdyby/RabbitMq/Diagnostics/Panel.php
index d7a1ee8a..9f0fe773 100644
--- a/src/Kdyby/RabbitMq/Diagnostics/Panel.php
+++ b/src/Kdyby/RabbitMq/Diagnostics/Panel.php
@@ -58,8 +58,8 @@ public function injectServiceMap(array $consumers, array $rpcServers)
 	public function getTab()
 	{
 		$img = Html::el('')->addHtml(file_get_contents(__DIR__ . '/rabbitmq-logo.svg'));
-		$tab = Html::el('span')->title('RabbitMq')->addHtml($img);
-		$title = Html::el('span')->class('tracy-label');
+		$tab = Html::el('span')->setAttribute('title', 'RabbitMq')->addHtml($img);
+		$title = Html::el('span')->setAttribute('class', 'tracy-label');
 
 		if ($this->messages) {
 			$title->setText(count($this->messages) . ' message' . (count($this->messages) > 1 ? 's' : ''));
@@ -124,7 +124,7 @@ public function getPanel()
 
 
 	/**
-	 * @param $message
+	 * @param string $message
 	 * @return object
 	 */
 	public function published($message)

From 3e6cd91b142bd8301a08ae6ada31146e490a7708 Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Sat, 30 Mar 2019 14:38:26 +0100
Subject: [PATCH 09/20] Coding standard - updated nette/tester - upper cased
 null/false/true - global function fqn - use strict types - return types -
 typed method arguments when possible - Changed catch \Exception to \Throwable

---
 composer.json                                 |   2 +-
 phpstan.neon                                  |   1 +
 src/Kdyby/RabbitMq/AmqpMember.php             | 146 ++++-----
 src/Kdyby/RabbitMq/AnonymousConsumer.php      |  25 +-
 src/Kdyby/RabbitMq/BaseConsumer.php           |  67 ++---
 src/Kdyby/RabbitMq/Channel.php                |  25 +-
 .../RabbitMq/Command/AnonConsumerCommand.php  |  21 +-
 .../RabbitMq/Command/BaseConsumerCommand.php  |  86 +++---
 .../RabbitMq/Command/ConsumerCommand.php      |  12 +-
 .../RabbitMq/Command/PurgeConsumerCommand.php |  32 +-
 .../RabbitMq/Command/RpcServerCommand.php     |  38 +--
 .../RabbitMq/Command/SetupFabricCommand.php   |  30 +-
 .../RabbitMq/Command/StdInProducerCommand.php |  35 +--
 src/Kdyby/RabbitMq/Connection.php             | 107 +++----
 src/Kdyby/RabbitMq/Consumer.php               | 100 +++----
 src/Kdyby/RabbitMq/DI/IConsumersProvider.php  |  13 +-
 src/Kdyby/RabbitMq/DI/IProducersProvider.php  |  13 +-
 src/Kdyby/RabbitMq/DI/IRpcClientsProvider.php |  13 +-
 src/Kdyby/RabbitMq/DI/IRpcServersProvider.php |  13 +-
 src/Kdyby/RabbitMq/DI/RabbitMqExtension.php   | 280 ++++++++++++------
 src/Kdyby/RabbitMq/Diagnostics/Panel.php      |  87 +++---
 src/Kdyby/RabbitMq/Exception/Exception.php    |   5 +-
 .../Exception/InvalidArgumentException.php    |   8 +-
 .../Exception/QueueNotFoundException.php      |  10 +-
 .../RabbitMq/Exception/TerminateException.php |  23 +-
 src/Kdyby/RabbitMq/IConnection.php            |  40 +--
 src/Kdyby/RabbitMq/IConsumer.php              |  15 +-
 src/Kdyby/RabbitMq/IProducer.php              |  33 ++-
 src/Kdyby/RabbitMq/MultipleConsumer.php       |  68 ++---
 src/Kdyby/RabbitMq/Producer.php               |  43 ++-
 src/Kdyby/RabbitMq/RpcClient.php              |  58 ++--
 src/Kdyby/RabbitMq/RpcServer.php              |  54 ++--
 .../{BaseAmqpTest.php => BaseAmqpTest.phpt}   |  14 +-
 tests/KdybyTests/RabbitMq/ConsumerTest.phpt   | 114 ++++---
 tests/KdybyTests/RabbitMq/ExtensionTest.phpt  |  23 +-
 tests/KdybyTests/RabbitMq/Mock/Callback.php   |  34 ++-
 .../KdybyTests/RabbitMq/Mock/ChannelMock.php  | 235 ++++++++-------
 .../RabbitMq/Mock/ConnectionMock.php          |  10 +-
 .../RabbitMq/MultipleConsumerTest.phpt        | 114 ++++---
 tests/KdybyTests/RabbitMq/TestCase.php        |  23 +-
 tests/KdybyTests/bootstrap.php                |  19 +-
 41 files changed, 981 insertions(+), 1108 deletions(-)
 rename tests/KdybyTests/RabbitMq/{BaseAmqpTest.php => BaseAmqpTest.phpt} (59%)

diff --git a/composer.json b/composer.json
index 1e3d09fa..fcefcfdc 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
 		"phpstan/phpstan-shim": "^0.11.4",
 		"kdyby/coding-standard": "dev-master",
 		"php-coveralls/php-coveralls": "^2.1",
-		"nette/tester": "~1.3@rc",
+		"nette/tester": "~2.2",
 		"mockery/mockery": "~0.9.1",
 		"jakub-onderka/php-parallel-lint": "^1.0",
         "typo3/class-alias-loader": "^1.0"
diff --git a/phpstan.neon b/phpstan.neon
index 64932b44..6f792ebb 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,5 +1,6 @@
 parameters:
 	ignoreErrors:
+		- '#Parameter \$callback of method KdybyTests\\RabbitMq\\Mock\\ChannelMock\:\:basic_consume\(\) has invalid typehint type PhpAmqpLib\\Channel\\callback.#'
 
 	excludes_analyse:
 		- *src/Kdyby/RabbitMq/DI/ClassAliasMap.php
diff --git a/src/Kdyby/RabbitMq/AmqpMember.php b/src/Kdyby/RabbitMq/AmqpMember.php
index 3065891a..6d213f26 100644
--- a/src/Kdyby/RabbitMq/AmqpMember.php
+++ b/src/Kdyby/RabbitMq/AmqpMember.php
@@ -1,32 +1,28 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq;
 
-use Nette;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AMQPLazyConnection;
 
-
-
 /**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- *
  * @property array $exchangeOptions
  * @property array $queueOptions
  */
 abstract class AmqpMember
 {
-	use Nette\SmartObject;
 
+	use \Nette\SmartObject;
 
 	/**
-	 * @var Connection
+	 * @var \Kdyby\RabbitMq\Connection
 	 */
 	protected $conn;
 
 	/**
-	 * @var Channel
+	 * @var \Kdyby\RabbitMq\Channel
 	 */
 	protected $ch;
 
@@ -43,14 +39,14 @@ abstract class AmqpMember
 	/**
 	 * @var bool
 	 */
-	protected $autoSetupFabric = true;
+	protected $autoSetupFabric = TRUE;
 
 	/**
 	 * @var array
 	 */
 	protected $basicProperties = [
 		'content_type' => 'text/plain',
-		'delivery_mode' => 2
+		'delivery_mode' => 2,
 	];
 
 	/**
@@ -58,59 +54,51 @@ abstract class AmqpMember
 	 */
 	protected $exchangeOptions = [
 		'name' => NULL,
-		'passive' => false,
-		'durable' => true,
-		'autoDelete' => false,
-		'internal' => false,
-		'nowait' => false,
-		'arguments' => null,
-		'ticket' => null,
-		'declare' => true,
+		'passive' => FALSE,
+		'durable' => TRUE,
+		'autoDelete' => FALSE,
+		'internal' => FALSE,
+		'nowait' => FALSE,
+		'arguments' => NULL,
+		'ticket' => NULL,
+		'declare' => TRUE,
 	];
 
 	/**
 	 * @var bool
 	 */
-	protected $exchangeDeclared = false;
+	protected $exchangeDeclared = FALSE;
 
 	/**
 	 * @var array
 	 */
 	protected $queueOptions = [
 		'name' => '',
-		'passive' => false,
-		'durable' => true,
-		'exclusive' => false,
-		'autoDelete' => false,
-		'nowait' => false,
-		'arguments' => null,
-		'ticket' => null,
+		'passive' => FALSE,
+		'durable' => TRUE,
+		'exclusive' => FALSE,
+		'autoDelete' => FALSE,
+		'nowait' => FALSE,
+		'arguments' => NULL,
+		'ticket' => NULL,
 		'routing_keys' => [],
 	];
 
 	/**
 	 * @var bool
 	 */
-	protected $queueDeclared = false;
+	protected $queueDeclared = FALSE;
 
-
-
-	/**
-	 * @param Connection $conn
-	 * @param string $consumerTag
-	 */
-	public function __construct(Connection $conn, $consumerTag = null)
+	public function __construct(Connection $conn, ?string $consumerTag = NULL)
 	{
 		$this->conn = $conn;
-		$this->consumerTag = empty($consumerTag) ? sprintf("PHPPROCESS_%s_%s", gethostname(), getmypid()) : $consumerTag;
+		$this->consumerTag = empty($consumerTag) ? \sprintf('PHPPROCESS_%s_%s', \gethostname(), \getmypid()) : $consumerTag;
 
 		if (!($conn instanceof AMQPLazyConnection)) {
 			$this->getChannel();
 		}
 	}
 
-
-
 	public function __destruct()
 	{
 		if ($this->ch) {
@@ -122,12 +110,7 @@ public function __destruct()
 		}
 	}
 
-
-
-	/**
-	 * @return AMQPChannel
-	 */
-	public function getChannel()
+	public function getChannel(): AMQPChannel
 	{
 		if (empty($this->ch)) {
 			$this->ch = $this->conn->channel();
@@ -136,24 +119,17 @@ public function getChannel()
 		return $this->ch;
 	}
 
-
-
-	/**
-	 * @param AMQPChannel $ch
-	 */
-	public function setChannel(AMQPChannel $ch)
+	public function setChannel(AMQPChannel $ch): void
 	{
 		$this->ch = $ch;
 	}
 
-
-
 	/**
 	 * @throws \InvalidArgumentException
-	 * @param  array $options
+	 * @param  array<mixed> $options
 	 * @return void
 	 */
-	public function setExchangeOptions(array $options = [])
+	public function setExchangeOptions(array $options = []): void
 	{
 		if (!isset($options['name'])) {
 			throw new \InvalidArgumentException('You must provide an exchange name');
@@ -166,51 +142,37 @@ public function setExchangeOptions(array $options = [])
 		$this->exchangeOptions = $options + $this->exchangeOptions;
 	}
 
-
-
 	/**
-	 * @return array
+	 * @return array<mixed>
 	 */
-	public function getExchangeOptions()
+	public function getExchangeOptions(): array
 	{
 		return $this->exchangeOptions;
 	}
 
-
-
 	/**
-	 * @param  array $options
+	 * @param  array<mixed> $options
 	 * @return void
 	 */
-	public function setQueueOptions(array $options = [])
+	public function setQueueOptions(array $options = []): void
 	{
 		$this->queueOptions = $options + $this->queueOptions;
 	}
 
-
-
 	/**
-	 * @return array
+	 * @return array<mixed>
 	 */
-	public function getQueueOptions()
+	public function getQueueOptions(): array
 	{
 		return $this->queueOptions;
 	}
 
-
-
-	/**
-	 * @param  string $routingKey
-	 * @return void
-	 */
-	public function setRoutingKey($routingKey)
+	public function setRoutingKey(string $routingKey): void
 	{
 		$this->routingKey = $routingKey;
 	}
 
-
-
-	protected function exchangeDeclare()
+	protected function exchangeDeclare(): void
 	{
 		if (empty($this->exchangeOptions['declare']) || empty($this->exchangeOptions['name'])) {
 			return;
@@ -225,28 +187,29 @@ protected function exchangeDeclare()
 			$this->exchangeOptions['internal'],
 			$this->exchangeOptions['nowait'],
 			$this->exchangeOptions['arguments'],
-			$this->exchangeOptions['ticket']);
+			$this->exchangeOptions['ticket']
+		);
 
-		$this->exchangeDeclared = true;
+		$this->exchangeDeclared = TRUE;
 	}
 
-
-
-	protected function queueDeclare()
+	protected function queueDeclare(): void
 	{
 		if (empty($this->queueOptions['name'])) {
 			return;
 		}
 
 		$this->doQueueDeclare($this->queueOptions['name'], $this->queueOptions);
-		$this->queueDeclared = true;
+		$this->queueDeclared = TRUE;
 	}
 
-
-
-	protected function doQueueDeclare($name, array $options)
+	/**
+	 * @param string $name
+	 * @param array<mixed> $options
+	 */
+	protected function doQueueDeclare(string $name, array $options): void
 	{
-		list($queueName, ,) = $this->getChannel()->queue_declare(
+		[$queueName ] = $this->getChannel()->queue_declare(
 			$name,
 			$options['passive'],
 			$options['durable'],
@@ -269,9 +232,7 @@ protected function doQueueDeclare($name, array $options)
 		}
 	}
 
-
-
-	public function setupFabric()
+	public function setupFabric(): void
 	{
 		if (!$this->exchangeDeclared) {
 			$this->exchangeDeclare();
@@ -282,13 +243,12 @@ public function setupFabric()
 		}
 	}
 
-
-
 	/**
 	 * disables the automatic SetupFabric when using a consumer or producer
 	 */
-	public function disableAutoSetupFabric()
+	public function disableAutoSetupFabric(): void
 	{
-		$this->autoSetupFabric = false;
+		$this->autoSetupFabric = FALSE;
 	}
+
 }
diff --git a/src/Kdyby/RabbitMq/AnonymousConsumer.php b/src/Kdyby/RabbitMq/AnonymousConsumer.php
index c4af5e91..2bbec597 100644
--- a/src/Kdyby/RabbitMq/AnonymousConsumer.php
+++ b/src/Kdyby/RabbitMq/AnonymousConsumer.php
@@ -1,15 +1,10 @@
 <?php
 
-namespace Kdyby\RabbitMq;
-
-
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq;
 
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class AnonymousConsumer extends Consumer
+class AnonymousConsumer extends \Kdyby\RabbitMq\Consumer
 {
 
 	public function __construct(Connection $conn)
@@ -18,13 +13,13 @@ public function __construct(Connection $conn)
 
 		$this->setQueueOptions([
 			'name' => '',
-			'passive' => false,
-			'durable' => false,
-			'exclusive' => true,
-			'autoDelete' => true,
-			'nowait' => false,
-			'arguments' => null,
-			'ticket' => null
+			'passive' => FALSE,
+			'durable' => FALSE,
+			'exclusive' => TRUE,
+			'autoDelete' => TRUE,
+			'nowait' => FALSE,
+			'arguments' => NULL,
+			'ticket' => NULL,
 		]);
 	}
 
diff --git a/src/Kdyby/RabbitMq/BaseConsumer.php b/src/Kdyby/RabbitMq/BaseConsumer.php
index 9f966cdf..3895ae83 100644
--- a/src/Kdyby/RabbitMq/BaseConsumer.php
+++ b/src/Kdyby/RabbitMq/BaseConsumer.php
@@ -1,18 +1,15 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq;
 
 use Nette\Utils\Callback;
 
-
-
 /**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- *
- * @method onStop(BaseConsumer $self)
+ * @method onStop(\Kdyby\RabbitMq\BaseConsumer $self)
  */
-abstract class BaseConsumer extends AmqpMember
+abstract class BaseConsumer extends \Kdyby\RabbitMq\AmqpMember
 {
 
 	/**
@@ -51,7 +48,7 @@ abstract class BaseConsumer extends AmqpMember
 	protected $qosOptions = [
 		'prefetchSize' => 0,
 		'prefetchCount' => 0,
-		'global' => FALSE
+		'global' => FALSE,
 	];
 
 	/**
@@ -59,25 +56,19 @@ abstract class BaseConsumer extends AmqpMember
 	 */
 	protected $qosDeclared = FALSE;
 
-
-
-	public function setCallback($callback)
+	public function setCallback(callable $callback): void
 	{
 		Callback::check($callback);
 		$this->callback = $callback;
 	}
 
-
-
-	public function stopConsuming()
+	public function stopConsuming(): void
 	{
 		$this->getChannel()->basic_cancel($this->getConsumerTag());
 		$this->onStop($this);
 	}
 
-
-
-	protected function setupConsumer()
+	protected function setupConsumer(): void
 	{
 		if ($this->autoSetupFabric) {
 			$this->setupFabric();
@@ -98,19 +89,17 @@ protected function setupConsumer()
 		);
 	}
 
-
-
-	protected function maybeStopConsumer()
+	protected function maybeStopConsumer(): void
 	{
-		if (extension_loaded('pcntl') && (defined('AMQP_WITHOUT_SIGNALS') ? !AMQP_WITHOUT_SIGNALS : true)) {
-			if (!function_exists('pcntl_signal_dispatch')) {
+		if (\extension_loaded('pcntl') && (\defined('AMQP_WITHOUT_SIGNALS') ? !AMQP_WITHOUT_SIGNALS : TRUE)) {
+			if (!\function_exists('pcntl_signal_dispatch')) {
 				throw new \BadFunctionCallException("Function 'pcntl_signal_dispatch' is referenced in the php.ini 'disable_functions' and can't be called.");
 			}
 
-			pcntl_signal_dispatch();
+			\pcntl_signal_dispatch();
 		}
 
-		if ($this->forceStop || ($this->consumed == $this->target && $this->target > 0)) {
+		if ($this->forceStop || ($this->consumed === $this->target && $this->target > 0)) {
 			$this->stopConsuming();
 
 		} else {
@@ -118,29 +107,21 @@ protected function maybeStopConsumer()
 		}
 	}
 
-
-
-	public function setConsumerTag($tag)
+	public function setConsumerTag(string $tag): void
 	{
 		$this->consumerTag = $tag;
 	}
 
-
-
-	public function getConsumerTag()
+	public function getConsumerTag(): string
 	{
 		return $this->consumerTag;
 	}
 
-
-
-	public function forceStopConsumer()
+	public function forceStopConsumer(): void
 	{
 		$this->forceStop = TRUE;
 	}
 
-
-
 	/**
 	 * Sets the qos settings for the current channel
 	 * Consider that prefetchSize and global do not work with rabbitMQ version <= 8.0
@@ -149,7 +130,7 @@ public function forceStopConsumer()
 	 * @param int $prefetchCount
 	 * @param bool $global
 	 */
-	public function setQosOptions($prefetchSize = 0, $prefetchCount = 0, $global = FALSE)
+	public function setQosOptions(int $prefetchSize = 0, int $prefetchCount = 0, bool $global = FALSE): void
 	{
 		$this->qosOptions = [
 			'prefetchSize' => $prefetchSize,
@@ -158,11 +139,9 @@ public function setQosOptions($prefetchSize = 0, $prefetchCount = 0, $global = F
 		];
 	}
 
-
-
-	protected function qosDeclare()
+	protected function qosDeclare(): void
 	{
-		if (!array_filter($this->qosOptions)) {
+		if (!\array_filter($this->qosOptions)) {
 			return;
 		}
 
@@ -175,16 +154,12 @@ protected function qosDeclare()
 		$this->qosDeclared = TRUE;
 	}
 
-
-
-	public function setIdleTimeout($seconds)
+	public function setIdleTimeout(int $seconds): void
 	{
 		$this->idleTimeout = $seconds;
 	}
 
-
-
-	public function getIdleTimeout()
+	public function getIdleTimeout(): int
 	{
 		return $this->idleTimeout;
 	}
diff --git a/src/Kdyby/RabbitMq/Channel.php b/src/Kdyby/RabbitMq/Channel.php
index d4a4a8f6..b4342d59 100644
--- a/src/Kdyby/RabbitMq/Channel.php
+++ b/src/Kdyby/RabbitMq/Channel.php
@@ -1,36 +1,27 @@
 <?php
 
-namespace Kdyby\RabbitMq;
-
-use PhpAmqpLib;
-
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq;
 
-/**
- * @author Marc Weistroff <marc.weistroff@sensio.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class Channel extends PhpAmqpLib\Channel\AMQPChannel
+class Channel extends \PhpAmqpLib\Channel\AMQPChannel
 {
 
 	/**
-	 * @var Diagnostics\Panel
+	 * @var \Kdyby\RabbitMq\Diagnostics\Panel
 	 */
 	private $panel;
 
-
-
-	public function injectPanel(Diagnostics\Panel $panel)
+	public function injectPanel(Diagnostics\Panel $panel): void
 	{
 		$this->panel = $panel;
 	}
 
-
-
-	public function basic_publish($msg, $exchange = '', $routingKey = '', $mandatory = false, $immediate = false, $ticket = NULL)
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function basic_publish($msg, $exchange = '', $routingKey = '', $mandatory = FALSE, $immediate = FALSE, $ticket = NULL)
 	{
 		if ($this->panel) {
-			$this->panel->published(get_defined_vars()); // all args
+			$this->panel->published(\get_defined_vars()); // all args
 		}
 
 		parent::basic_publish($msg, $exchange, $routingKey, $mandatory, $immediate, $ticket);
diff --git a/src/Kdyby/RabbitMq/Command/AnonConsumerCommand.php b/src/Kdyby/RabbitMq/Command/AnonConsumerCommand.php
index ccc4c322..1ef4fc0c 100644
--- a/src/Kdyby/RabbitMq/Command/AnonConsumerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/AnonConsumerCommand.php
@@ -1,22 +1,17 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq\Command;
 
 use Kdyby\RabbitMq\AnonymousConsumer;
-use Kdyby\RabbitMq\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class AnonConsumerCommand extends BaseConsumerCommand
+class AnonConsumerCommand extends \Kdyby\RabbitMq\Command\BaseConsumerCommand
 {
 
-	protected function configure()
+	protected function configure(): void
 	{
 		parent::configure();
 
@@ -27,16 +22,14 @@ protected function configure()
 		$this->getDefinition()->getOption('route')->setDefault('#');
 	}
 
-
-
-	protected function initialize(InputInterface $input, OutputInterface $output)
+	protected function initialize(InputInterface $input, OutputInterface $output): void
 	{
 		parent::initialize($input, $output);
 
 		if (!$this->consumer instanceof AnonymousConsumer) {
-			throw new InvalidArgumentException(
+			throw new \Kdyby\RabbitMq\Exception\InvalidArgumentException(
 				'Expected instance of Kdyby\RabbitMq\AnonymousConsumer, ' .
-				'but consumer ' . $input->getArgument('name'). ' is ' . get_class($this->consumer)
+				'but consumer ' . $input->getArgument('name') . ' is ' . \get_class($this->consumer)
 			);
 		}
 	}
diff --git a/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php b/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
index e2e2b68a..4a3499a7 100644
--- a/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
@@ -1,20 +1,15 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq\Command;
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-abstract class BaseConsumerCommand extends Command
+abstract class BaseConsumerCommand extends \Symfony\Component\Console\Command\Command
 {
 
 	/**
@@ -33,113 +28,102 @@ abstract class BaseConsumerCommand extends Command
 	 */
 	protected $amount;
 
-
-
-	protected function configure()
+	protected function configure(): void
 	{
 		$this
 			->addArgument('name', InputArgument::REQUIRED, 'Consumer Name')
 			->addOption('messages', 'm', InputOption::VALUE_OPTIONAL, 'Messages to consume', 0)
 			->addOption('route', 'r', InputOption::VALUE_OPTIONAL, 'Routing Key', '')
-			->addOption('memory-limit', 'l', InputOption::VALUE_OPTIONAL, 'Allowed memory for this process', null)
+			->addOption('memory-limit', 'l', InputOption::VALUE_OPTIONAL, 'Allowed memory for this process', NULL)
 			->addOption('debug', 'd', InputOption::VALUE_NONE, 'Enable Debugging')
 			->addOption('without-signals', 'w', InputOption::VALUE_NONE, 'Disable catching of system signals');
 	}
 
-
-
 	/**
-	 * @param InputInterface $input An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 *
+	 * @param \Symfony\Component\Console\Input\InputInterface $input An InputInterface instance
+	 * @param \Symfony\Component\Console\Output\OutputInterface $output An OutputInterface instance
 	 * @throws \InvalidArgumentException When the number of messages to consume is less than 0
 	 * @throws \BadFunctionCallException When the pcntl is not installed and option -s is true
 	 */
-	protected function initialize(InputInterface $input, OutputInterface $output)
+	protected function initialize(InputInterface $input, OutputInterface $output): void
 	{
 		parent::initialize($input, $output);
 
-		if (defined('AMQP_WITHOUT_SIGNALS') === false) {
-			define('AMQP_WITHOUT_SIGNALS', $input->getOption('without-signals'));
+		if (\defined('AMQP_WITHOUT_SIGNALS') === FALSE) {
+			\define('AMQP_WITHOUT_SIGNALS', $input->getOption('without-signals'));
 		}
 
-		if (!AMQP_WITHOUT_SIGNALS && extension_loaded('pcntl')) {
-			if (!function_exists('pcntl_signal')) {
+		if (!AMQP_WITHOUT_SIGNALS && \extension_loaded('pcntl')) {
+			if (!\function_exists('pcntl_signal')) {
 				throw new \BadFunctionCallException("Function 'pcntl_signal' is referenced in the php.ini 'disable_functions' and can't be called.");
 			}
 
-			pcntl_signal(SIGTERM, [$this, 'signalTerm']);
-			pcntl_signal(SIGINT, [$this, 'signalInt']);
-			pcntl_signal(SIGHUP, [$this, 'signalHup']);
+			\pcntl_signal(SIGTERM, [$this, 'signalTerm']);
+			\pcntl_signal(SIGINT, [$this, 'signalInt']);
+			\pcntl_signal(SIGHUP, [$this, 'signalHup']);
 		}
 
-		if (defined('AMQP_DEBUG') === false) {
-			define('AMQP_DEBUG', (bool) $input->getOption('debug'));
+		if (\defined('AMQP_DEBUG') === FALSE) {
+			\define('AMQP_DEBUG', (bool) $input->getOption('debug'));
 		}
 
-		if (($this->amount = $input->getOption('messages')) < 0) {
-			throw new \InvalidArgumentException("The -m option should be null or greater than 0");
+		$this->amount = $input->getOption('messages');
+		if ($this->amount < 0) {
+			throw new \InvalidArgumentException('The -m option should be null or greater than 0');
 		}
 
 		$this->consumer = $this->connection->getConsumer($input->getArgument('name'));
 
-		if (!is_null($input->getOption('memory-limit')) && ctype_digit((string) $input->getOption('memory-limit')) && $input->getOption('memory-limit') > 0) {
-			$this->consumer->setMemoryLimit($input->getOption('memory-limit'));
+		/** @var int|NULL $memoryLimit */
+		$memoryLimit = $input->getOption('memory-limit');
+		if ($memoryLimit !== NULL && \ctype_digit((string) $memoryLimit) && $memoryLimit > 0) {
+			$this->consumer->setMemoryLimit($memoryLimit);
 		}
 
-		if ($routingKey = $input->getOption('route')) {
+		$routingKey = $input->getOption('route');
+		if ($routingKey) {
 			$this->consumer->setRoutingKey($routingKey);
 		}
 	}
 
-
-
 	/**
-	 * @param InputInterface $input An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 *
-	 * @return integer 0 if everything went fine, or an error code
+	 * @param \Symfony\Component\Console\Input\InputInterface $input An InputInterface instance
+	 * @param \Symfony\Component\Console\Output\OutputInterface $output An OutputInterface instance
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): void
 	{
 		$this->consumer->consume($this->amount);
 	}
 
-
-
 	/**
 	 * @internal for pcntl only
 	 */
-	public function signalTerm()
+	public function signalTerm(): void
 	{
 		if ($this->consumer) {
-			pcntl_signal(SIGTERM, SIG_DFL);
+			\pcntl_signal(SIGTERM, SIG_DFL);
 			$this->consumer->forceStopConsumer();
 		}
 	}
 
-
-
 	/**
 	 * @internal for pcntl only
 	 */
-	public function signalInt()
+	public function signalInt(): void
 	{
 		if ($this->consumer) {
-			pcntl_signal(SIGINT, SIG_DFL);
+			\pcntl_signal(SIGINT, SIG_DFL);
 			$this->consumer->forceStopConsumer();
 		}
 	}
 
-
-
 	/**
 	 * @internal for pcntl only
 	 */
-	public function signalHup()
+	public function signalHup(): void
 	{
 		if ($this->consumer) {
-			pcntl_signal(SIGHUP, SIG_DFL);
+			\pcntl_signal(SIGHUP, SIG_DFL);
 			$this->consumer->forceStopConsumer();
 		}
 		// TODO: Implement restarting of consumer
diff --git a/src/Kdyby/RabbitMq/Command/ConsumerCommand.php b/src/Kdyby/RabbitMq/Command/ConsumerCommand.php
index da9fbb3e..cf2a3410 100644
--- a/src/Kdyby/RabbitMq/Command/ConsumerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/ConsumerCommand.php
@@ -1,17 +1,13 @@
 <?php
 
-namespace Kdyby\RabbitMq\Command;
-
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq\Command;
 
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class ConsumerCommand extends BaseConsumerCommand
+class ConsumerCommand extends \Kdyby\RabbitMq\Command\BaseConsumerCommand
 {
 
-	protected function configure()
+	protected function configure(): void
 	{
 		parent::configure();
 
diff --git a/src/Kdyby/RabbitMq/Command/PurgeConsumerCommand.php b/src/Kdyby/RabbitMq/Command/PurgeConsumerCommand.php
index fbd403b1..06a164df 100644
--- a/src/Kdyby/RabbitMq/Command/PurgeConsumerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/PurgeConsumerCommand.php
@@ -1,21 +1,15 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq\Command;
 
-use Kdyby\RabbitMq\Consumer;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class PurgeConsumerCommand extends Command
+class PurgeConsumerCommand extends \Symfony\Component\Console\Command\Command
 {
 
 	/**
@@ -24,31 +18,21 @@ class PurgeConsumerCommand extends Command
 	 */
 	public $connection;
 
-
-
-	protected function configure()
+	protected function configure(): void
 	{
 		$this
 			->setName('rabbitmq:purge')
 			->setDescription('Purges all messages in queue associated with given consumer')
 			->addArgument('name', InputArgument::REQUIRED, 'Consumer Name')
-			->addOption('no-confirmation', null, InputOption::VALUE_NONE, 'Whether it must be confirmed before purging');
+			->addOption('no-confirmation', NULL, InputOption::VALUE_NONE, 'Whether it must be confirmed before purging');
 	}
 
-
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 *
-	 * @return int
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$noConfirmation = (bool) $input->getOption('no-confirmation');
 
 		if (!$noConfirmation && $input->isInteractive()) {
-			$confirmation = $this->getHelper('dialog')->askConfirmation($output, sprintf('<question>Are you sure you wish to purge "%s" queue? (y/n)</question>', $input->getArgument('name')), false);
+			$confirmation = $this->getHelper('dialog')->askConfirmation($output, \sprintf('<question>Are you sure you wish to purge "%s" queue? (y/n)</question>', $input->getArgument('name')), FALSE);
 			if (!$confirmation) {
 				$output->writeln('<error>Purging cancelled!</error>');
 
@@ -56,7 +40,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 			}
 		}
 
-		/** @var Consumer $consumer */
+		/** @var \Kdyby\RabbitMq\Consumer $consumer */
 		$consumer = $this->connection->getConsumer($input->getArgument('name'));
 		$consumer->purge();
 
diff --git a/src/Kdyby/RabbitMq/Command/RpcServerCommand.php b/src/Kdyby/RabbitMq/Command/RpcServerCommand.php
index 4e734025..32c5b845 100644
--- a/src/Kdyby/RabbitMq/Command/RpcServerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/RpcServerCommand.php
@@ -1,20 +1,15 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq\Command;
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class RpcServerCommand extends Command
+class RpcServerCommand extends \Symfony\Component\Console\Command\Command
 {
 
 	/**
@@ -23,36 +18,31 @@ class RpcServerCommand extends Command
 	 */
 	public $connection;
 
-
-
-	protected function configure()
+	protected function configure(): void
 	{
 		$this
 			->setName('rabbitmq:rpc-server')
-			->setDescription("Starts a configured RPC server")
+			->setDescription('Starts a configured RPC server')
 			->addArgument('name', InputArgument::REQUIRED, 'Server Name')
 			->addOption('messages', 'm', InputOption::VALUE_OPTIONAL, 'Messages to consume', 0)
-			->addOption('debug', 'd', InputOption::VALUE_OPTIONAL, 'Debug mode', false);
+			->addOption('debug', 'd', InputOption::VALUE_OPTIONAL, 'Debug mode', FALSE);
 	}
 
-
-
 	/**
 	 * Executes the current command.
 	 *
-	 * @param InputInterface $input An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 *
-	 * @return integer 0 if everything went fine, or an error code
-	 *
+	 * @param \Symfony\Component\Console\Input\InputInterface $input An InputInterface instance
+	 * @param \Symfony\Component\Console\Output\OutputInterface $output An OutputInterface instance
 	 * @throws \InvalidArgumentException When the number of messages to consume is less than 0
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): void
 	{
-		define('AMQP_DEBUG', (bool) $input->getOption('debug'));
+		\define('AMQP_DEBUG', (bool) $input->getOption('debug'));
 
-		if (($amount = $input->getOption('messages')) < 0) {
-			throw new \InvalidArgumentException("The -m option should be null or greater than 0");
+		/** @var int $amount */
+		$amount = $input->getOption('messages');
+		if ($amount < 0) {
+			throw new \InvalidArgumentException('The -m option should be null or greater than 0');
 		}
 
 		$rpcServer = $this->connection->getRpcServer($input->getArgument('name'));
diff --git a/src/Kdyby/RabbitMq/Command/SetupFabricCommand.php b/src/Kdyby/RabbitMq/Command/SetupFabricCommand.php
index 78a802ca..36db7875 100644
--- a/src/Kdyby/RabbitMq/Command/SetupFabricCommand.php
+++ b/src/Kdyby/RabbitMq/Command/SetupFabricCommand.php
@@ -1,21 +1,15 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq\Command;
 
-use Kdyby\RabbitMq\AmqpMember;
 use Kdyby\RabbitMq\DI\RabbitMqExtension;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class SetupFabricCommand extends Command
+class SetupFabricCommand extends \Symfony\Component\Console\Command\Command
 {
 
 	/**
@@ -24,9 +18,7 @@ class SetupFabricCommand extends Command
 	 */
 	public $container;
 
-
-
-	protected function configure()
+	protected function configure(): void
 	{
 		$this
 			->setName('rabbitmq:setup-fabric')
@@ -34,12 +26,10 @@ protected function configure()
 			->addOption('debug', 'd', InputOption::VALUE_NONE, 'Enable Debugging');
 	}
 
-
-
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): void
 	{
-		if (defined('AMQP_DEBUG') === false) {
-			define('AMQP_DEBUG', (bool) $input->getOption('debug'));
+		if (\defined('AMQP_DEBUG') === FALSE) {
+			\define('AMQP_DEBUG', (bool) $input->getOption('debug'));
 		}
 
 		$output->writeln('Setting up the Rabbit MQ fabric');
@@ -48,10 +38,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
 			RabbitMqExtension::TAG_PRODUCER,
 			RabbitMqExtension::TAG_CONSUMER,
 			RabbitMqExtension::TAG_RPC_CLIENT,
-			RabbitMqExtension::TAG_RPC_SERVER
+			RabbitMqExtension::TAG_RPC_SERVER,
 		] as $tag) {
-			foreach ($this->container->findByTag($tag) as $serviceId => $meta) {
-				/** @var AmqpMember $service */
+			foreach (\array_keys($this->container->findByTag($tag)) as $serviceId) {
+				/** @var \Kdyby\RabbitMq\AmqpMember $service */
 				$service = $this->container->getService($serviceId);
 				$service->setupFabric();
 			}
diff --git a/src/Kdyby/RabbitMq/Command/StdInProducerCommand.php b/src/Kdyby/RabbitMq/Command/StdInProducerCommand.php
index 35ac1695..2f27c87d 100644
--- a/src/Kdyby/RabbitMq/Command/StdInProducerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/StdInProducerCommand.php
@@ -1,20 +1,15 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq\Command;
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class StdInProducerCommand extends Command
+class StdInProducerCommand extends \Symfony\Component\Console\Command\Command
 {
 
 	/**
@@ -23,39 +18,33 @@ class StdInProducerCommand extends Command
 	 */
 	public $connection;
 
-
-
-	protected function configure()
+	protected function configure(): void
 	{
 		$this
 			->setName('rabbitmq:stdin-producer')
 			->setDescription('Creates message from given STDIN and passes it to configured producer')
 			->addArgument('name', InputArgument::REQUIRED, 'Producer Name')
-			->addOption('debug', 'd', InputOption::VALUE_OPTIONAL, 'Enable Debugging', false);
+			->addOption('debug', 'd', InputOption::VALUE_OPTIONAL, 'Enable Debugging', FALSE);
 	}
 
-
-
 	/**
 	 * Executes the current command.
 	 *
-	 * @param InputInterface $input An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 *
-	 * @return integer 0 if everything went fine, or an error code
+	 * @param \Symfony\Component\Console\Input\InputInterface $input An InputInterface instance
+	 * @param \Symfony\Component\Console\Output\OutputInterface $output An OutputInterface instance
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): void
 	{
-		define('AMQP_DEBUG', (bool) $input->getOption('debug'));
+		\define('AMQP_DEBUG', (bool) $input->getOption('debug'));
 
 		$producer = $this->connection->getProducer($input->getArgument('name'));
 
 		$data = '';
-		while (!feof(STDIN)) {
-			$data .= fread(STDIN, 8192);
+		while (!\feof(STDIN)) {
+			$data .= \fread(STDIN, 8192);
 		}
 
-		$producer->publish(serialize($data));
+		$producer->publish(\serialize($data));
 	}
 
 }
diff --git a/src/Kdyby/RabbitMq/Connection.php b/src/Kdyby/RabbitMq/Connection.php
index 4e2f1311..ed581487 100644
--- a/src/Kdyby/RabbitMq/Connection.php
+++ b/src/Kdyby/RabbitMq/Connection.php
@@ -1,27 +1,21 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq;
 
-use Kdyby;
-use Kdyby\RabbitMq\Exception\InvalidArgumentException;
 use Nette;
-use PhpAmqpLib;
-
 
-
-/**
- * @author Filip Procházka <filip@prochazka.su>
- */
-class Connection extends PhpAmqpLib\Connection\AMQPLazyConnection implements IConnection
+class Connection extends \PhpAmqpLib\Connection\AMQPLazyConnection implements \Kdyby\RabbitMq\IConnection
 {
 
 	/**
-	 * @var Nette\DI\Container
+	 * @var \Nette\DI\Container
 	 */
 	private $serviceLocator;
 
 	/**
-	 * @var Diagnostics\Panel
+	 * @var \Kdyby\RabbitMq\Diagnostics\Panel
 	 */
 	private $panel;
 
@@ -30,72 +24,63 @@ class Connection extends PhpAmqpLib\Connection\AMQPLazyConnection implements ICo
 	 */
 	private $serviceMap = [];
 
-
-
-	/**
-	 * @param string $name
-	 * @return \Kdyby\RabbitMq\Consumer
-	 */
-	public function getConsumer($name)
+	public function getConsumer(string $name): \Kdyby\RabbitMq\Consumer
 	{
 		if (!isset($this->serviceMap['consumer'][$name])) {
-			throw new InvalidArgumentException("Unknown consumer {$name}");
+			throw new \Kdyby\RabbitMq\Exception\InvalidArgumentException(
+				\sprintf('Unknown consumer %s', $name)
+			);
 		}
 
 		return $this->serviceLocator->getService($this->serviceMap['consumer'][$name]);
 	}
 
-
-
-	/**
-	 * @param string $name
-	 * @return Producer
-	 */
-	public function getProducer($name)
+	public function getProducer(string $name): Producer
 	{
 		if (!isset($this->serviceMap['producer'][$name])) {
-			throw new InvalidArgumentException("Unknown producer {$name}");
+			throw new \Kdyby\RabbitMq\Exception\InvalidArgumentException(
+				\sprintf('Unknown producer %s', $name)
+			);
 		}
 
 		return $this->serviceLocator->getService($this->serviceMap['producer'][$name]);
 	}
 
-
-
-	/**
-	 * @param string $name
-	 * @return RpcClient
-	 */
-	public function getRpcClient($name)
+	public function getRpcClient(string $name): RpcClient
 	{
 		if (!isset($this->serviceMap['rpcClient'][$name])) {
-			throw new InvalidArgumentException("Unknown RPC client {$name}");
+			throw new \Kdyby\RabbitMq\Exception\InvalidArgumentException(
+				\sprintf('Unknown RPC client %s', $name)
+			);
 		}
 
 		return $this->serviceLocator->getService($this->serviceMap['rpcClient'][$name]);
 	}
 
-
-
-	/**
-	 * @param string $name
-	 * @return RpcServer
-	 */
-	public function getRpcServer($name)
+	public function getRpcServer(string $name): RpcServer
 	{
 		if (!isset($this->serviceMap['rpcServer'][$name])) {
-			throw new InvalidArgumentException("Unknown RPC server {$name}");
+			throw new \Kdyby\RabbitMq\Exception\InvalidArgumentException(
+				\sprintf('Unknown RPC server %s', $name)
+			);
 		}
 
 		return $this->serviceLocator->getService($this->serviceMap['rpcServer'][$name]);
 	}
 
-
-
 	/**
 	 * @internal
+	 * @param array<\Kdyby\RabbitMq\IProducer> $producers
+	 * @param array<\Kdyby\RabbitMq\IConsumer> $consumers
+	 * @param array<\Kdyby\RabbitMq\RpcClient> $rpcClients
+	 * @param array<\Kdyby\RabbitMq\RpcServer> $rpcServers
 	 */
-	public function injectServiceMap(array $producers, array $consumers, array $rpcClients, array $rpcServers)
+	public function injectServiceMap(
+		array $producers,
+		array $consumers,
+		array $rpcClients,
+		array $rpcServers
+	): void
 	{
 		$this->serviceMap = [
 			'consumer' => $consumers,
@@ -105,56 +90,46 @@ public function injectServiceMap(array $producers, array $consumers, array $rpcC
 		];
 	}
 
-
-
 	/**
 	 * @internal
-	 * @param Nette\DI\Container $sl
+	 * @param \Nette\DI\Container $sl
 	 */
-	public function injectServiceLocator(Nette\DI\Container $sl)
+	public function injectServiceLocator(Nette\DI\Container $sl): void
 	{
 		$this->serviceLocator = $sl;
 	}
 
-
-
 	/**
 	 * @internal
-	 * @param Diagnostics\Panel $panel
+	 * @param \Kdyby\RabbitMq\Diagnostics\Panel $panel
 	 */
-	public function injectPanel(Diagnostics\Panel $panel)
+	public function injectPanel(Diagnostics\Panel $panel): void
 	{
 		$this->panel = $panel->register($this);
 	}
 
-
-
 	/**
 	 * Fetch a Channel object identified by the numeric channel_id, or
 	 * create that object if it doesn't already exist.
 	 *
 	 * @param string $id
-	 * @return Channel
+	 * @return \Kdyby\RabbitMq\Channel
+	 * @throws \Exception
 	 */
-	public function channel($id = null)
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
+	public function channel($id = NULL): Channel
 	{
 		if (isset($this->channels[$id])) {
 			return $this->channels[$id];
 		}
 
 		$this->connect();
-		$id = $id ? $id : $this->get_free_channel_id();
+		$id = $id ?: $this->get_free_channel_id();
 
 		return $this->channels[$id] = $this->doCreateChannel($id);
 	}
 
-
-
-	/**
-	 * @param string $id
-	 * @return Channel
-	 */
-	protected function doCreateChannel($id)
+	protected function doCreateChannel(string $id): Channel
 	{
 		$channel = new Channel($this->connection, $id);
 
diff --git a/src/Kdyby/RabbitMq/Consumer.php b/src/Kdyby/RabbitMq/Consumer.php
index 2d631147..59578792 100644
--- a/src/Kdyby/RabbitMq/Consumer.php
+++ b/src/Kdyby/RabbitMq/Consumer.php
@@ -1,27 +1,21 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq;
 
-use Kdyby\RabbitMq\Exception\TerminateException;
 use PhpAmqpLib\Exception\AMQPExceptionInterface;
-use PhpAmqpLib\Exception\AMQPRuntimeException;
-use PhpAmqpLib\Exception\AMQPTimeoutException;
 use PhpAmqpLib\Message\AMQPMessage;
 
-
-
 /**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- *
- * @method onStart(Consumer $self)
- * @method onConsume(Consumer $self, AMQPMessage $msg)
- * @method onReject(Consumer $self, AMQPMessage $msg, $processFlag)
- * @method onAck(Consumer $self, AMQPMessage $msg)
- * @method onError(Consumer $self, AMQPExceptionInterface $e)
- * @method onTimeout(Consumer $self)
+ * @method onStart(\Kdyby\RabbitMq\Consumer $self)
+ * @method onConsume(\Kdyby\RabbitMq\Consumer $self, \PhpAmqpLib\Message\AMQPMessage $msg)
+ * @method onReject(\Kdyby\RabbitMq\Consumer $self, \PhpAmqpLib\Message\AMQPMessage $msg, $processFlag)
+ * @method onAck(\Kdyby\RabbitMq\Consumer $self, \PhpAmqpLib\Message\AMQPMessage $msg)
+ * @method onError(\Kdyby\RabbitMq\Consumer $self, \PhpAmqpLib\Exception\AMQPExceptionInterface $e)
+ * @method onTimeout(\Kdyby\RabbitMq\Consumer $self)
  */
-class Consumer extends BaseConsumer
+class Consumer extends \Kdyby\RabbitMq\BaseConsumer
 {
 
 	/**
@@ -64,62 +58,54 @@ class Consumer extends BaseConsumer
 	 */
 	protected $memoryLimit;
 
-
-
 	/**
 	 * Set the memory limit
 	 *
 	 * @param int $memoryLimit
 	 */
-	public function setMemoryLimit($memoryLimit)
+	public function setMemoryLimit(int $memoryLimit): void
 	{
 		$this->memoryLimit = $memoryLimit;
 	}
 
-
-
 	/**
 	 * Get the memory limit
-	 *
-	 * @return int
 	 */
-	public function getMemoryLimit()
+	public function getMemoryLimit(): ?int
 	{
 		return $this->memoryLimit;
 	}
 
-
-
-	public function consume($msgAmount)
+	public function consume(int $msgAmount): void
 	{
 		$this->target = $msgAmount;
 		$this->setupConsumer();
 		$this->onStart($this);
 
-		$previousErrorHandler = set_error_handler(function ($severity, $message, $file, $line, $context) use (&$previousErrorHandler) {
-			if (!preg_match('~stream_select\\(\\)~i', $message)) {
-				$args = func_get_args();
-				return call_user_func_array($previousErrorHandler, $args);
+		$previousErrorHandler = \set_error_handler(static function ($severity, $message, $file, $line, $context) use (&$previousErrorHandler) {
+			if (!\preg_match('~stream_select\\(\\)~i', $message)) {
+				$args = \func_get_args();
+				return \call_user_func_array($previousErrorHandler, $args);
 			}
 
-			throw new AMQPRuntimeException($message . ' in ' . $file . ':' . $line, (int) $severity);
+			throw new \PhpAmqpLib\Exception\AMQPRuntimeException($message . ' in ' . $file . ':' . $line, (int) $severity);
 		});
 
 		try {
-			while (count($this->getChannel()->callbacks)) {
+			while (\count($this->getChannel()->callbacks)) {
 				$this->maybeStopConsumer();
 
 				try {
 					$this->getChannel()->wait(NULL, FALSE, $this->getIdleTimeout());
-				} catch (AMQPTimeoutException $e) {
+				} catch (\PhpAmqpLib\Exception\AMQPTimeoutException $e) {
 					$this->onTimeout($this);
 					// nothing bad happened, right?
 					// intentionally not throwing the exception
 				}
 			}
 
-		} catch (AMQPRuntimeException $e) {
-			restore_error_handler();
+		} catch (\PhpAmqpLib\Exception\AMQPRuntimeException $e) {
+			\restore_error_handler();
 
 			// sending kill signal to the consumer causes the stream_select to return false
 			// the reader doesn't like the false value, so it throws AMQPRuntimeException
@@ -130,63 +116,61 @@ public function consume($msgAmount)
 			}
 
 		} catch (AMQPExceptionInterface $e) {
-			restore_error_handler();
+			\restore_error_handler();
 
 			$this->onError($this, $e);
 			throw $e;
 
-		} catch (TerminateException $e) {
+		} catch (\Kdyby\RabbitMq\Exception\TerminateException $e) {
 			$this->stopConsuming();
 		}
 	}
 
-
-
 	/**
 	 * Purge the queue
 	 */
-	public function purge()
+	public function purge(): void
 	{
-		$this->getChannel()->queue_purge($this->queueOptions['name'], true);
+		$this->getChannel()->queue_purge($this->queueOptions['name'], TRUE);
 	}
 
-
-
-	public function processMessage(AMQPMessage $msg)
+	public function processMessage(AMQPMessage $msg): void
 	{
 		$this->onConsume($this, $msg);
 		try {
-			$processFlag = call_user_func($this->callback, $msg);
+			$processFlag = \call_user_func($this->callback, $msg);
 			$this->handleProcessMessage($msg, $processFlag);
 
-		} catch (TerminateException $e) {
+		} catch (\Kdyby\RabbitMq\Exception\TerminateException $e) {
 			$this->handleProcessMessage($msg, $e->getResponse());
 			throw $e;
 
-		} catch (\Exception $e) {
+		} catch (\Throwable $e) {
 			$this->onReject($this, $msg, IConsumer::MSG_REJECT_REQUEUE);
 			throw $e;
 		}
 	}
 
-
-
-	protected function handleProcessMessage(AMQPMessage $msg, $processFlag)
+	/**
+	 * @param \PhpAmqpLib\Message\AMQPMessage $msg
+	 * @param int|bool $processFlag
+	 */
+	protected function handleProcessMessage(AMQPMessage $msg, $processFlag): void
 	{
-		if ($processFlag === IConsumer::MSG_REJECT_REQUEUE || false === $processFlag) {
+		if ($processFlag === IConsumer::MSG_REJECT_REQUEUE || $processFlag === FALSE) {
 			// Reject and requeue message to RabbitMQ
-			$msg->delivery_info['channel']->basic_reject($msg->delivery_info['delivery_tag'], true);
+			$msg->delivery_info['channel']->basic_reject($msg->delivery_info['delivery_tag'], TRUE);
 			$this->onReject($this, $msg, $processFlag);
 
 		} elseif ($processFlag === IConsumer::MSG_SINGLE_NACK_REQUEUE) {
 			// NACK and requeue message to RabbitMQ
-			$msg->delivery_info['channel']->basic_nack($msg->delivery_info['delivery_tag'], false, true);
+			$msg->delivery_info['channel']->basic_nack($msg->delivery_info['delivery_tag'], FALSE, TRUE);
 			$this->onReject($this, $msg, $processFlag);
 
 		} else {
 			if ($processFlag === IConsumer::MSG_REJECT) {
 				// Reject and drop
-				$msg->delivery_info['channel']->basic_reject($msg->delivery_info['delivery_tag'], false);
+				$msg->delivery_info['channel']->basic_reject($msg->delivery_info['delivery_tag'], FALSE);
 				$this->onReject($this, $msg, $processFlag);
 
 			} else {
@@ -204,20 +188,18 @@ protected function handleProcessMessage(AMQPMessage $msg, $processFlag)
 		}
 	}
 
-
-
 	/**
 	 * Checks if memory in use is greater or equal than memory allowed for this process
 	 *
-	 * @return boolean
+	 * @return bool
 	 */
-	protected function isRamAlmostOverloaded()
+	protected function isRamAlmostOverloaded(): bool
 	{
 		if ($this->getMemoryLimit() === NULL) {
 			return FALSE;
 		}
 
-		return memory_get_usage(true) >= ($this->getMemoryLimit() * 1024 * 1024);
+		return \memory_get_usage(TRUE) >= ($this->getMemoryLimit() * 1024 * 1024);
 	}
 
 }
diff --git a/src/Kdyby/RabbitMq/DI/IConsumersProvider.php b/src/Kdyby/RabbitMq/DI/IConsumersProvider.php
index ea20654a..a988f72b 100644
--- a/src/Kdyby/RabbitMq/DI/IConsumersProvider.php
+++ b/src/Kdyby/RabbitMq/DI/IConsumersProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This file is part of the Kdyby (http://www.kdyby.org)
  *
@@ -10,19 +12,14 @@
 
 namespace Kdyby\RabbitMq\DI;
 
-use Kdyby;
-use Nette;
-
-/**
- * @author Jan Trejbal <jan.trejbal@gmail.com>
- */
 interface IConsumersProvider
 {
 
 	/**
 	 * Returns array of name => array config.
 	 *
-	 * @return array
+	 * @return array<string, array<mixed>>
 	 */
-	function getRabbitConsumers();
+	public function getRabbitConsumers(): array;
+
 }
diff --git a/src/Kdyby/RabbitMq/DI/IProducersProvider.php b/src/Kdyby/RabbitMq/DI/IProducersProvider.php
index 2bdc8172..c850becd 100644
--- a/src/Kdyby/RabbitMq/DI/IProducersProvider.php
+++ b/src/Kdyby/RabbitMq/DI/IProducersProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This file is part of the Kdyby (http://www.kdyby.org)
  *
@@ -10,19 +12,14 @@
 
 namespace Kdyby\RabbitMq\DI;
 
-use Kdyby;
-use Nette;
-
-/**
- * @author Jan Trejbal <jan.trejbal@gmail.com>
- */
 interface IProducersProvider
 {
 
 	/**
 	 * Returns array of name => array config.
 	 *
-	 * @return array
+	 * @return array<string, array<mixed>>
 	 */
-	function getRabbitProducers();
+	public function getRabbitProducers(): array;
+
 }
diff --git a/src/Kdyby/RabbitMq/DI/IRpcClientsProvider.php b/src/Kdyby/RabbitMq/DI/IRpcClientsProvider.php
index 933c6dff..98e6ecf9 100644
--- a/src/Kdyby/RabbitMq/DI/IRpcClientsProvider.php
+++ b/src/Kdyby/RabbitMq/DI/IRpcClientsProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This file is part of the Kdyby (http://www.kdyby.org)
  *
@@ -10,19 +12,14 @@
 
 namespace Kdyby\RabbitMq\DI;
 
-use Kdyby;
-use Nette;
-
-/**
- * @author Jan Trejbal <jan.trejbal@gmail.com>
- */
 interface IRpcClientsProvider
 {
 
 	/**
 	 * Returns array of name => array config.
 	 *
-	 * @return array
+	 * @return array<string, array<mixed>>
 	 */
-	function getRabbitRpcClients();
+	public function getRabbitRpcClients(): array;
+
 }
diff --git a/src/Kdyby/RabbitMq/DI/IRpcServersProvider.php b/src/Kdyby/RabbitMq/DI/IRpcServersProvider.php
index 0a175965..1d63b907 100644
--- a/src/Kdyby/RabbitMq/DI/IRpcServersProvider.php
+++ b/src/Kdyby/RabbitMq/DI/IRpcServersProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This file is part of the Kdyby (http://www.kdyby.org)
  *
@@ -10,19 +12,14 @@
 
 namespace Kdyby\RabbitMq\DI;
 
-use Kdyby;
-use Nette;
-
-/**
- * @author Jan Trejbal <jan.trejbal@gmail.com>
- */
 interface IRpcServersProvider
 {
 
 	/**
 	 * Returns array of name => array config.
 	 *
-	 * @return array
+	 * @return array<string, array<mixed>>
 	 */
-	function getRabbitRpcServers();
+	public function getRabbitRpcServers(): array;
+
 }
diff --git a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
index 89de552c..05ca4f7d 100644
--- a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
+++ b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This file is part of the Kdyby (http://www.kdyby.org)
  *
@@ -10,26 +12,19 @@
 
 namespace Kdyby\RabbitMq\DI;
 
-use Kdyby;
 use Nette;
 use Nette\DI\Config;
 use Nette\Utils\Validators;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class RabbitMqExtension extends Nette\DI\CompilerExtension
+class RabbitMqExtension extends \Nette\DI\CompilerExtension
 {
 
 	public const TAG_COMMAND_KDYBY = 'kdyby.console.command';
 	public const TAG_COMMAND = 'console.command';
-	const TAG_PRODUCER = 'kdyby.rabbitmq.producer';
-	const TAG_CONSUMER = 'kdyby.rabbitmq.consumer';
-	const TAG_RPC_CLIENT = 'kdyby.rabbitmq.rpc.client';
-	const TAG_RPC_SERVER = 'kdyby.rabbitmq.rpc.server';
+	public const TAG_PRODUCER = 'kdyby.rabbitmq.producer';
+	public const TAG_CONSUMER = 'kdyby.rabbitmq.consumer';
+	public const TAG_RPC_CLIENT = 'kdyby.rabbitmq.rpc.client';
+	public const TAG_RPC_SERVER = 'kdyby.rabbitmq.rpc.server';
 
 	/**
 	 * @var array
@@ -60,7 +55,7 @@ class RabbitMqExtension extends Nette\DI\CompilerExtension
 	 */
 	public $producersDefaults = [
 		'connection' => 'default',
-		'class' => 'Kdyby\RabbitMq\Producer',
+		'class' => \Kdyby\RabbitMq\Producer::class,
 		'exchange' => [],
 		'queue' => [],
 		'contentType' => 'text/plain',
@@ -150,9 +145,10 @@ class RabbitMqExtension extends Nette\DI\CompilerExtension
 	 */
 	private $producersConfig = [];
 
-
-
-	public function loadConfiguration()
+	/**
+	 * @throws \Nette\Utils\AssertionException
+	 */
+	public function loadConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();
 		$config = $this->getConfig($this->defaults);
@@ -161,27 +157,34 @@ public function loadConfiguration()
 			if ($extension instanceof IProducersProvider) {
 				$producers = $extension->getRabbitProducers();
 				Validators::assert($producers, 'array:1..');
-				$config['producers'] = array_merge($config['producers'], $producers);
+				$config['producers'] = \array_merge($config['producers'], $producers);
 			}
 			if ($extension instanceof IConsumersProvider) {
 				$consumers = $extension->getRabbitConsumers();
 				Validators::assert($consumers, 'array:1..');
-				$config['consumers'] = array_merge($config['consumers'], $consumers);
+				$config['consumers'] = \array_merge($config['consumers'], $consumers);
 			}
 			if ($extension instanceof IRpcClientsProvider) {
 				$rpcClients = $extension->getRabbitRpcClients();
 				Validators::assert($rpcClients, 'array:1..');
-				$config['rpcClients'] = array_merge($config['rpcClients'], $rpcClients);
+				$config['rpcClients'] = \array_merge($config['rpcClients'], $rpcClients);
 			}
 			if ($extension instanceof IRpcServersProvider) {
 				$rpcServers = $extension->getRabbitRpcServers();
 				Validators::assert($rpcServers, 'array:1..');
-				$config['rpcServers'] = array_merge($config['rpcServers'], $rpcServers);
+				$config['rpcServers'] = \array_merge($config['rpcServers'], $rpcServers);
 			}
 		}
 
-		if ($unexpected = array_diff(array_keys($config), array_keys($this->defaults))) {
-			throw new Nette\Utils\AssertionException("Unexpected key '" . implode("', '", $unexpected) . "' in configuration of {$this->name}.");
+		$unexpected = \array_diff(\array_keys($config), \array_keys($this->defaults));
+		if ($unexpected) {
+			throw new \Nette\Utils\AssertionException(
+				\sprintf(
+					'Unexpected key \'%s\' in configuration of %s.',
+					\implode("', '", $unexpected),
+					$this->name
+				)
+			);
 		}
 
 		$builder->parameters[$this->name] = $config;
@@ -192,13 +195,13 @@ public function loadConfiguration()
 		$this->loadRpcClients($config['rpcClients']);
 		$this->loadRpcServers($config['rpcServers']);
 
-		foreach ($this->connectionsMeta as $name => $meta) {
+		foreach ($this->connectionsMeta as $meta) {
 			/** @var \Nette\DI\Definitions\ServiceDefinition $connection */
 			$connection = $builder->getDefinition($meta['serviceId']);
 
 			if ($config['debugger']) {
 				$builder->addDefinition($panelService = $meta['serviceId'] . '.panel')
-					->setType('Kdyby\RabbitMq\Diagnostics\Panel')
+					->setType(\Kdyby\RabbitMq\Diagnostics\Panel::class)
 					->addSetup('injectServiceMap', [
 						$meta['consumers'],
 						$meta['rpcServers'],
@@ -221,16 +224,16 @@ public function loadConfiguration()
 		$this->loadConsole();
 	}
 
-
-
-	public function beforeCompile()
+	public function beforeCompile(): void
 	{
 		unset($this->getContainerBuilder()->parameters[$this->name]);
 	}
 
-
-
-	protected function loadConnections($connections)
+	/**
+	 * @param array<mixed> $connections
+	 * @throws \Nette\Utils\AssertionException
+	 */
+	protected function loadConnections(array $connections): void
 	{
 		$this->connectionsMeta = []; // reset
 
@@ -242,17 +245,35 @@ protected function loadConnections($connections)
 		foreach ($connections as $name => $config) {
 			$config = $this->mergeConfig($config, $this->connectionDefaults);
 
-			Nette\Utils\Validators::assertField($config, 'user', 'string:3..', "The config item '%' of connection {$this->name}.{$name}");
-			Nette\Utils\Validators::assertField($config, 'password', 'string:3..', "The config item '%' of connection {$this->name}.{$name}");
+			Nette\Utils\Validators::assertField(
+				$config,
+				'user',
+				'string:3..',
+				\sprintf(
+					'The config item \'%%\' of connection %s.%s',
+					$this->name,
+					$name
+				)
+			);
+			Nette\Utils\Validators::assertField(
+				$config,
+				'password',
+				'string:3..',
+				\sprintf(
+					'The config item \'%%\' of connection %s.%s',
+					$this->name,
+					$name
+				)
+			);
 
 			$connection = $builder->addDefinition($serviceName = $this->prefix($name . '.connection'))
-				->setType('Kdyby\RabbitMq\Connection')
+				->setType(\Kdyby\RabbitMq\Connection::class)
 				->setArguments([
 					$config['host'],
 					$config['port'],
 					$config['user'],
 					$config['password'],
-					$config['vhost']
+					$config['vhost'],
 				]);
 
 			$this->connectionsMeta[$name] = [
@@ -264,15 +285,17 @@ protected function loadConnections($connections)
 			];
 
 			// only the first connection is autowired
-			if (count($this->connectionsMeta) > 1) {
+			if (\count($this->connectionsMeta) > 1) {
 				$connection->setAutowired(FALSE);
 			}
 		}
 	}
 
-
-
-	protected function loadProducers($producers)
+	/**
+	 * @param array<mixed> $producers
+	 * @throws \Nette\Utils\AssertionException
+	 */
+	protected function loadProducers(array $producers): void
 	{
 		$builder = $this->getContainerBuilder();
 
@@ -280,12 +303,19 @@ protected function loadProducers($producers)
 			$config = $this->mergeConfig($config, ['autoSetupFabric' => $builder->parameters[$this->name]['autoSetupFabric']] + $this->producersDefaults);
 
 			if (!isset($this->connectionsMeta[$config['connection']])) {
-				throw new Nette\Utils\AssertionException("Connection {$config['connection']} required in producer {$this->name}.{$name} was not defined.");
+				throw new \Nette\Utils\AssertionException(
+					\sprintf(
+						'Connection %s required in producer %s.%s was not defined.',
+						$config['connection'],
+						$this->name,
+						$name
+					)
+				);
 			}
 
 			$producer = $builder->addDefinition($serviceName = $this->prefix('producer.' . $name))
 				->setFactory($config['class'], ['@' . $this->connectionsMeta[$config['connection']]['serviceId']])
-				->setType('Kdyby\RabbitMq\IProducer')
+				->setType(\Kdyby\RabbitMq\IProducer::class)
 				->addSetup('setContentType', [$config['contentType']])
 				->addSetup('setDeliveryMode', [$config['deliveryMode']])
 				->addSetup('setRoutingKey', [$config['routingKey']])
@@ -293,8 +323,26 @@ protected function loadProducers($producers)
 
 			if (!empty($config['exchange'])) {
 				$config['exchange'] = $this->mergeConfig($config['exchange'], $this->exchangeDefaults);
-				Nette\Utils\Validators::assertField($config['exchange'], 'name', 'string:3..', "The config item 'exchange.%' of producer {$this->name}.{$name}");
-				Nette\Utils\Validators::assertField($config['exchange'], 'type', 'string:3..', "The config item 'exchange.%' of producer {$this->name}.{$name}");
+				Nette\Utils\Validators::assertField(
+					$config['exchange'],
+					'name',
+					'string:3..',
+					\sprintf(
+						'The config item \'exchange.%%\' of producer %s.%s',
+						$this->name,
+						$name
+					)
+				);
+				Nette\Utils\Validators::assertField(
+					$config['exchange'],
+					'type',
+					'string:3..',
+					\sprintf(
+						"The config item 'exchange.%%' of producer %s.%s",
+						$this->name,
+						$name
+					)
+				);
 				$producer->addSetup('setExchangeOptions', [$config['exchange']]);
 			}
 
@@ -310,9 +358,11 @@ protected function loadProducers($producers)
 		}
 	}
 
-
-
-	protected function loadConsumers($consumers)
+	/**
+	 * @param array<mixed> $consumers
+	 * @throws \Nette\Utils\AssertionException
+	 */
+	protected function loadConsumers(array $consumers): void
 	{
 		$builder = $this->getContainerBuilder();
 
@@ -321,7 +371,14 @@ protected function loadConsumers($consumers)
 			$config = $this->extendConsumerFromProducer($name, $config);
 
 			if (!isset($this->connectionsMeta[$config['connection']])) {
-				throw new Nette\Utils\AssertionException("Connection {$config['connection']} required in consumer {$this->name}.{$name} was not defined.");
+				throw new \Nette\Utils\AssertionException(
+					\sprintf(
+						'Connection %s required in consumer %s.%s was not defined.',
+						$config['connection'],
+						$this->name,
+						$name
+					)
+				);
 			}
 
 			$consumer = $builder->addDefinition($serviceName = $this->prefix('consumer.' . $name))
@@ -329,8 +386,22 @@ protected function loadConsumers($consumers)
 				->setAutowired(FALSE);
 
 			if (!empty($config['exchange'])) {
-				Nette\Utils\Validators::assertField($config['exchange'], 'name', 'string:3..', "The config item 'exchange.%' of consumer {$this->name}.{$name}");
-				Nette\Utils\Validators::assertField($config['exchange'], 'type', 'string:3..', "The config item 'exchange.%' of consumer {$this->name}.{$name}");
+				Nette\Utils\Validators::assertField(
+					$config['exchange'],
+					'name',
+					'string:3..',
+					\sprintf(
+						'The config item \'exchange.%%\' of consumer %s.%s',
+						$this->name,
+						$name
+					)
+				);
+				Nette\Utils\Validators::assertField(
+					$config['exchange'],
+					'type',
+					'string:3..',
+					\sprintf('The config item \'exchange.%%\' of consumer %s.%s', $this->name, $name)
+				);
 				$consumer->addSetup('setExchangeOptions', [$this->mergeConfig($config['exchange'], $this->exchangeDefaults)]);
 			}
 
@@ -345,24 +416,24 @@ protected function loadConsumers($consumers)
 				}
 
 				$consumer
-					->setType('Kdyby\RabbitMq\MultipleConsumer')
+					->setType(\Kdyby\RabbitMq\MultipleConsumer::class)
 					->addSetup('setQueues', [$config['queues']]);
 
 			} elseif (empty($config['queues']) && !empty($config['queue'])) {
 				$consumer
-					->setType('Kdyby\RabbitMq\Consumer')
+					->setType(\Kdyby\RabbitMq\Consumer::class)
 					->addSetup('setQueueOptions', [$this->mergeConfig($config['queue'], $this->queueDefaults)])
 					->addSetup('setCallback', [self::fixCallback($config['callback'])]);
 
 			} else {
 				$consumer
-					->setType('Kdyby\RabbitMq\AnonymousConsumer')
+					->setType(\Kdyby\RabbitMq\AnonymousConsumer::class)
 					->addSetup('setCallback', [self::fixCallback($config['callback'])]);
 			}
 
 			$consumer->setArguments(['@' . $this->connectionsMeta[$config['connection']]['serviceId']]);
 
-			if (array_filter($config['qos'])) { // has values
+			if (\array_filter($config['qos'])) { // has values
 				$config['qos'] = $this->mergeConfig($config['qos'], $this->qosDefaults);
 				$consumer->addSetup('setQosOptions', [
 					$config['qos']['prefetchSize'],
@@ -383,14 +454,22 @@ protected function loadConsumers($consumers)
 		}
 	}
 
-
-
-	private function extendConsumerFromProducer(&$consumerName, $config)
+	/**
+	 * @param string $consumerName
+	 * @param array<mixed> $config
+	 * @return array<mixed>
+	 * @throws \Nette\Utils\AssertionException
+	 */
+	private function extendConsumerFromProducer(string &$consumerName, array $config): array
 	{
+		$m = Nette\Utils\Strings::match(
+			$consumerName,
+			'~^(?P<consumerName>[^>\s]+)\s*\<\s*(?P<producerName>[^>\s]+)\z~'
+		);
 		if (isset($config['_extends'])) {
 			$producerName = $config['_extends'];
 
-		} elseif ($m = Nette\Utils\Strings::match($consumerName, '~^(?P<consumerName>[^>\s]+)\s*\<\s*(?P<producerName>[^>\s]+)\z~')) {
+		} elseif ($m) {
 			$consumerName = $m['consumerName'];
 			$producerName = $m['producerName'];
 
@@ -399,7 +478,15 @@ private function extendConsumerFromProducer(&$consumerName, $config)
 		}
 
 		if ( ! isset($this->producersConfig[$producerName])) {
-			throw new Nette\Utils\AssertionException("Consumer {$this->name}.{$consumerName} cannot extend unknown producer {$this->name}.{$producerName}.");
+			throw new \Nette\Utils\AssertionException(
+				\sprintf(
+					'Consumer %s.%s cannot extend unknown producer %s.%s.',
+					$this->name,
+					$consumerName,
+					$this->name,
+					$producerName
+				)
+			);
 		}
 		$producerConfig = $this->producersConfig[$producerName];
 
@@ -414,9 +501,11 @@ private function extendConsumerFromProducer(&$consumerName, $config)
 		return $config;
 	}
 
-
-
-	protected function loadRpcClients($clients)
+	/**
+	 * @param array<mixed> $clients
+	 * @throws \Nette\Utils\AssertionException
+	 */
+	protected function loadRpcClients(array $clients): void
 	{
 		$builder = $this->getContainerBuilder();
 
@@ -424,14 +513,21 @@ protected function loadRpcClients($clients)
 			$config = $this->mergeConfig($config, $this->rpcClientDefaults);
 
 			if (!isset($this->connectionsMeta[$config['connection']])) {
-				throw new Nette\Utils\AssertionException("Connection {$config['connection']} required in rpc client {$this->name}.{$name} was not defined.");
+				throw new \Nette\Utils\AssertionException(
+					\sprintf(
+						'Connection %s required in rpc client %s.%s was not defined.',
+						$config['connection'],
+						$this->name,
+						$name
+					)
+				);
 			}
 
 			$builder->addDefinition($serviceName = $this->prefix('rpcClient.' . $name))
 				->setType(\Kdyby\RabbitMq\RpcClient::class)
 				->setArguments([
 					'@' . $this->connectionsMeta[$config['connection']]['serviceId'],
-                ])
+				])
 				->addSetup('initClient', [$config['expectSerializedResponse']])
 				->addTag(self::TAG_RPC_CLIENT)
 				->setAutowired(FALSE);
@@ -440,9 +536,11 @@ protected function loadRpcClients($clients)
 		}
 	}
 
-
-
-	protected function loadRpcServers($servers)
+	/**
+	 * @param array<mixed> $servers
+	 * @throws \Nette\Utils\AssertionException
+	 */
+	protected function loadRpcServers(array $servers): void
 	{
 		$builder = $this->getContainerBuilder();
 
@@ -450,7 +548,14 @@ protected function loadRpcServers($servers)
 			$config = $this->mergeConfig($config, $this->rpcServerDefaults);
 
 			if (!isset($this->connectionsMeta[$config['connection']])) {
-				throw new Nette\Utils\AssertionException("Connection {$config['connection']} required in rpc server {$this->name}.{$name} was not defined.");
+				throw new \Nette\Utils\AssertionException(
+					\sprintf(
+						'Connection %s required in rpc server %s.%s was not defined.',
+						$config['connection'],
+						$this->name,
+						$name
+					)
+				);
 			}
 
 			$rpcServer = $builder->addDefinition($serviceName = $this->prefix('rpcServer.' . $name))
@@ -461,7 +566,7 @@ protected function loadRpcServers($servers)
 				->addTag(self::TAG_RPC_SERVER)
 				->setAutowired(FALSE);
 
-			if (array_filter($config['qos'])) { // has values
+			if (\array_filter($config['qos'])) { // has values
 				$config['qos'] = $this->mergeConfig($config['qos'], $this->qosDefaults);
 				$rpcServer->addSetup('setQosOptions', [
 					$config['qos']['prefetchSize'],
@@ -474,11 +579,9 @@ protected function loadRpcServers($servers)
 		}
 	}
 
-
-
-	private function loadConsole()
+	private function loadConsole(): void
 	{
-		if (!class_exists('Kdyby\Console\DI\ConsoleExtension') || PHP_SAPI !== 'cli') {
+		if (!\class_exists(\Symfony\Component\Console\Command\Command::class) || PHP_SAPI !== 'cli') {
 			return;
 		}
 
@@ -493,13 +596,16 @@ private function loadConsole()
 		] as $i => $class) {
 			$builder->addDefinition($this->prefix('console.' . $i))
 				->setType($class)
-				->addTag(\Kdyby\RabbitMq\DI\RabbitMqExtension::TAG_COMMAND_KDYBY)
-				->addTag(\Kdyby\RabbitMq\DI\RabbitMqExtension::TAG_COMMAND);
+				->addTag(self::TAG_COMMAND_KDYBY)
+				->addTag(self::TAG_COMMAND);
 		}
 	}
 
-
-
+	/**
+	 * @param array<mixed>|string $config
+	 * @param array<mixed>|string $defaults
+	 * @return array<mixed>|string
+	 */
 	protected function mergeConfig($config, $defaults)
 	{
 		return Config\Helpers::merge(
@@ -508,29 +614,29 @@ protected function mergeConfig($config, $defaults)
 		);
 	}
 
-
-
+	/**
+	 * @param string|mixed $callback
+	 * @return string|mixed
+	 */
 	protected static function fixCallback($callback)
 	{
-		list($callback) = self::filterArgs($callback);
-		if ($callback instanceof Nette\DI\Statement && substr_count($callback->entity, '::') && empty($callback->arguments)) {
-			$callback = explode('::', $callback->entity, 2);
+		[$callback] = self::filterArgs($callback);
+		if ($callback instanceof Nette\DI\Statement && \substr_count($callback->entity, '::') && empty($callback->arguments)) {
+			$callback = \explode('::', $callback->entity, 2);
 		}
 
 		return $callback;
 	}
 
-
-
 	/**
-	 * @param string|\stdClass $statement
-	 * @return Nette\DI\Statement[]
+	 * @param string|mixed $statement
+	 * @return \Nette\DI\Statement[]
 	 */
-	protected static function filterArgs($statement)
+	protected static function filterArgs($statement): array
 	{
 		return Nette\DI\Helpers::filterArguments([
-			\is_string($statement) ? new Nette\DI\Statement($statement) : $statement
-        ]);
+			\is_string($statement) ? new Nette\DI\Statement($statement) : $statement,
+		]);
 	}
 
 }
diff --git a/src/Kdyby/RabbitMq/Diagnostics/Panel.php b/src/Kdyby/RabbitMq/Diagnostics/Panel.php
index 9f0fe773..8584a28c 100644
--- a/src/Kdyby/RabbitMq/Diagnostics/Panel.php
+++ b/src/Kdyby/RabbitMq/Diagnostics/Panel.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This file is part of the Kdyby (http://www.kdyby.org)
  *
@@ -11,24 +13,18 @@
 namespace Kdyby\RabbitMq\Diagnostics;
 
 use Kdyby\RabbitMq\Connection;
-use Nette;
 use Nette\Utils\Html;
 use Tracy\Debugger;
-use Tracy\IBarPanel;
-
-
 
 /**
- * @author Filip Procházka <filip@prochazka.su>
- *
  * @property callable $begin
  * @property callable $failure
  * @property callable $success
  */
-class Panel implements IBarPanel
+class Panel implements \Tracy\IBarPanel
 {
-	use Nette\SmartObject;
 
+	use \Nette\SmartObject;
 
 	/**
 	 * @var array
@@ -40,9 +36,11 @@ class Panel implements IBarPanel
 	 */
 	private $serviceMap = [];
 
-
-
-	public function injectServiceMap(array $consumers, array $rpcServers)
+	/**
+	 * @param array<mixed> $consumers
+	 * @param array<mixed> $rpcServers
+	 */
+	public function injectServiceMap(array $consumers, array $rpcServers): void
 	{
 		$this->serviceMap = [
 			'consumer' => $consumers,
@@ -50,49 +48,40 @@ public function injectServiceMap(array $consumers, array $rpcServers)
 		];
 	}
 
-
-
-	/**
-	 * @return string
-	 */
-	public function getTab()
+	public function getTab(): string
 	{
-		$img = Html::el('')->addHtml(file_get_contents(__DIR__ . '/rabbitmq-logo.svg'));
+		$img = Html::el('')->addHtml(\file_get_contents(__DIR__ . '/rabbitmq-logo.svg'));
 		$tab = Html::el('span')->setAttribute('title', 'RabbitMq')->addHtml($img);
 		$title = Html::el('span')->setAttribute('class', 'tracy-label');
 
 		if ($this->messages) {
-			$title->setText(count($this->messages) . ' message' . (count($this->messages) > 1 ? 's' : ''));
+			$title->setText(\count($this->messages) . ' message' . (\count($this->messages) > 1 ? 's' : ''));
 		}
 
 		return (string) $tab->addHtml($title);
 	}
 
-
-
-	/**
-	 * @return string
-	 */
-	public function getPanel()
+	public function getPanel(): string
 	{
-		$isRunning = function ($type, $name) {
-			if (strncasecmp(PHP_OS, 'WIN', 3) == 0) {
+		$isRunning = static function ($type, $name) {
+			if (\strncasecmp(PHP_OS, 'WIN', 3) === 0) {
 				return FALSE; // sry, I don't know how to do this
 			}
 
-			$command = sprintf('ps aux |grep %s |grep %s',
+			$command = \sprintf(
+				'ps aux |grep %s |grep %s',
 				($type === 'consumer' ? 'rabbitmq:consumer' : 'rabbitmq:rpc-server'),
-				escapeshellarg($name)
+				\escapeshellarg($name)
 			);
 
-			if (!@exec($command, $output)) {
+			if (!@\exec($command, $output)) {
 				return FALSE;
 			}
 
 			$instances = 0;
 			foreach ($output as $line) {
-				if (stripos($line, '|grep') === FALSE) {
-					$instances += 1;
+				if (\stripos($line, '|grep') === FALSE) {
+					$instances++;
 				}
 			}
 
@@ -102,43 +91,37 @@ public function getPanel()
 		$workers = [];
 		$runningWorkers = $configuredWorkers = 0;
 		foreach ($this->serviceMap as $type => $services) {
-			foreach ($services as $name => $serviceId) {
+			foreach (\array_keys($services) as $name) {
 				$workers[$key = $type . '/' . $name] = $isRunning($type, $name);
+				// phpcs:disable SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
 				$runningWorkers += (int) $workers[$key];
+				// phpcs:disable SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
 				$configuredWorkers++;
 			}
 		}
 
-		ob_start();
-		$esc = class_exists('Nette\Templating\Helpers')
+		\ob_start();
+		// phpcs:disable SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
+		$esc = \class_exists('Nette\Templating\Helpers')
 			? ['Nette\Templating\Helpers', 'escapeHtml']
 			: ['Latte\Runtime\Filters', 'escapeHtml'];
-		$click = class_exists('\Tracy\Dumper')
-			? function ($o, $c = FALSE) { return \Tracy\Dumper::toHtml($o, ['collapse' => $c]); }
+		// phpcs:disable SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
+		$click = \class_exists('\Tracy\Dumper')
+			? static function ($o, $c = FALSE) {
+				return \Tracy\Dumper::toHtml($o, ['collapse' => $c]);
+			}
 			: ['Tracy\Helpers', 'clickableDump'];
 
 		require __DIR__ . '/panel.phtml';
-		return ob_get_clean();
+		return \ob_get_clean();
 	}
 
-
-
-	/**
-	 * @param string $message
-	 * @return object
-	 */
-	public function published($message)
+	public function published(string $message): void
 	{
 		$this->messages[] = $message;
 	}
 
-
-
-	/**
-	 * @param Connection $connection
-	 * @return Panel
-	 */
-	public function register(Connection $connection)
+	public function register(Connection $connection): Panel
 	{
 		Debugger::getBar()->addPanel($this);
 		return $this;
diff --git a/src/Kdyby/RabbitMq/Exception/Exception.php b/src/Kdyby/RabbitMq/Exception/Exception.php
index 8835b557..a2a9c01a 100644
--- a/src/Kdyby/RabbitMq/Exception/Exception.php
+++ b/src/Kdyby/RabbitMq/Exception/Exception.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace Kdyby\RabbitMq\Exception;
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq\Exception;
 
 /**
  * Common interface for caching github exceptions
- *
- * @author Filip Procházka <filip@prochazka.com>
  */
 interface Exception
 {
diff --git a/src/Kdyby/RabbitMq/Exception/InvalidArgumentException.php b/src/Kdyby/RabbitMq/Exception/InvalidArgumentException.php
index ed25f6aa..f3bb361a 100644
--- a/src/Kdyby/RabbitMq/Exception/InvalidArgumentException.php
+++ b/src/Kdyby/RabbitMq/Exception/InvalidArgumentException.php
@@ -1,11 +1,9 @@
-<?php declare(strict_types = 1);
+<?php
 
-namespace Kdyby\RabbitMq\Exception;
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq\Exception;
 
-/**
- * @author Filip Procházka <filip@prochazka.com>
- */
 class InvalidArgumentException extends \InvalidArgumentException implements \Kdyby\RabbitMq\Exception\Exception
 {
 
diff --git a/src/Kdyby/RabbitMq/Exception/QueueNotFoundException.php b/src/Kdyby/RabbitMq/Exception/QueueNotFoundException.php
index 8ed280c6..30d60e6a 100644
--- a/src/Kdyby/RabbitMq/Exception/QueueNotFoundException.php
+++ b/src/Kdyby/RabbitMq/Exception/QueueNotFoundException.php
@@ -1,12 +1,10 @@
-<?php declare(strict_types = 1);
+<?php
 
-namespace Kdyby\RabbitMq\Exception;
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq\Exception;
 
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- */
 class QueueNotFoundException extends \RuntimeException implements \Kdyby\RabbitMq\Exception\Exception
 {
 
-}
\ No newline at end of file
+}
diff --git a/src/Kdyby/RabbitMq/Exception/TerminateException.php b/src/Kdyby/RabbitMq/Exception/TerminateException.php
index 89773a60..a4362641 100644
--- a/src/Kdyby/RabbitMq/Exception/TerminateException.php
+++ b/src/Kdyby/RabbitMq/Exception/TerminateException.php
@@ -1,19 +1,18 @@
-<?php declare(strict_types = 1);
+<?php
 
-namespace Kdyby\RabbitMq\Exception;
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq\Exception;
 
 class TerminateException extends \RuntimeException implements \Kdyby\RabbitMq\Exception\Exception
 {
 
-	private $response = \Kdyby\RabbitMq\IConsumer::MSG_REJECT_REQUEUE;
-
-
 	/**
-	 * @param int $response
-	 * @return TerminateException
+	 * @var int
 	 */
-	public static function withResponse($response)
+	private $response = \Kdyby\RabbitMq\IConsumer::MSG_REJECT_REQUEUE;
+
+	public static function withResponse(int $response): \Kdyby\RabbitMq\Exception\TerminateException
 	{
 		$e = new self();
 		$e->response = $response;
@@ -21,13 +20,9 @@ public static function withResponse($response)
 		return $e;
 	}
 
-
-	/**
-	 * @return int
-	 */
-	public function getResponse()
+	public function getResponse(): int
 	{
 		return $this->response;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/Kdyby/RabbitMq/IConnection.php b/src/Kdyby/RabbitMq/IConnection.php
index 5e8f4fe6..3ef3ee2e 100644
--- a/src/Kdyby/RabbitMq/IConnection.php
+++ b/src/Kdyby/RabbitMq/IConnection.php
@@ -1,46 +1,18 @@
 <?php
 
-namespace Kdyby\RabbitMq;
-
-use Kdyby;
-use Nette;
-
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq;
 
-/**
- * @author Filip Procházka <filip@prochazka.su>
- */
 interface IConnection
 {
 
-	/**
-	 * @param string $name
-	 * @return BaseConsumer
-	 */
-	function getConsumer($name);
-
-
-
-	/**
-	 * @param $name
-	 * @return Producer
-	 */
-	function getProducer($name);
-
-
-
-	/**
-	 * @param $name
-	 * @return RpcClient
-	 */
-	function getRpcClient($name);
+	public function getConsumer(string $name): \Kdyby\RabbitMq\Consumer;
 
+	public function getProducer(string $name): \Kdyby\RabbitMq\Producer;
 
+	public function getRpcClient(string $name): \Kdyby\RabbitMq\RpcClient;
 
-	/**
-	 * @param $name
-	 * @return RpcServer
-	 */
-	function getRpcServer($name);
+	public function getRpcServer(string $name): \Kdyby\RabbitMq\RpcServer;
 
 }
diff --git a/src/Kdyby/RabbitMq/IConsumer.php b/src/Kdyby/RabbitMq/IConsumer.php
index 5efd7198..4d2cf284 100644
--- a/src/Kdyby/RabbitMq/IConsumer.php
+++ b/src/Kdyby/RabbitMq/IConsumer.php
@@ -1,14 +1,11 @@
 <?php
 
-namespace Kdyby\RabbitMq;
-
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq;
 
 /**
  * Marker interface for consumers. It's constants can be used for responding on messages.
- *
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
  */
 interface IConsumer
 {
@@ -16,21 +13,21 @@ interface IConsumer
 	/**
 	 * Flag for message ack
 	 */
-	const MSG_ACK = 1;
+	public const MSG_ACK = 1;
 
 	/**
 	 * Flag single for message nack and requeue
 	 */
-	const MSG_SINGLE_NACK_REQUEUE = 2;
+	public const MSG_SINGLE_NACK_REQUEUE = 2;
 
 	/**
 	 * Flag for reject and requeue
 	 */
-	const MSG_REJECT_REQUEUE = 0;
+	public const MSG_REJECT_REQUEUE = 0;
 
 	/**
 	 * Flag for reject and drop
 	 */
-	const MSG_REJECT = -1;
+	public const MSG_REJECT = -1;
 
 }
diff --git a/src/Kdyby/RabbitMq/IProducer.php b/src/Kdyby/RabbitMq/IProducer.php
index 42036424..d1e67e50 100644
--- a/src/Kdyby/RabbitMq/IProducer.php
+++ b/src/Kdyby/RabbitMq/IProducer.php
@@ -1,28 +1,33 @@
 <?php
 
-namespace Kdyby\RabbitMq;
-
-use Kdyby;
-use Nette;
-
+declare(strict_types = 1);
 
+namespace Kdyby\RabbitMq;
 
-/**
- * @author Filip Procházka <filip@prochazka.su>
- */
 interface IProducer
 {
 
-	function setExchangeOptions(array $options = []);
+	/**
+	 * @param array<mixed> $options
+	 */
+	public function setExchangeOptions(array $options = []): void;
 
-	function setQueueOptions(array $options = []);
+	/**
+	 * @param array<mixed> $options
+	 */
+	public function setQueueOptions(array $options = []): void;
 
-	function setRoutingKey($routingKey);
+	public function setRoutingKey(string $routingKey): void;
 
-	function setContentType($contentType);
+	public function setContentType(string $contentType): IProducer;
 
-	function setDeliveryMode($deliveryMode);
+	public function setDeliveryMode(int $deliveryMode): IProducer;
 
-	function publish($msgBody, $routingKey = '', $additionalProperties = []);
+	/**
+	 * @param string $msgBody
+	 * @param string|NULL $routingKey
+	 * @param array<mixed> $additionalProperties
+	 */
+	public function publish(string $msgBody, ?string $routingKey = '', array $additionalProperties = []): void;
 
 }
diff --git a/src/Kdyby/RabbitMq/MultipleConsumer.php b/src/Kdyby/RabbitMq/MultipleConsumer.php
index ec839f09..c81cdfba 100644
--- a/src/Kdyby/RabbitMq/MultipleConsumer.php
+++ b/src/Kdyby/RabbitMq/MultipleConsumer.php
@@ -1,47 +1,36 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq;
 
-use Kdyby\RabbitMq\Exception\InvalidArgumentException;
-use Kdyby\RabbitMq\Exception\QueueNotFoundException;
-use Kdyby\RabbitMq\Exception\TerminateException;
 use Nette\Utils\Callback;
 use PhpAmqpLib\Message\AMQPMessage;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class MultipleConsumer extends Consumer
+class MultipleConsumer extends \Kdyby\RabbitMq\Consumer
 {
 
-	/**
-	 * @var array
-	 */
-	public $onConsume = [];
-
 	/**
 	 * @var array[]|callable[][]
 	 */
 	protected $queues = [];
 
-
-
-	public function getQueueConsumerTag($queue)
+	public function getQueueConsumerTag(string $queue): string
 	{
-		return sprintf('%s-%s', $this->getConsumerTag(), $queue);
+		return \sprintf('%s-%s', $this->getConsumerTag(), $queue);
 	}
 
-
-
-	public function setQueues(array $queues)
+	/**
+	 * @param array<string, callable> $queues
+	 */
+	public function setQueues(array $queues): void
 	{
 		$this->queues = [];
 		foreach ($queues as $name => $queue) {
 			if (!isset($queue['callback'])) {
-				throw new InvalidArgumentException("The queue '$name' is missing a callback.");
+				throw new \Kdyby\RabbitMq\Exception\InvalidArgumentException(
+					\sprintf("The queue '%s' is missing a callback.", $name)
+				);
 			}
 
 			Callback::check($queue['callback']);
@@ -49,19 +38,15 @@ public function setQueues(array $queues)
 		}
 	}
 
-
-
 	/**
-	 * @return \array[]|\callable[][]
+	 * @return array<mixed>
 	 */
-	public function getQueues()
+	public function getQueues(): array
 	{
 		return $this->queues;
 	}
 
-
-
-	protected function setupConsumer()
+	protected function setupConsumer(): void
 	{
 		if ($this->autoSetupFabric) {
 			$this->setupFabric();
@@ -71,45 +56,42 @@ protected function setupConsumer()
 			$this->qosDeclare();
 		}
 
-		foreach ($this->queues as $name => $options) {
+		foreach (\array_keys($this->queues) as $name) {
 			$self = $this;
-			$this->getChannel()->basic_consume($name, $this->getQueueConsumerTag($name), false, false, false, false, function (AMQPMessage $msg) use ($self, $name) {
+			$this->getChannel()->basic_consume($name, $this->getQueueConsumerTag($name), FALSE, FALSE, FALSE, FALSE, static function (AMQPMessage $msg) use ($self, $name): void {
 				$self->processQueueMessage($name, $msg);
 			});
 		}
 	}
 
-
-
-	protected function queueDeclare()
+	protected function queueDeclare(): void
 	{
 		foreach ($this->queues as $name => $options) {
 			$this->doQueueDeclare($name, $options);
 		}
 
-		$this->queueDeclared = true;
+		$this->queueDeclared = TRUE;
 	}
 
-
-
-	public function processQueueMessage($queueName, AMQPMessage $msg)
+	public function processQueueMessage(string $queueName, AMQPMessage $msg): void
 	{
 		if (!isset($this->queues[$queueName])) {
-			throw new QueueNotFoundException();
+			throw new \Kdyby\RabbitMq\Exception\QueueNotFoundException();
 		}
 
 		$this->onConsume($this, $msg);
 		try {
-			$processFlag = call_user_func($this->queues[$queueName]['callback'], $msg);
+			$processFlag = \call_user_func($this->queues[$queueName]['callback'], $msg);
 			$this->handleProcessMessage($msg, $processFlag);
 
-		} catch (TerminateException $e) {
+		} catch (\Kdyby\RabbitMq\Exception\TerminateException $e) {
 			$this->handleProcessMessage($msg, $e->getResponse());
 			throw $e;
 
-		} catch (\Exception $e) {
+		} catch (\Throwable $e) {
 			$this->onReject($this, $msg, IConsumer::MSG_REJECT_REQUEUE);
 			throw $e;
 		}
 	}
+
 }
diff --git a/src/Kdyby/RabbitMq/Producer.php b/src/Kdyby/RabbitMq/Producer.php
index ed7ee654..5c9b4aa3 100644
--- a/src/Kdyby/RabbitMq/Producer.php
+++ b/src/Kdyby/RabbitMq/Producer.php
@@ -1,16 +1,12 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq;
 
 use PhpAmqpLib\Message\AMQPMessage;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class Producer extends AmqpMember implements IProducer
+class Producer extends \Kdyby\RabbitMq\AmqpMember implements \Kdyby\RabbitMq\IProducer
 {
 
 	/**
@@ -19,45 +15,43 @@ class Producer extends AmqpMember implements IProducer
 	protected $contentType = 'text/plain';
 
 	/**
-	 * @var string
+	 * @var int
 	 */
 	protected $deliveryMode = 2;
 
-
-
-	public function setContentType($contentType)
+	public function setContentType(string $contentType): IProducer
 	{
 		$this->contentType = $contentType;
 
 		return $this;
 	}
 
-
-
-	public function setDeliveryMode($deliveryMode)
+	public function setDeliveryMode(int $deliveryMode): IProducer
 	{
 		$this->deliveryMode = $deliveryMode;
 
 		return $this;
 	}
 
-
-
-	protected function getBasicProperties()
+	/**
+	 * @return array<string, int>
+	 */
+	protected function getBasicProperties(): array
 	{
-		return ['content_type' => $this->contentType, 'delivery_mode' => $this->deliveryMode];
+		return [
+			'content_type'  => $this->contentType,
+			'delivery_mode' => $this->deliveryMode,
+		];
 	}
 
-
-
 	/**
 	 * Publishes the message and merges additional properties with basic properties
 	 *
 	 * @param string $msgBody
-	 * @param string $routingKey If not provided or set to null, used default routingKey from configuration of this producer
-	 * @param array $additionalProperties
+	 * @param string|NULL $routingKey If not provided or set to null, used default routingKey from configuration of this producer
+	 * @param array<mixed> $additionalProperties
 	 */
-	public function publish($msgBody, $routingKey = '', $additionalProperties = [])
+	public function publish(string $msgBody, ?string $routingKey = '', array $additionalProperties = []): void
 	{
 		if ($this->autoSetupFabric) {
 			$this->setupFabric();
@@ -67,7 +61,8 @@ public function publish($msgBody, $routingKey = '', $additionalProperties = [])
 			$routingKey = $this->routingKey;
 		}
 
-		$msg = new AMQPMessage((string) $msgBody, array_merge($this->getBasicProperties(), $additionalProperties));
+		$msg = new AMQPMessage($msgBody, \array_merge($this->getBasicProperties(), $additionalProperties));
 		$this->getChannel()->basic_publish($msg, $this->exchangeOptions['name'], (string) $routingKey);
 	}
+
 }
diff --git a/src/Kdyby/RabbitMq/RpcClient.php b/src/Kdyby/RabbitMq/RpcClient.php
index 88ff5edb..63c55b54 100644
--- a/src/Kdyby/RabbitMq/RpcClient.php
+++ b/src/Kdyby/RabbitMq/RpcClient.php
@@ -1,16 +1,12 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq;
 
 use PhpAmqpLib\Message\AMQPMessage;
 
-
-
-/**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- */
-class RpcClient extends AmqpMember
+class RpcClient extends \Kdyby\RabbitMq\AmqpMember
 {
 
 	/**
@@ -38,24 +34,27 @@ class RpcClient extends AmqpMember
 	 */
 	protected $timeout = 0;
 
-
-
-	public function initClient($expectSerializedResponse = true)
+	public function initClient(bool $expectSerializedResponse = TRUE): void
 	{
-		list($this->queueName,,) = $this->getChannel()->queue_declare(
-			"",
-			$passive = false,
-			$durable = false,
-			$exclusive = true,
-			$autoDelete = true
+		[$this->queueName] = $this->getChannel()->queue_declare(
+			'',
+			$passive = FALSE,
+			$durable = FALSE,
+			$exclusive = TRUE,
+			$autoDelete = TRUE
 		);
 
 		$this->expectSerializedResponse = $expectSerializedResponse;
 	}
 
-
-
-	public function addRequest($msgBody, $server, $requestId = null, $routingKey = '', $expiration = 0)
+	/**
+	 * @param string $msgBody
+	 * @param string $server
+	 * @param mixed $requestId
+	 * @param string $routingKey
+	 * @param int $expiration
+	 */
+	public function addRequest(string $msgBody, string $server, $requestId = NULL, string $routingKey = '', int $expiration = 0): void
 	{
 		if (empty($requestId)) {
 			throw new \InvalidArgumentException('You must provide a $requestId');
@@ -66,7 +65,7 @@ public function addRequest($msgBody, $server, $requestId = null, $routingKey = '
 			'reply_to' => $this->queueName,
 			'delivery_mode' => 1, // non durable
 			'expiration' => $expiration * 1000,
-			'correlation_id' => $requestId
+			'correlation_id' => $requestId,
 		]);
 
 		$this->getChannel()->basic_publish($msg, $server, $routingKey);
@@ -78,15 +77,16 @@ public function addRequest($msgBody, $server, $requestId = null, $routingKey = '
 		}
 	}
 
-
-
-	public function getReplies()
+	/**
+	 * @return array<mixed>
+	 */
+	public function getReplies(): array
 	{
 		$this->replies = [];
-		$this->getChannel()->basic_consume($this->queueName, '', false, true, false, false, [$this, 'processMessage']);
+		$this->getChannel()->basic_consume($this->queueName, '', FALSE, TRUE, FALSE, FALSE, [$this, 'processMessage']);
 
-		while (count($this->replies) < $this->requests) {
-			$this->getChannel()->wait(null, false, $this->timeout);
+		while (\count($this->replies) < $this->requests) {
+			$this->getChannel()->wait(NULL, FALSE, $this->timeout);
 		}
 
 		$this->getChannel()->basic_cancel($this->queueName);
@@ -96,13 +96,11 @@ public function getReplies()
 		return $this->replies;
 	}
 
-
-
-	public function processMessage(AMQPMessage $msg)
+	public function processMessage(AMQPMessage $msg): void
 	{
 		$messageBody = $msg->body;
 		if ($this->expectSerializedResponse) {
-			$messageBody = unserialize($messageBody);
+			$messageBody = \unserialize($messageBody);
 		}
 
 		$this->replies[$msg->get('correlation_id')] = $messageBody;
diff --git a/src/Kdyby/RabbitMq/RpcServer.php b/src/Kdyby/RabbitMq/RpcServer.php
index 91f2ba34..13be11a8 100644
--- a/src/Kdyby/RabbitMq/RpcServer.php
+++ b/src/Kdyby/RabbitMq/RpcServer.php
@@ -1,24 +1,19 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Kdyby\RabbitMq;
 
 use PhpAmqpLib\Exception\AMQPExceptionInterface;
-use PhpAmqpLib\Exception\AMQPRuntimeException;
-use PhpAmqpLib\Exception\AMQPTimeoutException;
 use PhpAmqpLib\Message\AMQPMessage;
 
-
-
 /**
- * @author Alvaro Videla <videlalvaro@gmail.com>
- * @author Filip Procházka <filip@prochazka.su>
- *
- * @method onStart(RpcServer $self)
- * @method onConsume(RpcServer $self, AMQPMessage $msg)
- * @method onReply(RpcServer $self, $result)
- * @method onError(RpcServer $self, AMQPExceptionInterface $e)
+ * @method onStart(\Kdyby\RabbitMq\RpcServer $self)
+ * @method onConsume(\Kdyby\RabbitMq\RpcServer $self, \PhpAmqpLib\Message\AMQPMessage $msg)
+ * @method onReply(\Kdyby\RabbitMq\RpcServer $self, $result)
+ * @method onError(\Kdyby\RabbitMq\RpcServer $self, \PhpAmqpLib\Exception\AMQPExceptionInterface $e)
  */
-class RpcServer extends BaseConsumer
+class RpcServer extends \Kdyby\RabbitMq\BaseConsumer
 {
 
 	/**
@@ -46,34 +41,30 @@ class RpcServer extends BaseConsumer
 	 */
 	public $onError = [];
 
-
-
-	public function initServer($name)
+	public function initServer(string $name): void
 	{
 		$this->setExchangeOptions(['name' => $name, 'type' => 'direct']);
 		$this->setQueueOptions(['name' => $name . '-queue']);
 	}
 
-
-
-	public function start($msgAmount = 0)
+	public function start(int $msgAmount = 0): void
 	{
 		$this->target = $msgAmount;
 		$this->setupConsumer();
 		$this->onStart($this);
 
 		try {
-			while (count($this->getChannel()->callbacks)) {
+			while (\count($this->getChannel()->callbacks)) {
 				$this->maybeStopConsumer();
 
 				try {
 					$this->getChannel()->wait(NULL, FALSE, $this->getIdleTimeout());
-				} catch (AMQPTimeoutException $e) {
+				} catch (\PhpAmqpLib\Exception\AMQPTimeoutException $e) {
 					// nothing bad happened, right?
 				}
 			}
 
-		} catch (AMQPRuntimeException $e) {
+		} catch (\PhpAmqpLib\Exception\AMQPRuntimeException $e) {
 			// sending kill signal to the consumer causes the stream_select to return false
 			// the reader doesn't like the false value, so it throws AMQPRuntimeException
 			$this->maybeStopConsumer();
@@ -88,34 +79,35 @@ public function start($msgAmount = 0)
 		}
 	}
 
-
-
-	public function processMessage(AMQPMessage $msg)
+	public function processMessage(AMQPMessage $msg): void
 	{
 		try {
 			$msg->delivery_info['channel']->basic_ack($msg->delivery_info['delivery_tag']);
 			$this->onConsume($this, $msg);
 
-			$result = call_user_func($this->callback, $msg);
+			$result = \call_user_func($this->callback, $msg);
 			$this->onReply($this, $result);
-			$this->sendReply(serialize($result), $msg->get('reply_to'), $msg->get('correlation_id'));
+			$this->sendReply(\serialize($result), $msg->get('reply_to'), $msg->get('correlation_id'));
 
 			$this->consumed++;
 			$this->maybeStopConsumer();
 
-		} catch (\Exception $e) {
+		} catch (\Throwable $e) {
 			$this->sendReply('error: ' . $e->getMessage(), $msg->get('reply_to'), $msg->get('correlation_id'));
 		}
 	}
 
-
-
-	protected function sendReply($result, $client, $correlationId)
+	/**
+	 * @param string $result
+	 * @param string $client
+	 * @param mixed $correlationId
+	 */
+	protected function sendReply(string $result, string $client, $correlationId): void
 	{
 		$this->getChannel()->basic_publish(
 			new AMQPMessage($result, [
 				'content_type' => 'text/plain',
-				'correlation_id' => $correlationId
+				'correlation_id' => $correlationId,
 			]),
 			$exchange = '',
 			$client
diff --git a/tests/KdybyTests/RabbitMq/BaseAmqpTest.php b/tests/KdybyTests/RabbitMq/BaseAmqpTest.phpt
similarity index 59%
rename from tests/KdybyTests/RabbitMq/BaseAmqpTest.php
rename to tests/KdybyTests/RabbitMq/BaseAmqpTest.phpt
index c962db03..946b56e7 100644
--- a/tests/KdybyTests/RabbitMq/BaseAmqpTest.php
+++ b/tests/KdybyTests/RabbitMq/BaseAmqpTest.phpt
@@ -1,35 +1,33 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * Test: Kdyby\RabbitMq\Extension.
  *
  * @testCase KdybyTests\RabbitMq\BaseAmqpTest
- * @package Kdyby\RabbitMq
  */
 
 namespace KdybyTests\RabbitMq;
 
-use Kdyby;
 use Kdyby\RabbitMq\Connection;
 use Kdyby\RabbitMq\Consumer;
-use KdybyTests;
 use Tester\Assert;
 
-
 require_once __DIR__ . '/../bootstrap.php';
 
 
-class BaseAmqpTest extends TestCase
+class BaseAmqpTest extends \KdybyTests\RabbitMq\TestCase
 {
 
-	public function testLazyConnection()
+	public function testLazyConnection(): void
 	{
 		$lazyConnection = new Connection('localhost', 123, 'lazy_user', 'lazy_password');
 		$consumer = new Consumer($lazyConnection);
 
-		Assert::exception(function () use ($consumer) {
+		Assert::exception(static function () use ($consumer): void {
 			$consumer->getChannel();
-		}, \PhpAmqpLib\Exception\AMQPRuntimeException::class, 'Error Connecting to server(111): Connection refused');
+		}, \ErrorException::class, 'stream_socket_client(): unable to connect to tcp://localhost:123 (Connection refused)');
 	}
 
 }
diff --git a/tests/KdybyTests/RabbitMq/ConsumerTest.phpt b/tests/KdybyTests/RabbitMq/ConsumerTest.phpt
index d75ba203..32b0a601 100644
--- a/tests/KdybyTests/RabbitMq/ConsumerTest.phpt
+++ b/tests/KdybyTests/RabbitMq/ConsumerTest.phpt
@@ -1,80 +1,98 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * Test: Kdyby\RabbitMq\Extension.
  *
  * @testCase KdybyTests\RabbitMq\ExtensionTest
- * @package Kdyby\RabbitMq
  */
 
 namespace KdybyTests\RabbitMq;
 
-use Kdyby;
 use Kdyby\RabbitMq\Consumer;
 use Kdyby\RabbitMq\IConsumer;
-use KdybyTests;
-use Mockery\Mock;
-use Nette;
 use PhpAmqpLib\Message\AMQPMessage;
-use Tester;
 use Tester\Assert;
 
-
 require_once __DIR__ . '/../bootstrap.php';
 
-class ConsumerTest extends TestCase
+class ConsumerTest extends \KdybyTests\RabbitMq\TestCase
 {
+
 	/**
 	 * Check if the message is requeued or not correctly.
 	 *
 	 * @dataProvider processMessageProvider
+	 * @param mixed $processFlag
+	 * @param string $expectedMethod
+	 * @param bool|null $expectedRequeue
 	 */
-	public function testProcessMessage($processFlag, $expectedMethod, $expectedRequeue = null)
+	public function testProcessMessage($processFlag, string $expectedMethod, ?bool $expectedRequeue = NULL): void
 	{
-		/** @var Kdyby\RabbitMq\Connection|Mock $amqpConnection */
-		$amqpConnection = $this->getMockery('Kdyby\RabbitMq\Connection', ['127.0.0.1', 5672, 'guest', 'guest'])
-			->makePartial();
-
-		/** @var Kdyby\RabbitMq\Channel|Mock $amqpChannel */
-		$amqpChannel = $this->getMockery('Kdyby\RabbitMq\Channel', [$amqpConnection])
-			->makePartial();
-
-		$consumer = new Consumer($amqpConnection);
-		$consumer->setChannel($amqpChannel);
-
-		$callbackFunction = function() use ($processFlag) { return $processFlag; }; // Create a callback function with a return value set by the data provider.
-		$consumer->setCallback($callbackFunction);
-
-		// Create a default message
-		$amqpMessage = new AMQPMessage('foo body');
-		$amqpMessage->delivery_info['channel'] = $amqpChannel;
-		$amqpMessage->delivery_info['delivery_tag'] = 0;
-
-		$amqpChannel->shouldReceive('basic_reject')
-			->andReturnUsing(function($delivery_tag, $requeue) use ($expectedMethod, $expectedRequeue) {
-				Assert::same($expectedMethod, 'basic_reject'); // Check if this function should be called.
-				Assert::same($requeue, $expectedRequeue); // Check if the message should be requeued.
-			});
-
-		$amqpChannel->shouldReceive('basic_ack')
-			->andReturnUsing(function($delivery_tag) use ($expectedMethod) {
-				Assert::same($expectedMethod, 'basic_ack'); // Check if this function should be called.
-			});
-
-		$consumer->processMessage($amqpMessage);
+		Assert::noError(function () use ($processFlag, $expectedMethod, $expectedRequeue): void {
+			/** @var \Kdyby\RabbitMq\Connection|\Mockery\Mock $amqpConnection */
+			$amqpConnection = $this->getMockery(\Kdyby\RabbitMq\Connection::class, ['127.0.0.1', 5672, 'guest', 'guest'])
+				->makePartial();
+
+			/** @var \Kdyby\RabbitMq\Channel|\Mockery\Mock $amqpChannel */
+			$amqpChannel = $this->getMockery(\Kdyby\RabbitMq\Channel::class, [$amqpConnection])
+				->makePartial();
+
+			$consumer = new Consumer($amqpConnection);
+			$consumer->setChannel($amqpChannel);
+
+			$callbackFunction = static function () use (
+				$processFlag
+			) {
+				return $processFlag;
+			}; // Create a callback function with a return value set by the data provider.
+			$consumer->setCallback($callbackFunction);
+
+			// Create a default message
+			$amqpMessage = new AMQPMessage('foo body');
+			$amqpMessage->delivery_info['channel'] = $amqpChannel;
+			$amqpMessage->delivery_info['delivery_tag'] = 0;
+
+			$amqpChannel->shouldReceive('basic_reject')
+				->andReturnUsing(
+					static function (
+						$deliveryTag,
+						$requeue
+					) use (
+						$expectedMethod,
+						$expectedRequeue
+					): void {
+						Assert::same($expectedMethod, 'basic_reject'); // Check if this function should be called.
+						Assert::same($requeue, $expectedRequeue); // Check if the message should be requeued.
+					}
+				);
+
+			$amqpChannel->shouldReceive('basic_ack')
+				->andReturnUsing(
+					static function () use (
+						$expectedMethod
+					): void {
+						Assert::same($expectedMethod, 'basic_ack'); // Check if this function should be called.
+					}
+				);
+
+			$consumer->processMessage($amqpMessage);
+		});
 	}
 
-
-
-	public function processMessageProvider()
+	/**
+	 * @return array<mixed>
+	 */
+	public function processMessageProvider(): array
 	{
 		return [
-			[null, 'basic_ack'], // Remove message from queue only if callback return not false
-			[true, 'basic_ack'], // Remove message from queue only if callback return not false
-			[false, 'basic_reject', true], // Reject and requeue message to RabbitMQ
+			[NULL, 'basic_ack'], // Remove message from queue only if callback return not false
+			[TRUE, 'basic_ack'], // Remove message from queue only if callback return not false
+			[FALSE, 'basic_reject', TRUE], // Reject and requeue message to RabbitMQ
 			[IConsumer::MSG_ACK, 'basic_ack'], // Remove message from queue only if callback return not false
-			[IConsumer::MSG_REJECT_REQUEUE, 'basic_reject', true], // Reject and requeue message to RabbitMQ
-			[IConsumer::MSG_REJECT, 'basic_reject', false], // Reject and drop
+			[IConsumer::MSG_REJECT_REQUEUE, 'basic_reject', TRUE], // Reject and requeue message to RabbitMQ
+			[IConsumer::MSG_REJECT, 'basic_reject', FALSE], // Reject and drop
 		];
 	}
 
diff --git a/tests/KdybyTests/RabbitMq/ExtensionTest.phpt b/tests/KdybyTests/RabbitMq/ExtensionTest.phpt
index a8646765..4b367c03 100644
--- a/tests/KdybyTests/RabbitMq/ExtensionTest.phpt
+++ b/tests/KdybyTests/RabbitMq/ExtensionTest.phpt
@@ -1,41 +1,32 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * Test: Kdyby\RabbitMq\Extension.
  *
  * @testCase KdybyTests\RabbitMq\ExtensionTest
- * @author Filip Procházka <filip@prochazka.su>
- * @package Kdyby\RabbitMq
  */
 
 namespace KdybyTests\RabbitMq;
 
 use Kdyby;
-use KdybyTests;
 use Nette;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
-use Tester;
 use Tester\Assert;
 
-
 require_once __DIR__ . '/../bootstrap.php';
 
 
 
-/**
- * @author Filip Procházka <filip@prochazka.su>
- */
-class ExtensionTest extends TestCase
+class ExtensionTest extends \KdybyTests\RabbitMq\TestCase
 {
 
-	/**
-	 * @return \Nette\DI\Container
-	 */
-	protected function createContainer()
+	protected function createContainer(): \Nette\DI\Container
 	{
 		$config = new Nette\Configurator();
 		$config->setTempDirectory(TEMP_DIR);
-		$config->onCompile[] = static function ($config, Nette\DI\Compiler $compiler) : void {
+		$config->onCompile[] = static function ($config, Nette\DI\Compiler $compiler): void {
 			$compiler->addExtension('rabbitmq', new Kdyby\RabbitMq\DI\RabbitMqExtension());
 		};
 		$config->addConfig(__DIR__ . '/files/nette-reset.neon');
@@ -44,9 +35,7 @@ class ExtensionTest extends TestCase
 		return $config->createContainer();
 	}
 
-
-
-	public function testFunctional()
+	public function testFunctional(): void
 	{
 		$dic = $this->createContainer();
 
diff --git a/tests/KdybyTests/RabbitMq/Mock/Callback.php b/tests/KdybyTests/RabbitMq/Mock/Callback.php
index 920112dc..e5c8a24f 100644
--- a/tests/KdybyTests/RabbitMq/Mock/Callback.php
+++ b/tests/KdybyTests/RabbitMq/Mock/Callback.php
@@ -1,29 +1,39 @@
-<?php declare(strict_types = 1);
+<?php
 
-namespace KdybyTests\RabbitMq\Mock;
+declare(strict_types = 1);
 
+namespace KdybyTests\RabbitMq\Mock;
 
 class Callback
 {
 
+	/**
+	 * @var array<mixed>
+	 */
 	public static $accepted = [];
 
-
-	public function __invoke($message)
+	/**
+	 * @param mixed $message
+	 */
+	public function __invoke($message): void
 	{
-		self::$accepted[] = func_get_args();
+		self::$accepted[] = \func_get_args();
 	}
 
-
-	public function process($message)
+	/**
+	 * @param mixed $message
+	 */
+	public function process($message): void
 	{
-		self::$accepted[] = func_get_args();
+		self::$accepted[] = \func_get_args();
 	}
 
-
-	public static function staticProcess($message)
+	/**
+	 * @param mixed $message
+	 */
+	public static function staticProcess($message): void
 	{
-		self::$accepted[] = func_get_args();
+		self::$accepted[] = \func_get_args();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/KdybyTests/RabbitMq/Mock/ChannelMock.php b/tests/KdybyTests/RabbitMq/Mock/ChannelMock.php
index 7b8a3ca0..757aadc8 100644
--- a/tests/KdybyTests/RabbitMq/Mock/ChannelMock.php
+++ b/tests/KdybyTests/RabbitMq/Mock/ChannelMock.php
@@ -1,211 +1,229 @@
-<?php declare(strict_types = 1);
+<?php
 
-namespace KdybyTests\RabbitMq\Mock;
+declare(strict_types = 1);
 
+namespace KdybyTests\RabbitMq\Mock;
 
 class ChannelMock extends \Kdyby\RabbitMq\Channel
 {
 
+	/**
+	 * @var array<mixed>
+	 */
 	public $calls = [];
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	protected function channel_alert($args)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 		parent::channel_alert($args);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	protected function channel_close($args)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 		parent::channel_close($args);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	protected function channel_flow($args)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 		parent::channel_flow($args);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function exchange_declare(
 		$exchange,
 		$type,
 		$passive = FALSE,
 		$durable = FALSE,
-		$auto_delete = TRUE,
+		$autoDelete = TRUE,
 		$internal = FALSE,
 		$nowait = FALSE,
 		$arguments = NULL,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
 		return parent::exchange_declare(
-			$exchange, $type, $passive, $durable, $auto_delete, $internal, $nowait, $arguments, $ticket
+			$exchange,
+			$type,
+			$passive,
+			$durable,
+			$autoDelete,
+			$internal,
+			$nowait,
+			$arguments,
+			$ticket
 		);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function exchange_delete(
 		$exchange,
-		$if_unused = FALSE,
+		$ifUnused = FALSE,
 		$nowait = FALSE,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::exchange_delete($exchange, $if_unused, $nowait, $ticket);
+		return parent::exchange_delete($exchange, $ifUnused, $nowait, $ticket);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function exchange_bind(
 		$destination,
 		$source,
-		$routing_key = "",
+		$routingKey = '',
 		$nowait = FALSE,
 		$arguments = NULL,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::exchange_bind($destination, $source, $routing_key, $nowait, $arguments, $ticket);
+		return parent::exchange_bind($destination, $source, $routingKey, $nowait, $arguments, $ticket);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function exchange_unbind(
 		$destination,
 		$source,
-		$routing_key = "",
+		$routingKey = '',
 		$arguments = NULL,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::exchange_unbind($destination, $source, $routing_key, $arguments, $ticket);
+		return parent::exchange_unbind($destination, $source, $routingKey, $arguments, $ticket);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function queue_bind(
 		$queue,
 		$exchange,
-		$routing_key = "",
+		$routingKey = '',
 		$nowait = FALSE,
 		$arguments = NULL,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::queue_bind($queue, $exchange, $routing_key, $nowait, $arguments, $ticket);
+		return parent::queue_bind($queue, $exchange, $routingKey, $nowait, $arguments, $ticket);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function queue_unbind(
 		$queue,
 		$exchange,
-		$routing_key = "",
+		$routingKey = '',
 		$arguments = NULL,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::queue_unbind($queue, $exchange, $routing_key, $arguments, $ticket);
+		return parent::queue_unbind($queue, $exchange, $routingKey, $arguments, $ticket);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function queue_declare(
-		$queue = "",
+		$queue = '',
 		$passive = FALSE,
 		$durable = FALSE,
 		$exclusive = FALSE,
-		$auto_delete = TRUE,
+		$autoDelete = TRUE,
 		$nowait = FALSE,
 		$arguments = NULL,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
 		return parent::queue_declare(
-			$queue, $passive, $durable, $exclusive, $auto_delete, $nowait, $arguments, $ticket
+			$queue,
+			$passive,
+			$durable,
+			$exclusive,
+			$autoDelete,
+			$nowait,
+			$arguments,
+			$ticket
 		);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function queue_delete(
-		$queue = "",
-		$if_unused = FALSE,
-		$if_empty = FALSE,
+		$queue = '',
+		$ifUnused = FALSE,
+		$ifEmpty = FALSE,
 		$nowait = FALSE,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::queue_delete($queue, $if_unused, $if_empty, $nowait, $ticket);
+		return parent::queue_delete($queue, $ifUnused, $ifEmpty, $nowait, $ticket);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function queue_purge(
-		$queue = "",
+		$queue = '',
 		$nowait = FALSE,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
 		return parent::queue_purge($queue, $nowait, $ticket);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function basic_ack(
-		$delivery_tag,
+		$deliveryTag,
 		$multiple = FALSE
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
-		parent::basic_ack($delivery_tag, $multiple);
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
+		parent::basic_ack($deliveryTag, $multiple);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function basic_nack(
-		$delivery_tag,
+		$deliveryTag,
 		$multiple = FALSE,
 		$requeue = FALSE
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
-		parent::basic_nack($delivery_tag, $multiple, $requeue);
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
+		parent::basic_nack($deliveryTag, $multiple, $requeue);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function basic_cancel(
-		$consumer_tag,
+		$consumerTag,
 		$nowait = FALSE,
 		$noreturn = FALSE
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::basic_cancel($consumer_tag, $nowait);
+		return parent::basic_cancel($consumerTag, $nowait);
 	}
 
-
 	/**
 	 * Starts a queue consumer
 	 *
 	 * @param string $queue
-	 * @param string $consumer_tag
-	 * @param bool $no_local
-	 * @param bool $no_ack
+	 * @param string $consumerTag
+	 * @param bool $noLocal
+	 * @param bool $noAck
 	 * @param bool $exclusive
 	 * @param bool $nowait
 	 * @param callable|null $callback
@@ -213,11 +231,12 @@ public function basic_cancel(
 	 * @param array $arguments
 	 * @return mixed|string
 	 */
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function basic_consume(
-		$queue = "",
-		$consumer_tag = "",
-		$no_local = FALSE,
-		$no_ack = FALSE,
+		$queue = '',
+		$consumerTag = '',
+		$noLocal = FALSE,
+		$noAck = FALSE,
 		$exclusive = FALSE,
 		$nowait = FALSE,
 		$callback = NULL,
@@ -225,110 +244,122 @@ public function basic_consume(
 		$arguments = []
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
 		return parent::basic_consume(
-			$queue, $consumer_tag, $no_local, $no_ack, $exclusive, $nowait, $callback, $ticket, $arguments
+			$queue,
+			$consumerTag,
+			$noLocal,
+			$noAck,
+			$exclusive,
+			$nowait,
+			$callback,
+			$ticket,
+			$arguments
 		);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function basic_get(
-		$queue = "",
-		$no_ack = FALSE,
+		$queue = '',
+		$noAck = FALSE,
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::basic_get($queue, $no_ack, $ticket);
+		return parent::basic_get(
+			$queue,
+			$noAck,
+			$ticket
+		);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function basic_qos(
-		$prefetch_size,
-		$prefetch_count,
-		$a_global
+		$prefetchSize,
+		$prefetchCount,
+		$AGlobal
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::basic_qos($prefetch_size, $prefetch_count, $a_global);
+		return parent::basic_qos($prefetchSize, $prefetchCount, $AGlobal);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function basic_recover($requeue = FALSE)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
 		return parent::basic_recover($requeue);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function basic_reject(
-		$delivery_tag,
+		$deliveryTag,
 		$requeue
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
-		parent::basic_reject($delivery_tag, $requeue);
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
+		parent::basic_reject($deliveryTag, $requeue);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	protected function basic_return(
 		$args,
 		$msg
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 		parent::basic_return($args, $msg);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function tx_commit()
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
 		return parent::tx_commit();
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function tx_rollback()
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
 		return parent::tx_rollback();
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function confirm_select($nowait = FALSE)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
 		return parent::confirm_select($nowait);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function tx_select()
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
 		return parent::tx_select();
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
 	public function dispatch(
-		$method_sig,
+		$methodSig,
 		$args,
 		$content
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 
-		return parent::dispatch($method_sig, $args, $content);
+		return parent::dispatch($methodSig, $args, $content);
 	}
 
-
+	// phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint,SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint,PSR1.Methods.CamelCapsMethodName
 	public function basic_publish(
 		$msg,
 		$exchange = '',
@@ -338,8 +369,8 @@ public function basic_publish(
 		$ticket = NULL
 	)
 	{
-		$this->calls[] = [__FUNCTION__] + get_defined_vars();
+		$this->calls[] = [__FUNCTION__] + \get_defined_vars();
 		parent::basic_publish($msg, $exchange, $routingKey, $mandatory, $immediate, $ticket);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/KdybyTests/RabbitMq/Mock/ConnectionMock.php b/tests/KdybyTests/RabbitMq/Mock/ConnectionMock.php
index f5d6a098..0cb205d4 100644
--- a/tests/KdybyTests/RabbitMq/Mock/ConnectionMock.php
+++ b/tests/KdybyTests/RabbitMq/Mock/ConnectionMock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This file is part of the Kdyby (http://www.kdyby.org)
  *
@@ -10,14 +12,10 @@
 
 namespace KdybyTests\RabbitMq\Mock;
 
-use Kdyby;
-
-
-
-class ConnectionMock extends Kdyby\RabbitMq\Connection
+class ConnectionMock extends \Kdyby\RabbitMq\Connection
 {
 
-	protected function doCreateChannel($id)
+	protected function doCreateChannel(string $id): \Kdyby\RabbitMq\Channel
 	{
 		return new ChannelMock($this, $id);
 	}
diff --git a/tests/KdybyTests/RabbitMq/MultipleConsumerTest.phpt b/tests/KdybyTests/RabbitMq/MultipleConsumerTest.phpt
index a0e8b30b..27b3c6cd 100644
--- a/tests/KdybyTests/RabbitMq/MultipleConsumerTest.phpt
+++ b/tests/KdybyTests/RabbitMq/MultipleConsumerTest.phpt
@@ -1,82 +1,98 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * Test: Kdyby\RabbitMq\Extension.
  *
  * @testCase KdybyTests\RabbitMq\MultipleConsumerTest
- * @package Kdyby\RabbitMq
  */
 
 namespace KdybyTests\RabbitMq;
 
-use Kdyby;
 use Kdyby\RabbitMq\IConsumer;
 use Kdyby\RabbitMq\MultipleConsumer;
-use KdybyTests;
-use Mockery\Mock;
-use Nette;
 use PhpAmqpLib\Message\AMQPMessage;
-use Tester;
 use Tester\Assert;
 
-
 require_once __DIR__ . '/../bootstrap.php';
 
-class MultipleConsumerTest extends TestCase
+class MultipleConsumerTest extends \KdybyTests\RabbitMq\TestCase
 {
 
 	/**
 	 * Check if the message is requeued or not correctly.
 	 *
 	 * @dataProvider processMessageProvider
+	 * @param mixed $processFlag
+	 * @param string $expectedMethod
+	 * @param bool|null $expectedRequeue
 	 */
-	public function testProcessMessage($processFlag, $expectedMethod, $expectedRequeue = null)
+	public function testProcessMessage($processFlag, string $expectedMethod, ?bool $expectedRequeue = NULL): void
 	{
-		/** @var Kdyby\RabbitMq\Connection|Mock $amqpConnection */
-		$amqpConnection = $this->getMockery('Kdyby\RabbitMq\Connection', ['127.0.0.1', 5672, 'guest', 'guest'])
-			->makePartial();
-
-		/** @var Kdyby\RabbitMq\Channel|Mock $amqpChannel */
-		$amqpChannel = $this->getMockery('Kdyby\RabbitMq\Channel', [$amqpConnection])
-			->makePartial();
-
-		$consumer = new MultipleConsumer($amqpConnection);
-		$consumer->setChannel($amqpChannel);
-
-		$callback = function($msg) use (&$lastQueue, $processFlag) { return $processFlag; };
-		$consumer->setQueues(['test-1' => ['callback' => $callback], 'test-2'  => ['callback' => $callback]]);
-
-		// Create a default message
-		$amqpMessage = new AMQPMessage('foo body');
-		$amqpMessage->delivery_info['channel'] = $amqpChannel;
-		$amqpMessage->delivery_info['delivery_tag'] = 0;
-
-		$amqpChannel->shouldReceive('basic_reject')
-			->andReturnUsing(function ($delivery_tag, $requeue) use ($expectedMethod, $expectedRequeue) {
-				Assert::same($expectedMethod, 'basic_reject'); // Check if this function should be called.
-				Assert::same($requeue, $expectedRequeue); // Check if the message should be requeued.
-			});
-
-		$amqpChannel->shouldReceive('basic_ack')
-			->andReturnUsing(function ($delivery_tag) use ($expectedMethod) {
-				Assert::same($expectedMethod, 'basic_ack'); // Check if this function should be called.
-			});
-
-		$consumer->processQueueMessage('test-1', $amqpMessage);
-		$consumer->processQueueMessage('test-2', $amqpMessage);
+		Assert::noError(function () use (
+			$processFlag,
+			$expectedMethod,
+			$expectedRequeue
+		): void {
+			/** @var \Kdyby\RabbitMq\Connection|\Mockery\Mock $amqpConnection */
+			$amqpConnection = $this->getMockery(\Kdyby\RabbitMq\Connection::class, ['127.0.0.1', 5672, 'guest', 'guest'])
+				->makePartial();
+
+			/** @var \Kdyby\RabbitMq\Channel|\Mockery\Mock $amqpChannel */
+			$amqpChannel = $this->getMockery(\Kdyby\RabbitMq\Channel::class, [$amqpConnection])
+				->makePartial();
+			$consumer = new MultipleConsumer($amqpConnection);
+			$consumer->setChannel($amqpChannel);
+
+			$callback = static function ($msg) use ($processFlag) {
+				return $processFlag;
+			};
+			$consumer->setQueues(['test-1' => ['callback' => $callback], 'test-2' => ['callback' => $callback]]);
+
+			// Create a default message
+			$amqpMessage = new AMQPMessage('foo body');
+			$amqpMessage->delivery_info['channel'] = $amqpChannel;
+			$amqpMessage->delivery_info['delivery_tag'] = 0;
+
+			$amqpChannel->shouldReceive('basic_reject')
+				->andReturnUsing(
+					static function (
+						$deliveryTag,
+						$requeue
+					) use (
+						$expectedMethod,
+						$expectedRequeue
+					): void {
+						Assert::same($expectedMethod, 'basic_reject'); // Check if this function should be called.
+						Assert::same($requeue, $expectedRequeue); // Check if the message should be requeued.
+					}
+				);
+
+			$amqpChannel->shouldReceive('basic_ack')
+				->andReturnUsing(
+					static function ($deliveryTag) use ($expectedMethod): void {
+						Assert::same($expectedMethod, 'basic_ack'); // Check if this function should be called.
+					}
+				);
+
+			$consumer->processQueueMessage('test-1', $amqpMessage);
+			$consumer->processQueueMessage('test-2', $amqpMessage);
+		});
 	}
 
-
-
-	public function processMessageProvider()
+	/**
+	 * @return array<mixed>
+	 */
+	public function processMessageProvider(): array
 	{
 		return [
-			[null, 'basic_ack'], // Remove message from queue only if callback return not false
-			[true, 'basic_ack'], // Remove message from queue only if callback return not false
-			[false, 'basic_reject', true], // Reject and requeue message to RabbitMQ
+			[NULL, 'basic_ack'], // Remove message from queue only if callback return not false
+			[TRUE, 'basic_ack'], // Remove message from queue only if callback return not false
+			[FALSE, 'basic_reject', TRUE], // Reject and requeue message to RabbitMQ
 			[IConsumer::MSG_ACK, 'basic_ack'], // Remove message from queue only if callback return not false
-			[IConsumer::MSG_REJECT_REQUEUE, 'basic_reject', true], // Reject and requeue message to RabbitMQ
-			[IConsumer::MSG_REJECT, 'basic_reject', false], // Reject and drop
+			[IConsumer::MSG_REJECT_REQUEUE, 'basic_reject', TRUE], // Reject and requeue message to RabbitMQ
+			[IConsumer::MSG_REJECT, 'basic_reject', FALSE], // Reject and drop
 		];
 	}
 
diff --git a/tests/KdybyTests/RabbitMq/TestCase.php b/tests/KdybyTests/RabbitMq/TestCase.php
index 6c94a9d7..ebb91fad 100644
--- a/tests/KdybyTests/RabbitMq/TestCase.php
+++ b/tests/KdybyTests/RabbitMq/TestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This file is part of the Kdyby (http://www.kdyby.org)
  *
@@ -10,31 +12,22 @@
 
 namespace KdybyTests\RabbitMq;
 
-use Kdyby;
 use Mockery;
-use Nette;
-use Tester;
-
 
-/**
- * @author Filip Procházka <filip@prochazka.su>
- */
-abstract class TestCase extends Tester\TestCase
+abstract class TestCase extends \Tester\TestCase
 {
 
 	/**
-	 * @var Mockery\Container
+	 * @var \Mockery\Container
 	 */
 	private $mockery;
 
-
-
 	/**
 	 * @param string $class
 	 * @throws \Mockery\Exception\RuntimeException
-	 * @return Mockery\Container|Mockery\Mock
+	 * @return \Mockery\Container|\Mockery\Mock
 	 */
-	protected function getMockery($class = NULL)
+	protected function getMockery(?string $class = NULL)
 	{
 		if (!$this->mockery) {
 			$this->mockery = new Mockery\Container(Mockery::getDefaultGenerator(), Mockery::getDefaultLoader());
@@ -47,9 +40,7 @@ protected function getMockery($class = NULL)
 		return $this->mockery;
 	}
 
-
-
-	protected function tearDown()
+	protected function tearDown(): void
 	{
 		if ($this->mockery) {
 			$this->mockery->mockery_close();
diff --git a/tests/KdybyTests/bootstrap.php b/tests/KdybyTests/bootstrap.php
index 9ed44cfa..82045134 100755
--- a/tests/KdybyTests/bootstrap.php
+++ b/tests/KdybyTests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * This file is part of the Kdyby (http://www.kdyby.org)
  *
@@ -16,17 +18,24 @@
 
 // configure environment
 Tester\Environment::setup();
-class_alias(\Tester\Assert::class, 'Assert');
-date_default_timezone_set('Europe/Prague');
+\class_alias(\Tester\Assert::class, 'Assert');
+\date_default_timezone_set('Europe/Prague');
 
 // create temporary directory
-define('TEMP_DIR', __DIR__ . '/../tmp/' . (isset($_SERVER['argv']) ? md5(serialize($_SERVER['argv'])) : getmypid()));
+\define('TEMP_DIR', __DIR__ . '/../tmp/' . (isset($_SERVER['argv']) ? \md5(\serialize($_SERVER['argv'])) : \getmypid()));
 Tester\Helpers::purge(TEMP_DIR);
 Tracy\Debugger::$logDirectory = TEMP_DIR;
 
 
-$_SERVER = array_intersect_key($_SERVER, array_flip([
-	'PHP_SELF', 'SCRIPT_NAME', 'SERVER_ADDR', 'SERVER_SOFTWARE', 'HTTP_HOST', 'DOCUMENT_ROOT', 'OS', 'argc', 'argv']));
+$_SERVER = \array_intersect_key($_SERVER, \array_flip([
+	'PHP_SELF',
+	'SCRIPT_NAME',
+	'SERVER_ADDR',
+	'SERVER_SOFTWARE',
+	'HTTP_HOST',
+	'DOCUMENT_ROOT',
+	'OS',
+	'argc', 'argv']));
 $_SERVER['REQUEST_TIME'] = 1234567890;
 // phpcs:disable SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
 $_ENV = $_GET = $_POST = [];

From 027f93f7059fc5cced52751f8d6302959ed5643a Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Tue, 9 Apr 2019 01:26:04 +0200
Subject: [PATCH 10/20] - getConfig does not have argument - channel creating
 must accept string

---
 src/Kdyby/RabbitMq/Connection.php            |  2 +-
 src/Kdyby/RabbitMq/DI/RabbitMqExtension.php  |  2 +-
 tests/KdybyTests/RabbitMq/files/default.neon | 18 +++++++--------
 tests/RabbitMq/MultipleConsumerTest.php      | 24 ++++++++++++--------
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/Kdyby/RabbitMq/Connection.php b/src/Kdyby/RabbitMq/Connection.php
index ed581487..bdd44eba 100644
--- a/src/Kdyby/RabbitMq/Connection.php
+++ b/src/Kdyby/RabbitMq/Connection.php
@@ -126,7 +126,7 @@ public function channel($id = NULL): Channel
 		$this->connect();
 		$id = $id ?: $this->get_free_channel_id();
 
-		return $this->channels[$id] = $this->doCreateChannel($id);
+		return $this->channels[$id] = $this->doCreateChannel((string) $id);
 	}
 
 	protected function doCreateChannel(string $id): Channel
diff --git a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
index 05ca4f7d..0589076d 100644
--- a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
+++ b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
@@ -151,7 +151,7 @@ class RabbitMqExtension extends \Nette\DI\CompilerExtension
 	public function loadConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();
-		$config = $this->getConfig($this->defaults);
+		$config = \Nette\DI\Config\Helpers::merge($this->getConfig(), $this->defaults);
 
 		foreach ($this->compiler->getExtensions() as $extension) {
 			if ($extension instanceof IProducersProvider) {
diff --git a/tests/KdybyTests/RabbitMq/files/default.neon b/tests/KdybyTests/RabbitMq/files/default.neon
index 1211379e..8d807397 100644
--- a/tests/KdybyTests/RabbitMq/files/default.neon
+++ b/tests/KdybyTests/RabbitMq/files/default.neon
@@ -59,7 +59,7 @@ rabbitmq:
 				routing_keys:
 					- 'android.#.upload'
 					- 'iphone.upload'
-			callback: KdybyTests\RabbitMq\Callback()
+			callback: KdybyTests\RabbitMq\Mock\Callback()
 
 		default_consumer:
 			exchange:
@@ -67,7 +67,7 @@ rabbitmq:
 				type: direct
 			queue:
 				name: default_queue
-			callback: [KdybyTests\RabbitMq\Callback, staticProcess]
+			callback: [KdybyTests\RabbitMq\Mock\Callback, staticProcess]
 
 		qos_test_consumer:
 			connection: foo_connection
@@ -90,7 +90,7 @@ rabbitmq:
 			queues:
 				multi-test-1:
 					name: multi_test_1
-					callback: [@KdybyTests\RabbitMq\Callback, process]
+					callback: [@KdybyTests\RabbitMq\Mock\Callback, process]
 				multi-test-2:
 					name: foo_bar_2
 					passive: true
@@ -103,7 +103,7 @@ rabbitmq:
 					routing_keys:
 						- 'android.upload'
 						- 'iphone.upload'
-					callback: KdybyTests\RabbitMq\Callback()
+					callback: KdybyTests\RabbitMq\Mock\Callback()
 
 		foo_anon_consumer:
 			connection: foo_connection
@@ -117,13 +117,13 @@ rabbitmq:
 				nowait: true
 				arguments: null
 				ticket: null
-			callback: KdybyTests\RabbitMq\Callback()
+			callback: KdybyTests\RabbitMq\Mock\Callback()
 
 		default_anon_consumer:
 			exchange:
 				name: default_anon_exchange
 				type: direct
-			callback: KdybyTests\RabbitMq\Callback()
+			callback: KdybyTests\RabbitMq\Mock\Callback()
 
 
 	rpcClients:
@@ -136,11 +136,11 @@ rabbitmq:
 	rpcServers:
 		foo_server:
 			connection: foo_connection
-			callback: KdybyTests\RabbitMq\Callback()
+			callback: KdybyTests\RabbitMq\Mock\Callback()
 
 		default_server:
-			callback: KdybyTests\RabbitMq\Callback()
+			callback: KdybyTests\RabbitMq\Mock\Callback()
 
 
 services:
-	collecting_callback: KdybyTests\RabbitMq\Callback
+	collecting_callback: KdybyTests\RabbitMq\Mock\Callback
diff --git a/tests/RabbitMq/MultipleConsumerTest.php b/tests/RabbitMq/MultipleConsumerTest.php
index 25e851e8..5ca41b92 100644
--- a/tests/RabbitMq/MultipleConsumerTest.php
+++ b/tests/RabbitMq/MultipleConsumerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace OldSound\RabbitMqBundle\Tests\RabbitMq;
 
 use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
@@ -8,12 +10,13 @@
 
 class MultipleConsumerTest extends \PHPUnit_Framework_TestCase
 {
+
 	/**
 	 * Check if the message is requeued or not correctly.
 	 *
 	 * @dataProvider processMessageProvider
 	 */
-	public function testProcessMessage($processFlag, $expectedMethod, $expectedRequeue = null)
+	public function testProcessMessage($processFlag, $expectedMethod, $expectedRequeue = NULL): void
 	{
 		$amqpConnection = $this->getMockBuilder('\PhpAmqpLib\Connection\AMQPConnection')
 			->disableOriginalConstructor()
@@ -24,11 +27,11 @@ public function testProcessMessage($processFlag, $expectedMethod, $expectedReque
 			->getMock();
 
 		$consumer = new MultipleConsumer($amqpConnection, $amqpChannel);
-		$callback = function($msg) use (&$lastQueue, $processFlag) {
+		$callback = static function ($msg) use ($processFlag) {
 			return $processFlag;
 		};
 
-		$consumer->setQueues(['test-1' => ['callback' => $callback], 'test-2'  => ['callback' => $callback]]);
+		$consumer->setQueues(['test-1' => ['callback' => $callback], 'test-2' => ['callback' => $callback]]);
 
 		// Create a default message
 		$amqpMessage = new AMQPMessage('foo body');
@@ -36,14 +39,14 @@ public function testProcessMessage($processFlag, $expectedMethod, $expectedReque
 		$amqpMessage->delivery_info['delivery_tag'] = 0;
 		$amqpChannel->expects($this->any())
 			->method('basic_reject')
-			->will($this->returnCallback(function($delivery_tag, $requeue) use ($expectedMethod, $expectedRequeue) {
+			->will($this->returnCallback(static function ($delivery_tag, $requeue) use ($expectedMethod, $expectedRequeue): void {
 				\PHPUnit_Framework_Assert::assertSame($expectedMethod, 'basic_reject'); // Check if this function should be called.
 				\PHPUnit_Framework_Assert::assertSame($requeue, $expectedRequeue); // Check if the message should be requeued.
 			}));
 
 		$amqpChannel->expects($this->any())
 			->method('basic_ack')
-			->will($this->returnCallback(function($delivery_tag) use ($expectedMethod) {
+			->will($this->returnCallback(static function ($delivery_tag) use ($expectedMethod): void {
 				\PHPUnit_Framework_Assert::assertSame($expectedMethod, 'basic_ack'); // Check if this function should be called.
 			}));
 
@@ -54,12 +57,13 @@ public function testProcessMessage($processFlag, $expectedMethod, $expectedReque
 	public function processMessageProvider()
 	{
 		return [
-			[null, 'basic_ack'], // Remove message from queue only if callback return not false
-			[true, 'basic_ack'], // Remove message from queue only if callback return not false
-			[false, 'basic_reject', true], // Reject and requeue message to RabbitMQ
+			[NULL, 'basic_ack'], // Remove message from queue only if callback return not false
+			[TRUE, 'basic_ack'], // Remove message from queue only if callback return not false
+			[FALSE, 'basic_reject', TRUE], // Reject and requeue message to RabbitMQ
 			[ConsumerInterface::MSG_ACK, 'basic_ack'], // Remove message from queue only if callback return not false
-			[ConsumerInterface::MSG_REJECT_REQUEUE, 'basic_reject', true], // Reject and requeue message to RabbitMQ
-			[ConsumerInterface::MSG_REJECT, 'basic_reject', false], // Reject and drop
+			[ConsumerInterface::MSG_REJECT_REQUEUE, 'basic_reject', TRUE], // Reject and requeue message to RabbitMQ
+			[ConsumerInterface::MSG_REJECT, 'basic_reject', FALSE], // Reject and drop
 		];
 	}
+
 }

From 9e15d04050a15bd0fa2382537440beb920b23be5 Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Tue, 9 Apr 2019 01:27:57 +0200
Subject: [PATCH 11/20] Composer version bumps for Nette 3

---
 composer.json | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index fcefcfdc..28d12db6 100644
--- a/composer.json
+++ b/composer.json
@@ -17,16 +17,16 @@
 	],
 	"require": {
 		"php": "^7.1",
-		"nette/di": "~2.4 || ^3.0@rc",
+		"nette/di": "~2.4.10 || ^3.0",
 		"nette/utils": "^3.0",
 
 		"php-amqplib/php-amqplib": "~2.6.2"
 	},
 	"require-dev": {
-        "kdyby/console": "~2.5@dev",
+        "kdyby/console": "~2.8",
 
-        "nette/bootstrap": "~2.4 || ~3.0",
-        "latte/latte": "~2.4",
+		"nette/bootstrap": "~2.4 || ~3.0",
+		"latte/latte": "~2.4",
 		"tracy/tracy": "~2.4",
 		"phpstan/phpstan-shim": "^0.11.4",
 		"kdyby/coding-standard": "dev-master",
@@ -34,7 +34,8 @@
 		"nette/tester": "~2.2",
 		"mockery/mockery": "~0.9.1",
 		"jakub-onderka/php-parallel-lint": "^1.0",
-        "typo3/class-alias-loader": "^1.0"
+		"typo3/class-alias-loader": "^1.0",
+		"nette/caching": "^3.0"
 	},
 	"support": {
 		"email": "filip@prochazka.su",
@@ -45,19 +46,19 @@
 			"Kdyby\\RabbitMq\\": "src/Kdyby/RabbitMq"
 		}
 	},
-    "autoload-dev": {
-        "psr-4": {
-            "KdybyTests\\RabbitMq\\": "tests/KdybyTests/RabbitMq"
-        }
-    },
+	"autoload-dev": {
+		"psr-4": {
+			"KdybyTests\\RabbitMq\\": "tests/KdybyTests/RabbitMq"
+		}
+	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "1.0-dev"
 		},
-        "typo3/class-alias-loader": {
-            "class-alias-maps": [
-                "src/Kdyby/RabbitMq/DI/ClassAliasMap.php"
-            ]
-        }
+		"typo3/class-alias-loader": {
+			"class-alias-maps": [
+				"src/Kdyby/RabbitMq/DI/ClassAliasMap.php"
+			]
+		}
 	}
 }

From c15e1557b2a5201915c4c12376b9aecd3a9428c8 Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Tue, 9 Apr 2019 19:38:31 +0200
Subject: [PATCH 12/20] Minimum viable mockery version

---
 .travis.yml   | 2 +-
 composer.json | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0801c176..6c04c100 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ services:
 env:
   matrix:
     - RUN_TESTS=1 # dev
-    - RUN_TESTS=1 COMPOSER_EXTRA_ARGS="" # after nette/di release add --prefer-stable
+    - RUN_TESTS=1 COMPOSER_EXTRA_ARGS="--prefer-stable"
     - RUN_TESTS=1 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
 
 matrix:
diff --git a/composer.json b/composer.json
index 28d12db6..e57a3a1a 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
 		"kdyby/coding-standard": "dev-master",
 		"php-coveralls/php-coveralls": "^2.1",
 		"nette/tester": "~2.2",
-		"mockery/mockery": "~0.9.1",
+		"mockery/mockery": "~0.9.11",
 		"jakub-onderka/php-parallel-lint": "^1.0",
 		"typo3/class-alias-loader": "^1.0",
 		"nette/caching": "^3.0"
@@ -51,6 +51,13 @@
 			"KdybyTests\\RabbitMq\\": "tests/KdybyTests/RabbitMq"
 		}
 	},
+	"minimum-stability": "dev",
+	"repositories": [
+		{
+			"type": "git",
+			"url": "https://github.com/VBoss/Console.git"
+		}
+	],
 	"extra": {
 		"branch-alias": {
 			"dev-master": "1.0-dev"

From 587b1cf2439fa3c342367356f593bf1b0a25356e Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Tue, 9 Apr 2019 23:01:50 +0200
Subject: [PATCH 13/20] Coding standard ruleset to library for local rules -
 Allow failure for dev dependencies - Bump branch alias

---
 .travis.yml   | 4 ++--
 composer.json | 2 +-
 ruleset.xml   | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 ruleset.xml

diff --git a/.travis.yml b/.travis.yml
index 6c04c100..e5ccd5bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ matrix:
     - php: 7.3
       env: COMPOSER_EXTRA_ARGS=""
   allow_failures:
-    - env:
+    - env: RUN_TESTS=1
 
 before_install:
   - travis_retry composer self-update
@@ -44,7 +44,7 @@ install:
 
 script:
   - if [ "$PHPSTAN" = "1" ]; then vendor/bin/phpstan analyse -l 2 -c phpstan.neon src tests/KdybyTests; fi
-  - if [ "$CODING_STANDARD" = "1" ]; then php vendor/bin/phpcs --standard=vendor/kdyby/coding-standard/ruleset.xml --cache=$HOME/phpcs-cache/.phpcs-cache --encoding=utf-8 -sp src tests/KdybyTests; fi
+  - if [ "$CODING_STANDARD" = "1" ]; then php vendor/bin/phpcs --standard=ruleset.xml --cache=$HOME/phpcs-cache/.phpcs-cache --encoding=utf-8 -sp src tests/KdybyTests; fi
   - if [ "$CODING_STANDARD" = "1" ]; then vendor/bin/parallel-lint -e php,phpt --exclude vendor .; fi
   - if [ "$RUN_TESTS" = "1" ]; then vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/; fi
 
diff --git a/composer.json b/composer.json
index e57a3a1a..417ce0d8 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
 	],
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.0-dev"
+			"dev-master": "1.3-dev"
 		},
 		"typo3/class-alias-loader": {
 			"class-alias-maps": [
diff --git a/ruleset.xml b/ruleset.xml
new file mode 100644
index 00000000..1ae3907c
--- /dev/null
+++ b/ruleset.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<ruleset name="Kdyby/Console">
+	<rule ref="vendor/kdyby/coding-standard/ruleset.xml"/>
+</ruleset>

From 29c76e9722dd9a926916e2e20a1333b2c8d1ac69 Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Wed, 10 Apr 2019 11:35:26 +0200
Subject: [PATCH 14/20] composer cleanup - whitespaces - removed own
 development repo

---
 composer.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 417ce0d8..d6914d45 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
 		"php-amqplib/php-amqplib": "~2.6.2"
 	},
 	"require-dev": {
-        "kdyby/console": "~2.8",
+		"kdyby/console": "~2.8",
 
 		"nette/bootstrap": "~2.4 || ~3.0",
 		"latte/latte": "~2.4",
@@ -52,12 +52,6 @@
 		}
 	},
 	"minimum-stability": "dev",
-	"repositories": [
-		{
-			"type": "git",
-			"url": "https://github.com/VBoss/Console.git"
-		}
-	],
 	"extra": {
 		"branch-alias": {
 			"dev-master": "1.3-dev"

From fa0eb2a676827b7d183155730abac78d03c54e72 Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Fri, 7 Jun 2019 18:19:23 +0200
Subject: [PATCH 15/20] setInject is deprecated, used addTag fixed type in
 published

---
 src/Kdyby/RabbitMq/DI/RabbitMqExtension.php | 2 +-
 src/Kdyby/RabbitMq/Diagnostics/Panel.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
index 0589076d..e3207f77 100644
--- a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
+++ b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
@@ -206,7 +206,7 @@ public function loadConfiguration(): void
 						$meta['consumers'],
 						$meta['rpcServers'],
 					])
-					->setInject(FALSE)
+					->addTag(\Nette\DI\Extensions\InjectExtension::TAG_INJECT, FALSE)
 					->setAutowired(FALSE);
 
 				$connection->addSetup('injectPanel', ['@' . $panelService]);
diff --git a/src/Kdyby/RabbitMq/Diagnostics/Panel.php b/src/Kdyby/RabbitMq/Diagnostics/Panel.php
index 8584a28c..95f33545 100644
--- a/src/Kdyby/RabbitMq/Diagnostics/Panel.php
+++ b/src/Kdyby/RabbitMq/Diagnostics/Panel.php
@@ -116,7 +116,7 @@ public function getPanel(): string
 		return \ob_get_clean();
 	}
 
-	public function published(string $message): void
+	public function published(array $message): void
 	{
 		$this->messages[] = $message;
 	}

From 8df3516e6813c21fd7b6164c9c2c0c2cf55f567c Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Mon, 10 Jun 2019 12:35:27 +0200
Subject: [PATCH 16/20] Travis uses new ubuntu Xenial without rabbitmq service

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5ccd5bc..0fa0cb78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,10 @@ php:
   - 7.2
   - 7.3
 
-services:
-  - rabbitmq
+addons:
+  apt:
+    packages:
+      - rabbitmq-server
 
 env:
   matrix:

From 50715f1371cfd29eb653bac9ebcf1130981e462f Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Mon, 10 Jun 2019 12:43:01 +0200
Subject: [PATCH 17/20] coding standard requested

---
 src/Kdyby/RabbitMq/Diagnostics/Panel.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Kdyby/RabbitMq/Diagnostics/Panel.php b/src/Kdyby/RabbitMq/Diagnostics/Panel.php
index 95f33545..2b344217 100644
--- a/src/Kdyby/RabbitMq/Diagnostics/Panel.php
+++ b/src/Kdyby/RabbitMq/Diagnostics/Panel.php
@@ -116,6 +116,9 @@ public function getPanel(): string
 		return \ob_get_clean();
 	}
 
+	/**
+	 * @param array<mixed> $message
+	 */
 	public function published(array $message): void
 	{
 		$this->messages[] = $message;

From 28711308a29200f5583a8e955a060824ba2a7bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20=C4=8Cevela?= <vcevela@gmail.com>
Date: Tue, 19 Nov 2019 13:03:25 +0100
Subject: [PATCH 18/20] messages amount must be int

---
 src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php b/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
index 4a3499a7..ebb29398 100644
--- a/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
@@ -67,7 +67,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
 			\define('AMQP_DEBUG', (bool) $input->getOption('debug'));
 		}
 
-		$this->amount = $input->getOption('messages');
+		$this->amount = (int) $input->getOption('messages');
 		if ($this->amount < 0) {
 			throw new \InvalidArgumentException('The -m option should be null or greater than 0');
 		}

From 0b82c34f1da98c071eab66d338d1763340a6f31d Mon Sep 17 00:00:00 2001
From: VBoss <vcevela@gmail.com>
Date: Fri, 28 May 2021 16:03:16 +0200
Subject: [PATCH 19/20] CS, PHPStan, Review hints

---
 .travis.yml                                         | 1 +
 composer.json                                       | 4 ++--
 src/Kdyby/RabbitMq/AmqpMember.php                   | 2 +-
 src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php  | 8 +-------
 src/Kdyby/RabbitMq/Command/RpcServerCommand.php     | 2 --
 src/Kdyby/RabbitMq/Command/StdInProducerCommand.php | 3 ---
 src/Kdyby/RabbitMq/DI/ClassAliasMap.php             | 6 +++---
 src/Kdyby/RabbitMq/Producer.php                     | 2 +-
 8 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fa0cb78..c02d4e34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 addons:
   apt:
diff --git a/composer.json b/composer.json
index d6914d45..b19a98ba 100644
--- a/composer.json
+++ b/composer.json
@@ -31,8 +31,8 @@
 		"phpstan/phpstan-shim": "^0.11.4",
 		"kdyby/coding-standard": "dev-master",
 		"php-coveralls/php-coveralls": "^2.1",
-		"nette/tester": "~2.2",
-		"mockery/mockery": "~0.9.11",
+		"nette/tester": "^2.3.2",
+		"mockery/mockery": "~1.3.0",
 		"jakub-onderka/php-parallel-lint": "^1.0",
 		"typo3/class-alias-loader": "^1.0",
 		"nette/caching": "^3.0"
diff --git a/src/Kdyby/RabbitMq/AmqpMember.php b/src/Kdyby/RabbitMq/AmqpMember.php
index 6d213f26..7dd5be55 100644
--- a/src/Kdyby/RabbitMq/AmqpMember.php
+++ b/src/Kdyby/RabbitMq/AmqpMember.php
@@ -209,7 +209,7 @@ protected function queueDeclare(): void
 	 */
 	protected function doQueueDeclare(string $name, array $options): void
 	{
-		[$queueName ] = $this->getChannel()->queue_declare(
+		[$queueName] = $this->getChannel()->queue_declare(
 			$name,
 			$options['passive'],
 			$options['durable'],
diff --git a/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php b/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
index ebb29398..aca6d1d9 100644
--- a/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/BaseConsumerCommand.php
@@ -40,8 +40,6 @@ protected function configure(): void
 	}
 
 	/**
-	 * @param \Symfony\Component\Console\Input\InputInterface $input An InputInterface instance
-	 * @param \Symfony\Component\Console\Output\OutputInterface $output An OutputInterface instance
 	 * @throws \InvalidArgumentException When the number of messages to consume is less than 0
 	 * @throws \BadFunctionCallException When the pcntl is not installed and option -s is true
 	 */
@@ -74,7 +72,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
 
 		$this->consumer = $this->connection->getConsumer($input->getArgument('name'));
 
-		/** @var int|NULL $memoryLimit */
+		/** @var int|null $memoryLimit */
 		$memoryLimit = $input->getOption('memory-limit');
 		if ($memoryLimit !== NULL && \ctype_digit((string) $memoryLimit) && $memoryLimit > 0) {
 			$this->consumer->setMemoryLimit($memoryLimit);
@@ -86,10 +84,6 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
 		}
 	}
 
-	/**
-	 * @param \Symfony\Component\Console\Input\InputInterface $input An InputInterface instance
-	 * @param \Symfony\Component\Console\Output\OutputInterface $output An OutputInterface instance
-	 */
 	protected function execute(InputInterface $input, OutputInterface $output): void
 	{
 		$this->consumer->consume($this->amount);
diff --git a/src/Kdyby/RabbitMq/Command/RpcServerCommand.php b/src/Kdyby/RabbitMq/Command/RpcServerCommand.php
index 32c5b845..097d8b57 100644
--- a/src/Kdyby/RabbitMq/Command/RpcServerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/RpcServerCommand.php
@@ -31,8 +31,6 @@ protected function configure(): void
 	/**
 	 * Executes the current command.
 	 *
-	 * @param \Symfony\Component\Console\Input\InputInterface $input An InputInterface instance
-	 * @param \Symfony\Component\Console\Output\OutputInterface $output An OutputInterface instance
 	 * @throws \InvalidArgumentException When the number of messages to consume is less than 0
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output): void
diff --git a/src/Kdyby/RabbitMq/Command/StdInProducerCommand.php b/src/Kdyby/RabbitMq/Command/StdInProducerCommand.php
index 2f27c87d..1cccef55 100644
--- a/src/Kdyby/RabbitMq/Command/StdInProducerCommand.php
+++ b/src/Kdyby/RabbitMq/Command/StdInProducerCommand.php
@@ -29,9 +29,6 @@ protected function configure(): void
 
 	/**
 	 * Executes the current command.
-	 *
-	 * @param \Symfony\Component\Console\Input\InputInterface $input An InputInterface instance
-	 * @param \Symfony\Component\Console\Output\OutputInterface $output An OutputInterface instance
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output): void
 	{
diff --git a/src/Kdyby/RabbitMq/DI/ClassAliasMap.php b/src/Kdyby/RabbitMq/DI/ClassAliasMap.php
index 7596bd28..d881ec49 100644
--- a/src/Kdyby/RabbitMq/DI/ClassAliasMap.php
+++ b/src/Kdyby/RabbitMq/DI/ClassAliasMap.php
@@ -3,8 +3,8 @@
 declare(strict_types = 1);
 
 return [
-	\Kdyby\RabbitMq\Exception::class                => \Kdyby\RabbitMq\Exception\Exception::class,
+	\Kdyby\RabbitMq\Exception::class => \Kdyby\RabbitMq\Exception\Exception::class,
 	\Kdyby\RabbitMq\InvalidArgumentException::class => \Kdyby\RabbitMq\Exception\InvalidArgumentException::class,
-	\Kdyby\RabbitMq\QueueNotFoundException::class   => \Kdyby\RabbitMq\Exception\QueueNotFoundException::class,
-	\Kdyby\RabbitMq\TerminateException::class       => \Kdyby\RabbitMq\Exception\TerminateException::class,
+	\Kdyby\RabbitMq\QueueNotFoundException::class => \Kdyby\RabbitMq\Exception\QueueNotFoundException::class,
+	\Kdyby\RabbitMq\TerminateException::class => \Kdyby\RabbitMq\Exception\TerminateException::class,
 ];
diff --git a/src/Kdyby/RabbitMq/Producer.php b/src/Kdyby/RabbitMq/Producer.php
index 5c9b4aa3..b6ab6c85 100644
--- a/src/Kdyby/RabbitMq/Producer.php
+++ b/src/Kdyby/RabbitMq/Producer.php
@@ -39,7 +39,7 @@ public function setDeliveryMode(int $deliveryMode): IProducer
 	protected function getBasicProperties(): array
 	{
 		return [
-			'content_type'  => $this->contentType,
+			'content_type' => $this->contentType,
 			'delivery_mode' => $this->deliveryMode,
 		];
 	}

From 462f7115e8134131fcec89e977550d40b3009baa Mon Sep 17 00:00:00 2001
From: Jakub Fajkus <jakub.fajkus@gmail.com>
Date: Mon, 31 May 2021 09:52:48 +0200
Subject: [PATCH 20/20] Create a constant for the `_extends` string.

This is a replacement for the old nette Nette\DI\Config\Helpers::EXTENDS_KEY constant
---
 src/Kdyby/RabbitMq/DI/RabbitMqExtension.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
index e3207f77..0229227d 100644
--- a/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
+++ b/src/Kdyby/RabbitMq/DI/RabbitMqExtension.php
@@ -25,6 +25,7 @@ class RabbitMqExtension extends \Nette\DI\CompilerExtension
 	public const TAG_CONSUMER = 'kdyby.rabbitmq.consumer';
 	public const TAG_RPC_CLIENT = 'kdyby.rabbitmq.rpc.client';
 	public const TAG_RPC_SERVER = 'kdyby.rabbitmq.rpc.server';
+	public const EXTENDS_KEY = '_extends';
 
 	/**
 	 * @var array
@@ -466,8 +467,8 @@ private function extendConsumerFromProducer(string &$consumerName, array $config
 			$consumerName,
 			'~^(?P<consumerName>[^>\s]+)\s*\<\s*(?P<producerName>[^>\s]+)\z~'
 		);
-		if (isset($config['_extends'])) {
-			$producerName = $config['_extends'];
+		if (isset($config[self::EXTENDS_KEY])) {
+			$producerName = $config[self::EXTENDS_KEY];
 
 		} elseif ($m) {
 			$consumerName = $m['consumerName'];