diff --git a/.travis.yml b/.travis.yml
index 3b1d5df58..be56d8875 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,5 @@
 language: php
 php:
-    - 5.4
-    - 5.5
-    - 5.6
-    - 7.0
     - 7.1
     - 7.2
 
@@ -31,7 +27,7 @@ jobs:
             php: 7.1
             install:
                 # Install Nette Code Checker
-                - travis_retry composer create-project nette/code-checker temp/code-checker ~2 --no-progress
+                - travis_retry composer create-project nette/code-checker temp/code-checker ^3.0 --no-progress
                 # Install Nette Coding Standard
                 - travis_retry composer create-project nette/coding-standard temp/coding-standard --no-progress
                 # Install new Node.js and Eslint
@@ -40,7 +36,7 @@ jobs:
                 - nvm use stable
                 - npm install eslint
             script:
-                - php temp/code-checker/src/code-checker.php --short-arrays -i tests/Tracy/fixtures -i examples/assets
+                - php temp/code-checker/src/code-checker.php --strict-types -i tests/Tracy/fixtures -i examples/assets
                 - php temp/coding-standard/ecs check src tests examples tools --config tests/coding-standard.neon
                 - ./node_modules/.bin/eslint "src/**/*.js"
 
diff --git a/appveyor.yml b/appveyor.yml
index f198beafb..f682febe0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ install:
     # Install PHP
     - IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
     - IF %PHP%==1 cd c:\php
-    - IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-5.6.14-Win32-VC11-x86.zip --output php.zip
+    - IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-7.1.17-Win32-VC14-x64.zip --output php.zip
     - IF %PHP%==1 7z x php.zip >nul
     - IF %PHP%==1 echo extension_dir=ext >> php.ini
     - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
diff --git a/composer.json b/composer.json
index f170f0ae3..2830ef33b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,13 +15,14 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4.4",
+		"php": ">=7.1",
 		"ext-session": "*",
 		"ext-json": "*"
 	},
 	"require-dev": {
-		"nette/di": "~2.3",
-		"nette/tester": "~1.7"
+		"nette/di": "^2.4 || ^3.0",
+		"nette/tester": "^2.0",
+		"psr/log": "^1.0"
 	},
 	"suggest": {
 		"https://nette.org/donate": "Please support Tracy via a donation"
@@ -33,7 +34,7 @@
 	"minimum-stability": "dev",
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.5-dev"
+			"dev-master": "3.0-dev"
 		}
 	}
 }
diff --git a/examples/ajax.php b/examples/ajax.php
index 99b6b7e9d..2949c96a7 100644
--- a/examples/ajax.php
+++ b/examples/ajax.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/examples/barDump.php b/examples/barDump.php
index 759b8b77e..b7ce68e86 100644
--- a/examples/barDump.php
+++ b/examples/barDump.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/examples/dump.php b/examples/dump.php
index 92635f2e5..7fa983cc8 100644
--- a/examples/dump.php
+++ b/examples/dump.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/examples/exception.php b/examples/exception.php
index 35d44aba5..3accca09b 100644
--- a/examples/exception.php
+++ b/examples/exception.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/examples/fatal-error.php b/examples/fatal-error.php
index 9e5bcfc00..391d47101 100644
--- a/examples/fatal-error.php
+++ b/examples/fatal-error.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/examples/firelogger.php b/examples/firelogger.php
index 8d07195e8..b3e2009e8 100644
--- a/examples/firelogger.php
+++ b/examples/firelogger.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/examples/notice.php b/examples/notice.php
index 461f18e59..ff675542f 100644
--- a/examples/notice.php
+++ b/examples/notice.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/examples/output-debugger.php b/examples/output-debugger.php
index 9bf7a7675..bfd79f463 100644
--- a/examples/output-debugger.php
+++ b/examples/output-debugger.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 Tracy\OutputDebugger::enable();
diff --git a/examples/preloading.php b/examples/preloading.php
index 58bc9db8a..eeee90d33 100644
--- a/examples/preloading.php
+++ b/examples/preloading.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/examples/redirect.php b/examples/redirect.php
index 9ffc7a702..7ab451eb4 100644
--- a/examples/redirect.php
+++ b/examples/redirect.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/examples/warning.php b/examples/warning.php
index 64e33ba99..98f2e5ea6 100644
--- a/examples/warning.php
+++ b/examples/warning.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../src/tracy.php';
 
 use Tracy\Debugger;
diff --git a/readme.md b/readme.md
index a93826b0c..445786df9 100644
--- a/readme.md
+++ b/readme.md
@@ -41,6 +41,8 @@ composer require tracy/tracy
 
 Alternatively, you can download the whole package or [tracy.phar](https://github.com/nette/tester/releases) file.
 
+Tracy 3.0-dev requires PHP version 7.1 or newer (supports PHP up to 7.2) and is compatible with Chrome 49+, Firefox 45+, MS Edge 12+, Safari 10+ and iOS Safari 10.2+.
+
 Tracy 2.5 requires PHP version 5.4.4 or newer (supports PHP up to 7.2) and is compatible with Chrome 49+, Firefox 45+, MS Edge 12+, Safari 10+ and iOS Safari 10.2+.
 
 Tracy 2.4 requires PHP version 5.4.4 or newer (supports PHP up to 7.2) and is compatible with Chrome 29+, Firefox 28+, IE 11+, MS Edge 12+, Safari 9+ and iOS Safari 9.2+.
diff --git a/src/Bridges/Nette/Bridge.php b/src/Bridges/Nette/Bridge.php
index fea7dd355..3eb6181e2 100644
--- a/src/Bridges/Nette/Bridge.php
+++ b/src/Bridges/Nette/Bridge.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy\Bridges\Nette;
 
 use Latte;
@@ -19,11 +21,11 @@
  */
 class Bridge
 {
-	public static function initialize()
+	public static function initialize(): void
 	{
 		$blueScreen = Tracy\Debugger::getBlueScreen();
 
-		$blueScreen->addPanel(function ($e) {
+		$blueScreen->addPanel(function ($e): ?array {
 			if ($e instanceof Latte\CompileException) {
 				return [
 					'tab' => 'Template',
@@ -39,9 +41,10 @@ public static function initialize()
 						. '</div></pre>',
 				];
 			}
+			return null;
 		});
 
-		$blueScreen->addAction(function ($e) {
+		$blueScreen->addAction(function ($e): ?array {
 			if (
 				$e instanceof Latte\CompileException
 				&& @is_file($e->sourceName) // @ - may trigger error
@@ -53,9 +56,10 @@ public static function initialize()
 					'label' => 'fix it',
 				];
 			}
+			return null;
 		});
 
-		$blueScreen->addAction(function ($e) {
+		$blueScreen->addAction(function ($e): ?array {
 			if ($e instanceof Nette\MemberAccessException || $e instanceof \LogicException) {
 				$loc = $e instanceof Nette\MemberAccessException ? $e->getTrace()[1] : $e->getTrace()[0];
 				if (preg_match('#Cannot (?:read|write to) an undeclared property .+::\$(\w+), did you mean \$(\w+)\?#A', $e->getMessage(), $m)) { // @ - may trigger error
@@ -71,9 +75,10 @@ public static function initialize()
 					];
 				}
 			}
+			return null;
 		});
 
-		$blueScreen->addPanel(function ($e) {
+		$blueScreen->addPanel(function ($e): ?array {
 			if (
 				$e instanceof Nette\Neon\Exception
 				&& preg_match('#line (\d+)#', $e->getMessage(), $m)
@@ -87,6 +92,7 @@ public static function initialize()
 						: BlueScreen::highlightPhp($trace['args'][0], $m[1]),
 				];
 			}
+			return null;
 		});
 	}
 }
diff --git a/src/Bridges/Nette/MailSender.php b/src/Bridges/Nette/MailSender.php
index 4658d584e..f59f412e7 100644
--- a/src/Bridges/Nette/MailSender.php
+++ b/src/Bridges/Nette/MailSender.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy\Bridges\Nette;
 
 use Nette;
@@ -25,7 +27,7 @@ class MailSender
 	private $fromEmail;
 
 
-	public function __construct(Nette\Mail\IMailer $mailer, $fromEmail = null)
+	public function __construct(Nette\Mail\IMailer $mailer, string $fromEmail = null)
 	{
 		$this->mailer = $mailer;
 		$this->fromEmail = $fromEmail;
@@ -34,12 +36,10 @@ public function __construct(Nette\Mail\IMailer $mailer, $fromEmail = null)
 
 	/**
 	 * @param  mixed  $message
-	 * @param  string  $email
-	 * @return void
 	 */
-	public function send($message, $email)
+	public function send($message, string $email): void
 	{
-		$host = preg_replace('#[^\w.-]+#', '', isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : php_uname('n'));
+		$host = preg_replace('#[^\w.-]+#', '', $_SERVER['HTTP_HOST'] ?? php_uname('n'));
 
 		$mail = new Nette\Mail\Message;
 		$mail->setHeader('X-Mailer', 'Tracy');
diff --git a/src/Bridges/Nette/TracyExtension.php b/src/Bridges/Nette/TracyExtension.php
index 2398c3927..aafe4620b 100644
--- a/src/Bridges/Nette/TracyExtension.php
+++ b/src/Bridges/Nette/TracyExtension.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy\Bridges\Nette;
 
 use Nette;
@@ -43,7 +45,7 @@ class TracyExtension extends Nette\DI\CompilerExtension
 	private $cliMode;
 
 
-	public function __construct($debugMode = false, $cliMode = false)
+	public function __construct(bool $debugMode = false, bool $cliMode = false)
 	{
 		$this->debugMode = $debugMode;
 		$this->cliMode = $cliMode;
@@ -93,13 +95,13 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 		}
 
 		$logger = $builder->getDefinition($this->prefix('logger'));
-		if ($logger->getFactory()->getEntity() !== ['Tracy\Debugger', 'getLogger']) {
+		if ($logger->getFactory()->getEntity() !== [Tracy\Debugger::class, 'getLogger']) {
 			$initialize->addBody($builder->formatPhp('Tracy\Debugger::setLogger(?);', [$logger]));
 		}
-		if ($this->config['netteMailer'] && $builder->getByType('Nette\Mail\IMailer')) {
+		if ($this->config['netteMailer'] && $builder->getByType(Nette\Mail\IMailer::class)) {
 			$initialize->addBody($builder->formatPhp('Tracy\Debugger::getLogger(?)->mailer = ?;', [
 				$logger,
-				[new Nette\DI\Statement('Tracy\Bridges\Nette\MailSender', ['fromEmail' => $this->config['fromEmail']]), 'send'],
+				[new Nette\DI\Statement(Tracy\Bridges\Nette\MailSender::class, ['fromEmail' => $this->config['fromEmail']]), 'send'],
 			]));
 		}
 
diff --git a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
new file mode 100644
index 000000000..9f20389b1
--- /dev/null
+++ b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the Tracy (https://tracy.nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Tracy\Bridges\Psr;
+
+use Psr;
+use Tracy;
+
+
+/**
+ * Psr\Log\LoggerInterface to Tracy\ILogger adapter.
+ */
+class PsrToTracyLoggerAdapter implements Tracy\ILogger
+{
+	/** Tracy logger priority to PSR-3 log level mapping */
+	private const PRIORITY_MAP = [
+		Tracy\ILogger::DEBUG => Psr\Log\LogLevel::DEBUG,
+		Tracy\ILogger::INFO => Psr\Log\LogLevel::INFO,
+		Tracy\ILogger::WARNING => Psr\Log\LogLevel::WARNING,
+		Tracy\ILogger::ERROR => Psr\Log\LogLevel::ERROR,
+		Tracy\ILogger::EXCEPTION => Psr\Log\LogLevel::ERROR,
+		Tracy\ILogger::CRITICAL => Psr\Log\LogLevel::CRITICAL,
+	];
+
+	/** @var Psr\Log\LoggerInterface */
+	private $psrLogger;
+
+
+	public function __construct(Psr\Log\LoggerInterface $psrLogger)
+	{
+		$this->psrLogger = $psrLogger;
+	}
+
+
+	public function log($value, string $priority = self::INFO)
+	{
+		if ($value instanceof \Throwable) {
+			$message = $value->getMessage();
+			$context = ['exception' => $value];
+
+		} elseif (!is_string($value)) {
+			$message = trim(Tracy\Dumper::toText($value));
+			$context = [];
+
+		} else {
+			$message = $value;
+			$context = [];
+		}
+
+		$this->psrLogger->log(
+			self::PRIORITY_MAP[$priority] ?? Psr\Log\LogLevel::ERROR,
+			$message,
+			$context
+		);
+	}
+}
diff --git a/src/Bridges/Psr/TracyToPsrLoggerAdapter.php b/src/Bridges/Psr/TracyToPsrLoggerAdapter.php
new file mode 100644
index 000000000..155290bf8
--- /dev/null
+++ b/src/Bridges/Psr/TracyToPsrLoggerAdapter.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file is part of the Tracy (https://tracy.nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Tracy\Bridges\Psr;
+
+use Psr;
+use Tracy;
+
+
+/**
+ * Tracy\ILogger to Psr\Log\LoggerInterface adapter.
+ */
+class TracyToPsrLoggerAdapter extends Psr\Log\AbstractLogger
+{
+	/** PSR-3 log level to Tracy logger priority mapping */
+	private const PRIORITY_MAP = [
+		Psr\Log\LogLevel::EMERGENCY => Tracy\ILogger::CRITICAL,
+		Psr\Log\LogLevel::ALERT => Tracy\ILogger::CRITICAL,
+		Psr\Log\LogLevel::CRITICAL => Tracy\ILogger::CRITICAL,
+		Psr\Log\LogLevel::ERROR => Tracy\ILogger::ERROR,
+		Psr\Log\LogLevel::WARNING => Tracy\ILogger::WARNING,
+		Psr\Log\LogLevel::NOTICE => Tracy\ILogger::WARNING,
+		Psr\Log\LogLevel::INFO => Tracy\ILogger::INFO,
+		Psr\Log\LogLevel::DEBUG => Tracy\ILogger::DEBUG,
+	];
+
+	/** @var Tracy\ILogger */
+	private $tracyLogger;
+
+
+	public function __construct(Tracy\ILogger $tracyLogger)
+	{
+		$this->tracyLogger = $tracyLogger;
+	}
+
+
+	public function log($level, $message, array $context = [])
+	{
+		$priority = self::PRIORITY_MAP[$level] ?? Tracy\ILogger::ERROR;
+
+		if (isset($context['exception']) && $context['exception'] instanceof \Throwable) {
+			$this->tracyLogger->log($context['exception'], $priority);
+			unset($context['exception']);
+		}
+
+		if ($context) {
+			$message = [
+				'message' => $message,
+				'context' => $context,
+			];
+		}
+
+		$this->tracyLogger->log($message, $priority);
+	}
+}
diff --git a/src/Tracy/Bar.php b/src/Tracy/Bar.php
index 746cb5bd3..247163613 100644
--- a/src/Tracy/Bar.php
+++ b/src/Tracy/Bar.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -25,11 +27,9 @@ class Bar
 
 	/**
 	 * Add custom panel.
-	 * @param  IBarPanel  $panel
-	 * @param  string  $id
 	 * @return static
 	 */
-	public function addPanel(IBarPanel $panel, $id = null)
+	public function addPanel(IBarPanel $panel, string $id = null): self
 	{
 		if ($id === null) {
 			$c = 0;
@@ -44,20 +44,17 @@ public function addPanel(IBarPanel $panel, $id = null)
 
 	/**
 	 * Returns panel with given id
-	 * @param  string  $id
-	 * @return IBarPanel|null
 	 */
-	public function getPanel($id)
+	public function getPanel(string $id): ?IBarPanel
 	{
-		return isset($this->panels[$id]) ? $this->panels[$id] : null;
+		return $this->panels[$id] ?? null;
 	}
 
 
 	/**
 	 * Renders loading <script>
-	 * @return void
 	 */
-	public function renderLoader()
+	public function renderLoader(): void
 	{
 		if (!$this->useSession) {
 			throw new \LogicException('Start session before Tracy is enabled.');
@@ -71,9 +68,8 @@ public function renderLoader()
 
 	/**
 	 * Renders debug bar.
-	 * @return void
 	 */
-	public function render()
+	public function render(): void
 	{
 		$useSession = $this->useSession && session_status() === PHP_SESSION_ACTIVE;
 		$redirectQueue = &$_SESSION['_tracy']['redirect'];
@@ -128,10 +124,7 @@ public function render()
 	}
 
 
-	/**
-	 * @return string
-	 */
-	private static function renderHtmlRows(array $rows)
+	private static function renderHtmlRows(array $rows): string
 	{
 		ob_start(function () {});
 		require __DIR__ . '/assets/Bar/panels.phtml';
@@ -140,12 +133,9 @@ private static function renderHtmlRows(array $rows)
 	}
 
 
-	/**
-	 * @return array
-	 */
-	private function renderPanels($suffix = null)
+	private function renderPanels(string $suffix = null): array
 	{
-		set_error_handler(function ($severity, $message, $file, $line) {
+		set_error_handler(function (int $severity, string $message, string $file, int $line) {
 			if (error_reporting() & $severity) {
 				throw new \ErrorException($message, 0, $severity, $file, $line);
 			}
@@ -157,16 +147,10 @@ private function renderPanels($suffix = null)
 		foreach ($this->panels as $id => $panel) {
 			$idHtml = preg_replace('#[^a-z0-9]+#i', '-', $id) . $suffix;
 			try {
-				$tab = (string) $panel->getTab();
-				$panelHtml = $tab ? (string) $panel->getPanel() : null;
-				if ($tab && $panel instanceof \Nette\Diagnostics\IBarPanel) {
-					$e = new \Exception('Support for Nette\Diagnostics\IBarPanel is deprecated');
-				}
+				$tab = $panel->getTab();
+				$panelHtml = $tab ? $panel->getPanel() : null;
 
-			} catch (\Exception $e) {
 			} catch (\Throwable $e) {
-			}
-			if (isset($e)) {
 				while (ob_get_level() > $obLevel) { // restore ob-level if broken
 					ob_end_clean();
 				}
@@ -185,11 +169,10 @@ private function renderPanels($suffix = null)
 
 	/**
 	 * Renders debug bar assets.
-	 * @return bool
 	 */
-	public function dispatchAssets()
+	public function dispatchAssets(): bool
 	{
-		$asset = isset($_GET['_tracy_bar']) ? $_GET['_tracy_bar'] : null;
+		$asset = $_GET['_tracy_bar'] ?? null;
 		if ($asset === 'js') {
 			header('Content-Type: text/javascript');
 			header('Cache-Control: max-age=864000');
@@ -230,7 +213,7 @@ public function dispatchAssets()
 	}
 
 
-	private function renderAssets()
+	private function renderAssets(): void
 	{
 		$css = array_map('file_get_contents', array_merge([
 			__DIR__ . '/assets/Bar/bar.css',
diff --git a/src/Tracy/BlueScreen.php b/src/Tracy/BlueScreen.php
index 51f92ce53..237fd2af7 100644
--- a/src/Tracy/BlueScreen.php
+++ b/src/Tracy/BlueScreen.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -42,10 +44,9 @@ public function __construct()
 
 	/**
 	 * Add custom panel.
-	 * @param  callable  $panel
 	 * @return static
 	 */
-	public function addPanel($panel)
+	public function addPanel(callable $panel): self
 	{
 		if (!in_array($panel, $this->panels, true)) {
 			$this->panels[] = $panel;
@@ -56,10 +57,9 @@ public function addPanel($panel)
 
 	/**
 	 * Add action.
-	 * @param  callable  $action
 	 * @return static
 	 */
-	public function addAction($action)
+	public function addAction(callable $action): self
 	{
 		$this->actions[] = $action;
 		return $this;
@@ -68,10 +68,8 @@ public function addAction($action)
 
 	/**
 	 * Renders blue screen.
-	 * @param  \Exception|\Throwable  $exception
-	 * @return void
 	 */
-	public function render($exception)
+	public function render(\Throwable $exception): void
 	{
 		if (Helpers::isAjax() && session_status() === PHP_SESSION_ACTIVE) {
 			ob_start(function () {});
@@ -87,11 +85,8 @@ public function render($exception)
 
 	/**
 	 * Renders blue screen to file (if file exists, it will not be overwritten).
-	 * @param  \Exception|\Throwable  $exception
-	 * @param  string  $file file path
-	 * @return void
 	 */
-	public function renderToFile($exception, $file)
+	public function renderToFile(\Throwable $exception, string $file): void
 	{
 		if ($handle = @fopen($file, 'x')) {
 			ob_start(); // double buffer prevents sending HTTP headers in some PHP
@@ -104,7 +99,7 @@ public function renderToFile($exception, $file)
 	}
 
 
-	private function renderTemplate($exception, $template)
+	private function renderTemplate(\Throwable $exception, string $template): void
 	{
 		$messageHtml = preg_replace(
 			'#\'\S[^\']*\S\'|"\S[^"]*\S"#U',
@@ -118,7 +113,7 @@ private function renderTemplate($exception, $template)
 			? Helpers::errorTypeToString($exception->getSeverity())
 			: Helpers::getClass($exception);
 		$lastError = $exception instanceof \ErrorException || $exception instanceof \Error ? null : error_get_last();
-		$dump = function ($v) {
+		$dump = function ($v): string {
 			return Dumper::toHtml($v, [
 				Dumper::DEPTH => $this->maxDepth,
 				Dumper::TRUNCATE => $this->maxLength,
@@ -140,19 +135,18 @@ private function renderTemplate($exception, $template)
 	/**
 	 * @return \stdClass[]
 	 */
-	private function renderPanels($ex)
+	private function renderPanels(?\Throwable $ex): array
 	{
 		$obLevel = ob_get_level();
 		$res = [];
 		foreach ($this->panels as $callback) {
 			try {
-				$panel = call_user_func($callback, $ex);
+				$panel = $callback($ex);
 				if (empty($panel['tab']) || empty($panel['panel'])) {
 					continue;
 				}
 				$res[] = (object) $panel;
 				continue;
-			} catch (\Exception $e) {
 			} catch (\Throwable $e) {
 			}
 			while (ob_get_level() > $obLevel) { // restore ob-level if broken
@@ -171,7 +165,7 @@ private function renderPanels($ex)
 	/**
 	 * @return array[]
 	 */
-	private function renderActions($ex)
+	private function renderActions(\Throwable $ex): array
 	{
 		$actions = [];
 		foreach ($this->actions as $callback) {
@@ -216,12 +210,8 @@ private function renderActions($ex)
 
 	/**
 	 * Returns syntax highlighted source code.
-	 * @param  string  $file
-	 * @param  int  $line
-	 * @param  int  $lines
-	 * @return string|null
 	 */
-	public static function highlightFile($file, $line, $lines = 15, array $vars = null)
+	public static function highlightFile(string $file, int $line, int $lines = 15, array $vars = null): ?string
 	{
 		$source = @file_get_contents($file); // @ file may not exist
 		if ($source) {
@@ -236,12 +226,8 @@ public static function highlightFile($file, $line, $lines = 15, array $vars = nu
 
 	/**
 	 * Returns syntax highlighted source code.
-	 * @param  string  $source
-	 * @param  int  $line
-	 * @param  int  $lines
-	 * @return string
 	 */
-	public static function highlightPhp($source, $line, $lines = 15, array $vars = null)
+	public static function highlightPhp(string $source, int $line, int $lines = 15, array $vars = null): string
 	{
 		if (function_exists('ini_set')) {
 			ini_set('highlight.comment', '#998; font-style: italic');
@@ -258,7 +244,7 @@ public static function highlightPhp($source, $line, $lines = 15, array $vars = n
 		$out .= static::highlightLine($source, $line, $lines);
 
 		if ($vars) {
-			$out = preg_replace_callback('#">\$(\w+)(&nbsp;)?</span>#', function ($m) use ($vars) {
+			$out = preg_replace_callback('#">\$(\w+)(&nbsp;)?</span>#', function ($m) use ($vars): string {
 				return array_key_exists($m[1], $vars)
 					? '" title="'
 						. str_replace('"', '&quot;', trim(strip_tags(Dumper::toHtml($vars[$m[1]], [Dumper::DEPTH => 1]))))
@@ -274,9 +260,8 @@ public static function highlightPhp($source, $line, $lines = 15, array $vars = n
 
 	/**
 	 * Returns highlighted line in HTML code.
-	 * @return string
 	 */
-	public static function highlightLine($html, $line, $lines = 15)
+	public static function highlightLine(string $html, int $line, int $lines = 15): string
 	{
 		$source = explode("\n", "\n" . str_replace("\r\n", "\n", $html));
 		$out = '';
@@ -318,10 +303,8 @@ public static function highlightLine($html, $line, $lines = 15)
 
 	/**
 	 * Should a file be collapsed in stack trace?
-	 * @param  string  $file
-	 * @return bool
 	 */
-	public function isCollapsed($file)
+	public function isCollapsed(string $file): bool
 	{
 		$file = strtr($file, '\\', '/') . '/';
 		foreach ($this->collapsePaths as $path) {
diff --git a/src/Tracy/BlueScreenLogger.php b/src/Tracy/BlueScreenLogger.php
new file mode 100644
index 000000000..c71e80463
--- /dev/null
+++ b/src/Tracy/BlueScreenLogger.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * This file is part of the Tracy (https://tracy.nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Tracy;
+
+
+/**
+ * Logger which generates BlueScreen file.
+ */
+class BlueScreenLogger implements ILogger
+{
+	/** @var string|null name of the directory where errors should be logged */
+	public $directory;
+
+	/** @var BlueScreen */
+	private $blueScreen;
+
+
+	public function __construct(?string $directory, ?BlueScreen $blueScreen = null)
+	{
+		$this->directory = $directory;
+		$this->blueScreen = $blueScreen;
+	}
+
+
+	public function log($message, string $priority = self::INFO): ?string
+	{
+		if (!$this->directory) {
+			throw new \LogicException('Logging directory is not specified.');
+
+		} elseif (!is_dir($this->directory)) {
+			throw new \RuntimeException("Logging directory '$this->directory' is not found or is not directory.");
+		}
+
+		if ($message instanceof \Throwable) {
+			return $this->logException($message);
+		}
+
+		return null;
+	}
+
+
+	public function getExceptionFile(\Throwable $exception): string
+	{
+		while ($exception) {
+			$data[] = [
+				get_class($exception), $exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine(),
+				array_map(function ($item) { unset($item['args']); return $item; }, $exception->getTrace()),
+			];
+			$exception = $exception->getPrevious();
+		}
+		$hash = substr(md5(serialize($data)), 0, 10);
+		$dir = strtr($this->directory . '/', '\\/', DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR);
+		foreach (new \DirectoryIterator($this->directory) as $file) {
+			if (strpos($file->getBasename(), $hash)) {
+				return $dir . $file;
+			}
+		}
+		return $dir . 'exception--' . @date('Y-m-d--H-i') . "--$hash.html"; // @ timezone may not be set
+	}
+
+
+	/**
+	 * Logs exception to the file if file doesn't exist.
+	 * @return string logged error filename
+	 */
+	protected function logException(\Throwable $exception, ?string $file = null): string
+	{
+		$file = $file ?? $this->getExceptionFile($exception);
+		$bs = $this->blueScreen ?? new BlueScreen;
+		$bs->renderToFile($exception, $file);
+		return $file;
+	}
+}
diff --git a/src/Tracy/Debugger.php b/src/Tracy/Debugger.php
index 5a6423400..d9eb53560 100644
--- a/src/Tracy/Debugger.php
+++ b/src/Tracy/Debugger.php
@@ -5,9 +5,12 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 use ErrorException;
+use Tracy;
 
 
 /**
@@ -15,15 +18,15 @@
  */
 class Debugger
 {
-	const VERSION = '2.5.2';
+	public const VERSION = '3.0-dev';
 
 	/** server modes for Debugger::enable() */
-	const
+	public const
 		DEVELOPMENT = false,
 		PRODUCTION = true,
 		DETECT = null;
 
-	const COOKIE_SECRET = 'tracy-debug';
+	public const COOKIE_SECRET = 'tracy-debug';
 
 	/** @var bool in production mode is suppressed any debugging output */
 	public static $productionMode = self::DETECT;
@@ -65,9 +68,6 @@ class Debugger
 	/** @var bool display location by dump()? */
 	public static $showLocation = false;
 
-	/** @deprecated */
-	public static $maxLen = 150;
-
 	/********************* logging ****************d*g**/
 
 	/** @var string|null name of the directory where errors should be logged */
@@ -80,7 +80,7 @@ class Debugger
 	public static $email;
 
 	/** for Debugger::log() and Debugger::fireLog() */
-	const
+	public const
 		DEBUG = ILogger::DEBUG,
 		INFO = ILogger::INFO,
 		WARNING = ILogger::WARNING,
@@ -140,20 +140,18 @@ final public function __construct()
 
 	/**
 	 * Enables displaying or logging errors and exceptions.
-	 * @param  mixed   $mode  production, development mode, autodetection or IP address(es) whitelist.
-	 * @param  string  $logDirectory  error log directory
-	 * @param  string  $email  administrator email; enables email sending in production mode
-	 * @return void
+	 * @param  mixed           $mode  production, development mode, autodetection or IP address(es) whitelist.
+	 * @param  string|ILogger  $logDirectoryOrLogger  error log directory or logger instance
+	 * @param  string          $email  administrator email; enables email sending in production mode
 	 */
-	public static function enable($mode = null, $logDirectory = null, $email = null)
+	public static function enable($mode = null, $logDirectoryOrLogger = null, string $email = null)
 	{
 		if ($mode !== null || self::$productionMode === null) {
 			self::$productionMode = is_bool($mode) ? $mode : !self::detectDebugMode($mode);
 		}
 
-		self::$maxLen = &self::$maxLength;
 		self::$reserved = str_repeat('t', 30000);
-		self::$time = isset($_SERVER['REQUEST_TIME_FLOAT']) ? $_SERVER['REQUEST_TIME_FLOAT'] : microtime(true);
+		self::$time = $_SERVER['REQUEST_TIME_FLOAT'] ?? microtime(true);
 		self::$obLevel = ob_get_level();
 		self::$cpuUsage = !self::$productionMode && function_exists('getrusage') ? getrusage() : null;
 
@@ -161,8 +159,10 @@ public static function enable($mode = null, $logDirectory = null, $email = null)
 		if ($email !== null) {
 			self::$email = $email;
 		}
-		if ($logDirectory !== null) {
-			self::$logDirectory = $logDirectory;
+		if (is_string($logDirectoryOrLogger)) {
+			self::$logDirectory = $logDirectoryOrLogger;
+		} elseif ($logDirectoryOrLogger instanceof ILogger) {
+			self::$logger = $logDirectoryOrLogger;
 		}
 		if (self::$logDirectory) {
 			if (!preg_match('#([a-z]+:)?[/\\\\]#Ai', self::$logDirectory)) {
@@ -204,10 +204,7 @@ public static function enable($mode = null, $logDirectory = null, $email = null)
 	}
 
 
-	/**
-	 * @return void
-	 */
-	public static function dispatch()
+	public static function dispatch(): void
 	{
 		if (self::$productionMode || PHP_SAPI === 'cli') {
 			return;
@@ -235,9 +232,8 @@ public static function dispatch()
 
 	/**
 	 * Renders loading <script>
-	 * @return void
 	 */
-	public static function renderLoader()
+	public static function renderLoader(): void
 	{
 		if (!self::$productionMode) {
 			self::getBar()->renderLoader();
@@ -245,10 +241,7 @@ public static function renderLoader()
 	}
 
 
-	/**
-	 * @return bool
-	 */
-	public static function isEnabled()
+	public static function isEnabled(): bool
 	{
 		return self::$enabled;
 	}
@@ -256,10 +249,9 @@ public static function isEnabled()
 
 	/**
 	 * Shutdown handler to catch fatal errors and execute of the planned activities.
-	 * @return void
 	 * @internal
 	 */
-	public static function shutdownHandler()
+	public static function shutdownHandler(): void
 	{
 		if (!self::$reserved) {
 			return;
@@ -282,11 +274,9 @@ public static function shutdownHandler()
 
 	/**
 	 * Handler to catch uncaught exception.
-	 * @param  \Exception|\Throwable  $exception
-	 * @return void
 	 * @internal
 	 */
-	public static function exceptionHandler($exception, $exit = true)
+	public static function exceptionHandler(\Throwable $exception, bool $exit = true): void
 	{
 		if (!self::$reserved && $exit) {
 			return;
@@ -306,7 +296,6 @@ public static function exceptionHandler($exception, $exit = true)
 		if (self::$productionMode) {
 			try {
 				self::log($exception, self::EXCEPTION);
-			} catch (\Exception $e) {
 			} catch (\Throwable $e) {
 			}
 
@@ -326,37 +315,28 @@ public static function exceptionHandler($exception, $exit = true)
 
 		} else {
 			self::fireLog($exception);
-			$s = get_class($exception) . ($exception->getMessage() === '' ? '' : ': ' . $exception->getMessage())
-				. ' in ' . $exception->getFile() . ':' . $exception->getLine()
-				. "\nStack trace:\n" . $exception->getTraceAsString();
 			try {
 				$file = self::log($exception, self::EXCEPTION);
 				if ($file && !headers_sent()) {
 					header("X-Tracy-Error-Log: $file");
 				}
-				echo "$s\n" . ($file ? "(stored in $file)\n" : '');
+				echo "$exception\n" . ($file ? "(stored in $file)\n" : '');
 				if ($file && self::$browser) {
 					exec(self::$browser . ' ' . escapeshellarg($file));
 				}
-			} catch (\Exception $e) {
-				echo "$s\nUnable to log error: {$e->getMessage()}\n";
 			} catch (\Throwable $e) {
-				echo "$s\nUnable to log error: {$e->getMessage()}\n";
+				echo "$exception\nUnable to log error: {$e->getMessage()}\n";
 			}
 		}
 
 		try {
 			$e = null;
 			foreach (self::$onFatalError as $handler) {
-				call_user_func($handler, $exception);
+				$handler($exception);
 			}
-		} catch (\Exception $e) {
 		} catch (\Throwable $e) {
-		}
-		if ($e) {
 			try {
 				self::log($e, self::EXCEPTION);
-			} catch (\Exception $e) {
 			} catch (\Throwable $e) {
 			}
 		}
@@ -373,7 +353,7 @@ public static function exceptionHandler($exception, $exit = true)
 	 * @throws ErrorException
 	 * @internal
 	 */
-	public static function errorHandler($severity, $message, $file, $line, $context = [])
+	public static function errorHandler(int $severity, string $message, string $file, int $line, array $context = []): ?bool
 	{
 		if (self::$scream) {
 			error_reporting(E_ALL);
@@ -381,7 +361,7 @@ public static function errorHandler($severity, $message, $file, $line, $context
 
 		if ($severity === E_RECOVERABLE_ERROR || $severity === E_USER_ERROR) {
 			if (Helpers::findTrace(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), '*::__toString')) {
-				$previous = isset($context['e']) && ($context['e'] instanceof \Exception || $context['e'] instanceof \Throwable) ? $context['e'] : null;
+				$previous = isset($context['e']) && $context['e'] instanceof \Throwable ? $context['e'] : null;
 				$e = new ErrorException($message, 0, $severity, $file, $line, $previous);
 				$e->context = $context;
 				self::exceptionHandler($e);
@@ -400,7 +380,6 @@ public static function errorHandler($severity, $message, $file, $line, $context
 			Helpers::improveException($e);
 			try {
 				self::log($e, self::ERROR);
-			} catch (\Exception $foo) {
 			} catch (\Throwable $foo) {
 			}
 			return null;
@@ -425,7 +404,6 @@ public static function errorHandler($severity, $message, $file, $line, $context
 		} elseif (self::$productionMode) {
 			try {
 				self::log("$message in $file:$line", self::ERROR);
-			} catch (\Exception $foo) {
 			} catch (\Throwable $foo) {
 			}
 			return null;
@@ -437,7 +415,7 @@ public static function errorHandler($severity, $message, $file, $line, $context
 	}
 
 
-	private static function removeOutputBuffers($errorOccurred)
+	private static function removeOutputBuffers(bool $errorOccurred): void
 	{
 		while (ob_get_level() > self::$obLevel) {
 			$status = ob_get_status();
@@ -455,16 +433,13 @@ private static function removeOutputBuffers($errorOccurred)
 	/********************* services ****************d*g**/
 
 
-	/**
-	 * @return BlueScreen
-	 */
-	public static function getBlueScreen()
+	public static function getBlueScreen(): BlueScreen
 	{
 		if (!self::$blueScreen) {
 			self::$blueScreen = new BlueScreen;
 			self::$blueScreen->info = [
 				'PHP ' . PHP_VERSION,
-				isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null,
+				$_SERVER['SERVER_SOFTWARE'] ?? null,
 				'Tracy ' . self::VERSION,
 			];
 		}
@@ -472,10 +447,7 @@ public static function getBlueScreen()
 	}
 
 
-	/**
-	 * @return Bar
-	 */
-	public static function getBar()
+	public static function getBar(): Bar
 	{
 		if (!self::$bar) {
 			self::$bar = new Bar;
@@ -487,33 +459,24 @@ public static function getBar()
 	}
 
 
-	/**
-	 * @return void
-	 */
-	public static function setLogger(ILogger $logger)
+	public static function setLogger(ILogger $logger): void
 	{
 		self::$logger = $logger;
 	}
 
 
-	/**
-	 * @return ILogger
-	 */
-	public static function getLogger()
+	public static function getLogger(): ILogger
 	{
 		if (!self::$logger) {
 			self::$logger = new Logger(self::$logDirectory, self::$email, self::getBlueScreen());
-			self::$logger->directory = &self::$logDirectory; // back compatiblity
-			self::$logger->email = &self::$email;
+			self::$logDirectory = &self::$logger->directory; // back compatibility
+			self::$email = &self::$logger->email;
 		}
 		return self::$logger;
 	}
 
 
-	/**
-	 * @return ILogger
-	 */
-	public static function getFireLogger()
+	public static function getFireLogger(): ILogger
 	{
 		if (!self::$fireLogger) {
 			self::$fireLogger = new FireLogger;
@@ -532,7 +495,7 @@ public static function getFireLogger()
 	 * @param  bool   $return  return output instead of printing it? (bypasses $productionMode)
 	 * @return mixed  variable itself or dump
 	 */
-	public static function dump($var, $return = false)
+	public static function dump($var, bool $return = false)
 	{
 		if ($return) {
 			ob_start(function () {});
@@ -556,10 +519,9 @@ public static function dump($var, $return = false)
 
 	/**
 	 * Starts/stops stopwatch.
-	 * @param  string  $name
 	 * @return float   elapsed seconds
 	 */
-	public static function timer($name = null)
+	public static function timer(string $name = null): float
 	{
 		static $time = [];
 		$now = microtime(true);
@@ -573,11 +535,9 @@ public static function timer($name = null)
 	 * Dumps information about a variable in Tracy Debug Bar.
 	 * @tracySkipLocation
 	 * @param  mixed  $var
-	 * @param  string $title
-	 * @param  array  $options
 	 * @return mixed  variable itself
 	 */
-	public static function barDump($var, $title = null, array $options = null)
+	public static function barDump($var, string $title = null, array $options = null)
 	{
 		if (!self::$productionMode) {
 			static $panel;
@@ -599,7 +559,7 @@ public static function barDump($var, $title = null, array $options = null)
 	 * @param  mixed  $message
 	 * @return mixed
 	 */
-	public static function log($message, $priority = ILogger::INFO)
+	public static function log($message, string $priority = ILogger::INFO)
 	{
 		return self::getLogger()->log($message, $priority);
 	}
@@ -608,26 +568,22 @@ public static function log($message, $priority = ILogger::INFO)
 	/**
 	 * Sends message to FireLogger console.
 	 * @param  mixed  $message
-	 * @return bool   was successful?
 	 */
-	public static function fireLog($message)
+	public static function fireLog($message): bool
 	{
-		if (!self::$productionMode && self::$showFireLogger) {
-			return self::getFireLogger()->log($message);
-		}
+		return !self::$productionMode && self::$showFireLogger
+			? self::getFireLogger()->log($message)
+			: false;
 	}
 
 
 	/**
 	 * Detects debug mode by IP address.
 	 * @param  string|array  $list  IP addresses or computer names whitelist detection
-	 * @return bool
 	 */
-	public static function detectDebugMode($list = null)
+	public static function detectDebugMode($list = null): bool
 	{
-		$addr = isset($_SERVER['REMOTE_ADDR'])
-			? $_SERVER['REMOTE_ADDR']
-			: php_uname('n');
+		$addr = $_SERVER['REMOTE_ADDR'] ?? php_uname('n');
 		$secret = isset($_COOKIE[self::COOKIE_SECRET]) && is_string($_COOKIE[self::COOKIE_SECRET])
 			? $_COOKIE[self::COOKIE_SECRET]
 			: null;
diff --git a/src/Tracy/DefaultBarPanel.php b/src/Tracy/DefaultBarPanel.php
index f34e2b4f4..d53624790 100644
--- a/src/Tracy/DefaultBarPanel.php
+++ b/src/Tracy/DefaultBarPanel.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -19,7 +21,7 @@ class DefaultBarPanel implements IBarPanel
 	private $id;
 
 
-	public function __construct($id)
+	public function __construct(string $id)
 	{
 		$this->id = $id;
 	}
@@ -27,9 +29,8 @@ public function __construct($id)
 
 	/**
 	 * Renders HTML code for custom tab.
-	 * @return string
 	 */
-	public function getTab()
+	public function getTab(): string
 	{
 		ob_start(function () {});
 		$data = $this->data;
@@ -40,9 +41,8 @@ public function getTab()
 
 	/**
 	 * Renders HTML code for custom panel.
-	 * @return string
 	 */
-	public function getPanel()
+	public function getPanel(): string
 	{
 		ob_start(function () {});
 		if (is_file(__DIR__ . "/assets/Bar/{$this->id}.panel.phtml")) {
diff --git a/src/Tracy/Dumper.php b/src/Tracy/Dumper.php
index 650473160..1a1c9e810 100644
--- a/src/Tracy/Dumper.php
+++ b/src/Tracy/Dumper.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -13,7 +15,7 @@
  */
 class Dumper
 {
-	const
+	public const
 		DEPTH = 'depth', // how many nested levels of array/object properties display (defaults to 4)
 		TRUNCATE = 'truncate', // how truncate long strings? (defaults to 150)
 		COLLAPSE = 'collapse', // collapse top array/object or how big are collapsed? (defaults to 14)
@@ -23,7 +25,7 @@ class Dumper
 		LIVE = 'live', // will be rendered using JavaScript
 		DEBUGINFO = 'debuginfo'; // use magic method __debugInfo if exists (defaults to false)
 
-	const
+	public const
 		LOCATION_SOURCE = 0b0001, // shows where dump was called
 		LOCATION_LINK = 0b0010, // appends clickable anchor
 		LOCATION_CLASS = 0b0100; // shows where class is defined
@@ -83,9 +85,8 @@ public static function dump($var, array $options = null)
 
 	/**
 	 * Dumps variable to HTML.
-	 * @return string
 	 */
-	public static function toHtml($var, array $options = null)
+	public static function toHtml($var, array $options = null): string
 	{
 		$options = (array) $options + [
 			self::DEPTH => 4,
@@ -99,12 +100,12 @@ public static function toHtml($var, array $options = null)
 		$loc = $loc === true ? ~0 : (int) $loc;
 
 		$options[self::OBJECT_EXPORTERS] = (array) $options[self::OBJECT_EXPORTERS] + self::$objectExporters;
-		uksort($options[self::OBJECT_EXPORTERS], function ($a, $b) {
+		uksort($options[self::OBJECT_EXPORTERS], function ($a, $b): int {
 			return $b === '' || (class_exists($a, false) && is_subclass_of($a, $b)) ? -1 : 1;
 		});
 
 		$live = !empty($options[self::LIVE]) && $var && (is_array($var) || is_object($var) || is_resource($var));
-		list($file, $line, $code) = $loc ? self::findLocation() : null;
+		[$file, $line, $code] = $loc ? self::findLocation() : null;
 		$locAttrs = $file && $loc & self::LOCATION_SOURCE ? Helpers::formatHtml(
 			' title="%in file % on line %" data-tracy-href="%"', "$code\n", $file, $line, Helpers::editorUri($file, $line)
 		) : null;
@@ -120,9 +121,8 @@ public static function toHtml($var, array $options = null)
 
 	/**
 	 * Dumps variable to plain text.
-	 * @return string
 	 */
-	public static function toText($var, array $options = null)
+	public static function toText($var, array $options = null): string
 	{
 		return htmlspecialchars_decode(strip_tags(self::toHtml($var, $options)), ENT_QUOTES);
 	}
@@ -130,11 +130,10 @@ public static function toText($var, array $options = null)
 
 	/**
 	 * Dumps variable to x-terminal.
-	 * @return string
 	 */
-	public static function toTerminal($var, array $options = null)
+	public static function toTerminal($var, array $options = null): string
 	{
-		return htmlspecialchars_decode(strip_tags(preg_replace_callback('#<span class="tracy-dump-(\w+)">|</span>#', function ($m) {
+		return htmlspecialchars_decode(strip_tags(preg_replace_callback('#<span class="tracy-dump-(\w+)">|</span>#', function ($m): string {
 			return "\033[" . (isset($m[1], self::$terminalColors[$m[1]]) ? self::$terminalColors[$m[1]] : '0') . 'm';
 		}, self::toHtml($var, $options))), ENT_QUOTES);
 	}
@@ -143,11 +142,8 @@ public static function toTerminal($var, array $options = null)
 	/**
 	 * Internal toHtml() dump implementation.
 	 * @param  mixed  $var
-	 * @param  array  $options
-	 * @param  int  $level  recursion level
-	 * @return string
 	 */
-	private static function dumpVar(&$var, array $options, $level = 0)
+	private static function dumpVar(&$var, array $options, int $level = 0): string
 	{
 		if (method_exists(__CLASS__, $m = 'dump' . gettype($var))) {
 			return self::$m($var, $options, $level);
@@ -157,34 +153,34 @@ private static function dumpVar(&$var, array $options, $level = 0)
 	}
 
 
-	private static function dumpNull()
+	private static function dumpNull(): string
 	{
 		return "<span class=\"tracy-dump-null\">null</span>\n";
 	}
 
 
-	private static function dumpBoolean(&$var)
+	private static function dumpBoolean(&$var): string
 	{
 		return '<span class="tracy-dump-bool">' . ($var ? 'true' : 'false') . "</span>\n";
 	}
 
 
-	private static function dumpInteger(&$var)
+	private static function dumpInteger(&$var): string
 	{
 		return "<span class=\"tracy-dump-number\">$var</span>\n";
 	}
 
 
-	private static function dumpDouble(&$var)
+	private static function dumpDouble(&$var): string
 	{
 		$var = is_finite($var)
 			? ($tmp = json_encode($var)) . (strpos($tmp, '.') === false ? '.0' : '')
-			: str_replace('.0', '', var_export($var, true)); // workaround for PHP 7.0.2
+			: var_export($var, true);
 		return "<span class=\"tracy-dump-number\">$var</span>\n";
 	}
 
 
-	private static function dumpString(&$var, $options)
+	private static function dumpString(&$var, array $options): string
 	{
 		return '<span class="tracy-dump-string">"'
 			. Helpers::escapeHtml(self::encodeString($var, $options[self::TRUNCATE]))
@@ -192,7 +188,7 @@ private static function dumpString(&$var, $options)
 	}
 
 
-	private static function dumpArray(&$var, $options, $level)
+	private static function dumpArray(&$var, array $options, int $level): string
 	{
 		static $marker;
 		if ($marker === null) {
@@ -230,14 +226,14 @@ private static function dumpArray(&$var, $options, $level)
 	}
 
 
-	private static function dumpObject(&$var, $options, $level)
+	private static function dumpObject(&$var, array $options, int $level): string
 	{
 		$fields = self::exportObject($var, $options[self::OBJECT_EXPORTERS], $options[self::DEBUGINFO]);
 
 		$editorAttributes = '';
 		if ($options[self::LOCATION] & self::LOCATION_CLASS) {
 			$rc = $var instanceof \Closure ? new \ReflectionFunction($var) : new \ReflectionClass($var);
-			$editor = Helpers::editorUri($rc->getFileName(), $rc->getStartLine());
+			$editor = $rc->getFileName() ? Helpers::editorUri($rc->getFileName(), $rc->getStartLine()) : null;
 			if ($editor) {
 				$editorAttributes = Helpers::formatHtml(
 					' title="Declared in file % on line %" data-tracy-href="%"',
@@ -285,14 +281,14 @@ private static function dumpObject(&$var, $options, $level)
 	}
 
 
-	private static function dumpResource(&$var, $options, $level)
+	private static function dumpResource(&$var, array $options, int $level): string
 	{
 		$type = get_resource_type($var);
 		$out = '<span class="tracy-dump-resource">' . Helpers::escapeHtml($type) . ' resource</span> '
 			. '<span class="tracy-dump-hash">#' . (int) $var . '</span>';
 		if (isset(self::$resources[$type])) {
 			$out = "<span class=\"tracy-toggle tracy-collapsed\">$out</span>\n<div class=\"tracy-collapsed\">";
-			foreach (call_user_func(self::$resources[$type], $var) as $k => $v) {
+			foreach ((self::$resources[$type])($var) as $k => $v) {
 				$out .= '<span class="tracy-dump-indent">   ' . str_repeat('|  ', $level) . '</span>'
 					. '<span class="tracy-dump-key">' . Helpers::escapeHtml($k) . '</span> => ' . self::dumpVar($v, $options, $level + 1);
 			}
@@ -305,7 +301,7 @@ private static function dumpResource(&$var, $options, $level)
 	/**
 	 * @return mixed
 	 */
-	private static function toJson(&$var, $options, $level = 0)
+	private static function toJson(&$var, array $options, int $level = 0)
 	{
 		if (is_bool($var) || $var === null || is_int($var)) {
 			return $var;
@@ -346,7 +342,7 @@ private static function toJson(&$var, $options, $level = 0)
 			$editorInfo = null;
 			if ($options[self::LOCATION] & self::LOCATION_CLASS) {
 				$rc = $var instanceof \Closure ? new \ReflectionFunction($var) : new \ReflectionClass($var);
-				$editor = Helpers::editorUri($rc->getFileName(), $rc->getStartLine());
+				$editor = $rc->getFileName() ? Helpers::editorUri($rc->getFileName(), $rc->getStartLine()) : null;
 				$editorInfo = $editor ? ['file' => $rc->getFileName(), 'line' => $rc->getStartLine(), 'url' => $editor] : null;
 			}
 			static $counter = 1;
@@ -380,7 +376,7 @@ private static function toJson(&$var, $options, $level = 0)
 				$type = get_resource_type($var);
 				$obj = ['id' => self::$livePrefix . (int) $var, 'name' => $type . ' resource'];
 				if (isset(self::$resources[$type])) {
-					foreach (call_user_func(self::$resources[$type], $var) as $k => $v) {
+					foreach ((self::$resources[$type])($var) as $k => $v) {
 						$obj['items'][] = [$k, self::toJson($v, $options, $level + 1)];
 					}
 				}
@@ -393,8 +389,7 @@ private static function toJson(&$var, $options, $level = 0)
 	}
 
 
-	/** @return array  */
-	public static function fetchLiveData()
+	public static function fetchLiveData(): array
 	{
 		$res = [];
 		foreach (self::$liveStorage as $obj) {
@@ -409,9 +404,8 @@ public static function fetchLiveData()
 
 	/**
 	 * @internal
-	 * @return string UTF-8
 	 */
-	public static function encodeString($s, $maxLength = null)
+	public static function encodeString(string $s, int $maxLength = null): string
 	{
 		static $table;
 		if ($table === null) {
@@ -453,14 +447,11 @@ public static function encodeString($s, $maxLength = null)
 	}
 
 
-	/**
-	 * @return array
-	 */
-	private static function exportObject($obj, array $exporters, $useDebugInfo)
+	private static function exportObject($obj, array $exporters, bool $useDebugInfo): array
 	{
 		foreach ($exporters as $type => $dumper) {
 			if (!$type || $obj instanceof $type) {
-				return call_user_func($dumper, $obj);
+				return $dumper($obj);
 			}
 		}
 
@@ -472,10 +463,7 @@ private static function exportObject($obj, array $exporters, $useDebugInfo)
 	}
 
 
-	/**
-	 * @return array
-	 */
-	private static function exportClosure(\Closure $obj)
+	private static function exportClosure(\Closure $obj): array
 	{
 		$rc = new \ReflectionFunction($obj);
 		$res = [];
@@ -491,19 +479,13 @@ private static function exportClosure(\Closure $obj)
 	}
 
 
-	/**
-	 * @return array
-	 */
-	private static function exportSplFileInfo(\SplFileInfo $obj)
+	private static function exportSplFileInfo(\SplFileInfo $obj): array
 	{
 		return ['path' => $obj->getPathname()];
 	}
 
 
-	/**
-	 * @return array
-	 */
-	private static function exportSplObjectStorage(\SplObjectStorage $obj)
+	private static function exportSplObjectStorage(\SplObjectStorage $obj): array
 	{
 		$res = [];
 		foreach (clone $obj as $item) {
@@ -513,10 +495,7 @@ private static function exportSplObjectStorage(\SplObjectStorage $obj)
 	}
 
 
-	/**
-	 * @return array
-	 */
-	private static function exportPhpIncompleteClass(\__PHP_Incomplete_Class $obj)
+	private static function exportPhpIncompleteClass(\__PHP_Incomplete_Class $obj): array
 	{
 		$info = ['className' => null, 'private' => [], 'protected' => [], 'public' => []];
 		foreach ((array) $obj as $name => $value) {
@@ -538,7 +517,7 @@ private static function exportPhpIncompleteClass(\__PHP_Incomplete_Class $obj)
 	 * Finds the location where dump was called.
 	 * @return array|null [file, line, code]
 	 */
-	private static function findLocation()
+	private static function findLocation(): array
 	{
 		foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $item) {
 			if (isset($item['class']) && $item['class'] === __CLASS__) {
@@ -571,10 +550,7 @@ private static function findLocation()
 	}
 
 
-	/**
-	 * @return bool
-	 */
-	private static function detectColors()
+	private static function detectColors(): bool
 	{
 		return self::$terminalColors &&
 			(getenv('ConEmuANSI') === 'ON'
diff --git a/src/Tracy/FireLogger.php b/src/Tracy/FireLogger.php
index 0167bf67c..147d1b250 100644
--- a/src/Tracy/FireLogger.php
+++ b/src/Tracy/FireLogger.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -29,9 +31,8 @@ class FireLogger implements ILogger
 	/**
 	 * Sends message to FireLogger console.
 	 * @param  mixed  $message
-	 * @return bool    was successful?
 	 */
-	public function log($message, $priority = self::DEBUG)
+	public function log($message, string $priority = self::DEBUG): bool
 	{
 		if (!isset($_SERVER['HTTP_X_FIRELOGGER']) || headers_sent()) {
 			return false;
@@ -52,7 +53,7 @@ public function log($message, $priority = self::DEBUG)
 			$item['template'] = array_shift($args);
 		}
 
-		if (isset($args[0]) && ($args[0] instanceof \Exception || $args[0] instanceof \Throwable)) {
+		if (isset($args[0]) && $args[0] instanceof \Throwable) {
 			$e = array_shift($args);
 			$trace = $e->getTrace();
 			if (
@@ -114,10 +115,9 @@ public function log($message, $priority = self::DEBUG)
 	/**
 	 * Dump implementation for JSON.
 	 * @param  mixed  $var
-	 * @param  int  $level  recursion level
 	 * @return array|null|int|float|bool|string
 	 */
-	private function jsonDump(&$var, $level = 0)
+	private function jsonDump(&$var, int $level = 0)
 	{
 		if (is_bool($var) || $var === null || is_int($var) || is_float($var)) {
 			return $var;
diff --git a/src/Tracy/Helpers.php b/src/Tracy/Helpers.php
index 6c7ced40e..0723f0ca7 100644
--- a/src/Tracy/Helpers.php
+++ b/src/Tracy/Helpers.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -16,9 +18,8 @@ class Helpers
 
 	/**
 	 * Returns HTML link to editor.
-	 * @return string
 	 */
-	public static function editorLink($file, $line = null)
+	public static function editorLink(string $file, int $line = null): string
 	{
 		$file = strtr($origFile = $file, Debugger::$editorMapping);
 		if ($editor = self::editorUri($origFile, $line)) {
@@ -42,9 +43,8 @@ public static function editorLink($file, $line = null)
 
 	/**
 	 * Returns link to editor.
-	 * @return string|null
 	 */
-	public static function editorUri($file, $line = null, $action = 'open', $search = null, $replace = null)
+	public static function editorUri(string $file, int $line = null, string $action = 'open', string $search = '', string $replace = ''): ?string
 	{
 		if (Debugger::$editor && $file && ($action === 'create' || is_file($file))) {
 			$file = strtr($file, '/', DIRECTORY_SEPARATOR);
@@ -52,30 +52,31 @@ public static function editorUri($file, $line = null, $action = 'open', $search
 			return strtr(Debugger::$editor, [
 				'%action' => $action,
 				'%file' => rawurlencode($file),
-				'%line' => $line ? (int) $line : 1,
+				'%line' => $line ?: 1,
 				'%search' => rawurlencode($search),
 				'%replace' => rawurlencode($replace),
 			]);
 		}
+		return null;
 	}
 
 
-	public static function formatHtml($mask)
+	public static function formatHtml(string $mask): string
 	{
 		$args = func_get_args();
-		return preg_replace_callback('#%#', function () use (&$args, &$count) {
+		return preg_replace_callback('#%#', function () use (&$args, &$count): string {
 			return Helpers::escapeHtml($args[++$count]);
 		}, $mask);
 	}
 
 
-	public static function escapeHtml($s)
+	public static function escapeHtml($s): string
 	{
 		return htmlspecialchars((string) $s, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
 	}
 
 
-	public static function findTrace(array $trace, $method, &$index = null)
+	public static function findTrace(array $trace, string $method, int &$index = null): ?array
 	{
 		$m = explode('::', $method);
 		foreach ($trace as $i => $item) {
@@ -89,20 +90,18 @@ public static function findTrace(array $trace, $method, &$index = null)
 				return $item;
 			}
 		}
+		return null;
 	}
 
 
-	/**
-	 * @return string
-	 */
-	public static function getClass($obj)
+	public static function getClass($obj): string
 	{
 		return explode("\x00", get_class($obj))[0];
 	}
 
 
 	/** @internal */
-	public static function fixStack($exception)
+	public static function fixStack(\Throwable $exception): \Throwable
 	{
 		if (function_exists('xdebug_get_function_stack')) {
 			$stack = [];
@@ -110,7 +109,7 @@ public static function fixStack($exception)
 				$frame = [
 					'file' => $row['file'],
 					'line' => $row['line'],
-					'function' => isset($row['function']) ? $row['function'] : '*unknown*',
+					'function' => $row['function'] ?? '*unknown*',
 					'args' => [],
 				];
 				if (!empty($row['class'])) {
@@ -128,14 +127,14 @@ public static function fixStack($exception)
 
 
 	/** @internal */
-	public static function fixEncoding($s)
+	public static function fixEncoding(string $s): string
 	{
 		return htmlspecialchars_decode(htmlspecialchars($s, ENT_NOQUOTES | ENT_IGNORE, 'UTF-8'), ENT_NOQUOTES);
 	}
 
 
 	/** @internal */
-	public static function errorTypeToString($type)
+	public static function errorTypeToString(int $type): string
 	{
 		$types = [
 			E_ERROR => 'Fatal Error',
@@ -154,16 +153,16 @@ public static function errorTypeToString($type)
 			E_DEPRECATED => 'Deprecated',
 			E_USER_DEPRECATED => 'User Deprecated',
 		];
-		return isset($types[$type]) ? $types[$type] : 'Unknown error';
+		return $types[$type] ?? 'Unknown error';
 	}
 
 
 	/** @internal */
-	public static function getSource()
+	public static function getSource(): string
 	{
 		if (isset($_SERVER['REQUEST_URI'])) {
 			return (!empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off') ? 'https://' : 'http://')
-				. (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '')
+				. ($_SERVER['HTTP_HOST'] ?? '')
 				. $_SERVER['REQUEST_URI'];
 		} else {
 			return 'CLI (PID: ' . getmypid() . ')'
@@ -173,7 +172,7 @@ public static function getSource()
 
 
 	/** @internal */
-	public static function improveException($e)
+	public static function improveException(\Throwable $e): void
 	{
 		$message = $e->getMessage();
 		if (!$e instanceof \Error && !$e instanceof \ErrorException) {
@@ -223,10 +222,9 @@ public static function improveException($e)
 
 	/**
 	 * Finds the best suggestion.
-	 * @return string|null
 	 * @internal
 	 */
-	public static function getSuggestion(array $items, $value)
+	public static function getSuggestion(array $items, string $value): ?string
 	{
 		$best = null;
 		$min = (strlen($value) / 4 + 1) * 10 + .1;
@@ -242,7 +240,7 @@ public static function getSuggestion(array $items, $value)
 
 
 	/** @internal */
-	public static function isHtmlMode()
+	public static function isHtmlMode(): bool
 	{
 		return empty($_SERVER['HTTP_X_REQUESTED_WITH']) && empty($_SERVER['HTTP_X_TRACY_AJAX'])
 			&& PHP_SAPI !== 'cli'
@@ -251,17 +249,42 @@ public static function isHtmlMode()
 
 
 	/** @internal */
-	public static function isAjax()
+	public static function isAjax(): bool
 	{
 		return isset($_SERVER['HTTP_X_TRACY_AJAX']) && preg_match('#^\w{10}\z#', $_SERVER['HTTP_X_TRACY_AJAX']);
 	}
 
 
 	/** @internal */
-	public static function getNonce()
+	public static function getNonce(): ?string
 	{
 		return preg_match('#^Content-Security-Policy(?:-Report-Only)?:.*\sscript-src\s+(?:[^;]+\s)?\'nonce-([\w+/]+=*)\'#mi', implode("\n", headers_list()), $m)
 			? $m[1]
 			: null;
 	}
+
+
+	/**
+	 * @param  string|\Exception|\Throwable
+	 * @return string
+	 * @internal
+	 */
+	public static function formatMessage($message)
+	{
+		if ($message instanceof \Exception || $message instanceof \Throwable) {
+			while ($message) {
+				$tmp[] = ($message instanceof \ErrorException
+						? Helpers::errorTypeToString($message->getSeverity()) . ': ' . $message->getMessage()
+						: Helpers::getClass($message) . ': ' . $message->getMessage() . ($message->getCode() ? ' #' . $message->getCode() : '')
+					) . ' in ' . $message->getFile() . ':' . $message->getLine();
+				$message = $message->getPrevious();
+			}
+			$message = implode("\ncaused by ", $tmp);
+
+		} elseif (!is_string($message)) {
+			$message = Dumper::toText($message);
+		}
+
+		return trim($message);
+	}
 }
diff --git a/src/Tracy/IBarPanel.php b/src/Tracy/IBarPanel.php
index 49b6f77e6..5d0351314 100644
--- a/src/Tracy/IBarPanel.php
+++ b/src/Tracy/IBarPanel.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -16,13 +18,11 @@ interface IBarPanel
 
 	/**
 	 * Renders HTML code for custom tab.
-	 * @return string
 	 */
-	function getTab();
+	function getTab(): ?string;
 
 	/**
 	 * Renders HTML code for custom panel.
-	 * @return string
 	 */
-	function getPanel();
+	function getPanel(): ?string;
 }
diff --git a/src/Tracy/ILogger.php b/src/Tracy/ILogger.php
index 873be9287..53fec1a60 100644
--- a/src/Tracy/ILogger.php
+++ b/src/Tracy/ILogger.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -21,5 +23,5 @@ interface ILogger
 		EXCEPTION = 'exception',
 		CRITICAL = 'critical';
 
-	function log($value, $priority = self::INFO);
+	function log($value, string $priority = self::INFO);
 }
diff --git a/src/Tracy/Logger.php b/src/Tracy/Logger.php
index 0f85a052e..332a8e875 100644
--- a/src/Tracy/Logger.php
+++ b/src/Tracy/Logger.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -31,17 +33,28 @@ class Logger implements ILogger
 	/** @var BlueScreen|null */
 	private $blueScreen;
 
+	/** @var StreamLogger[] */
+	private $streamLoggers;
+
+	/** @var BlueScreenLogger */
+	private $blueScreenLogger;
+
+	/** @var MailLogger */
+	private $mailLogger;
+
 
 	/**
-	 * @param  string|null  $directory
 	 * @param  string|array|null  $email
 	 */
-	public function __construct($directory, $email = null, BlueScreen $blueScreen = null)
+	public function __construct(?string $directory, $email = null, BlueScreen $blueScreen = null)
 	{
 		$this->directory = $directory;
 		$this->email = $email;
 		$this->blueScreen = $blueScreen;
 		$this->mailer = [$this, 'defaultMailer'];
+
+		$this->blueScreenLogger = $this->createBlueScreenLogger();
+		$this->mailLogger = $this->createMailLogger();
 	}
 
 
@@ -51,7 +64,15 @@ public function __construct($directory, $email = null, BlueScreen $blueScreen =
 	 * @param  string  $priority  one of constant ILogger::INFO, WARNING, ERROR (sends email), EXCEPTION (sends email), CRITICAL (sends email)
 	 * @return string|null logged error filename
 	 */
-	public function log($message, $priority = self::INFO)
+	public function log($message, string $priority = self::INFO): ?string
+	{
+		$exceptionFile = $this->getStreamLogger($priority)->log($message, $priority);
+		$this->mailLogger->log($message, $priority);
+		return $exceptionFile;
+	}
+
+
+	protected function getStreamLogger($priority)
 	{
 		if (!$this->directory) {
 			throw new \LogicException('Logging directory is not specified.');
@@ -59,35 +80,43 @@ public function log($message, $priority = self::INFO)
 			throw new \RuntimeException("Logging directory '$this->directory' is not found or is not directory.");
 		}
 
-		$exceptionFile = $message instanceof \Exception || $message instanceof \Throwable
-			? $this->getExceptionFile($message)
-			: null;
-		$line = static::formatLogLine($message, $exceptionFile);
-		$file = $this->directory . '/' . strtolower($priority ?: self::INFO) . '.log';
-
-		if (!@file_put_contents($file, $line . PHP_EOL, FILE_APPEND | LOCK_EX)) { // @ is escalated to exception
-			throw new \RuntimeException("Unable to write to log file '$file'. Is directory writable?");
+		$path = $this->directory . '/' . strtolower($priority ?: self::INFO) . '.log';
+		if (!isset($this->streamLoggers[$path])) {
+			$this->streamLoggers[$path] = new StreamLogger($path, $this->blueScreenLogger);
 		}
 
-		if ($exceptionFile) {
-			$this->logException($message, $exceptionFile);
-		}
+		return $this->streamLoggers[$path];
+	}
 
-		if (in_array($priority, [self::ERROR, self::EXCEPTION, self::CRITICAL], true)) {
-			$this->sendEmail($message);
-		}
 
-		return $exceptionFile;
+	protected function createBlueScreenLogger()
+	{
+		$blueScreenLogger = new BlueScreenLogger($this->directory, $this->blueScreen);
+		$blueScreenLogger->directory = &$this->directory;
+
+		return $blueScreenLogger;
+	}
+
+
+	protected function createMailLogger()
+	{
+		$mailLogger = new MailLogger($this->directory, $this->email);
+		$mailLogger->directory = &$this->directory;
+		$mailLogger->email = &$this->email;
+		$mailLogger->fromEmail = &$this->fromEmail;
+		$mailLogger->emailSnooze = &$this->emailSnooze;
+		$mailLogger->mailer = &$this->mailer;
+
+		return $mailLogger;
 	}
 
 
 	/**
 	 * @param  mixed  $message
-	 * @return string
 	 */
-	public static function formatMessage($message)
+	public static function formatMessage($message): string
 	{
-		if ($message instanceof \Exception || $message instanceof \Throwable) {
+		if ($message instanceof \Throwable) {
 			while ($message) {
 				$tmp[] = ($message instanceof \ErrorException
 					? Helpers::errorTypeToString($message->getSeverity()) . ': ' . $message->getMessage()
@@ -107,9 +136,8 @@ public static function formatMessage($message)
 
 	/**
 	 * @param  mixed  $message
-	 * @return string
 	 */
-	public static function formatLogLine($message, $exceptionFile = null)
+	public static function formatLogLine($message, string $exceptionFile = null): string
 	{
 		return implode(' ', [
 			@date('[Y-m-d H-i-s]'), // @ timezone may not be set
@@ -121,89 +149,42 @@ public static function formatLogLine($message, $exceptionFile = null)
 
 
 	/**
-	 * @param  \Exception|\Throwable  $exception
-	 * @return string
+	 * @deprecated
 	 */
-	public function getExceptionFile($exception)
+	public function getExceptionFile(\Throwable $exception): string
 	{
-		while ($exception) {
-			$data[] = [
-				get_class($exception), $exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine(),
-				array_map(function ($item) { unset($item['args']); return $item; }, $exception->getTrace()),
-			];
-			$exception = $exception->getPrevious();
-		}
-		$hash = substr(md5(serialize($data)), 0, 10);
-		$dir = strtr($this->directory . '/', '\\/', DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR);
-		foreach (new \DirectoryIterator($this->directory) as $file) {
-			if (strpos($file->getBasename(), $hash)) {
-				return $dir . $file;
-			}
-		}
-		return $dir . 'exception--' . @date('Y-m-d--H-i') . "--$hash.html"; // @ timezone may not be set
+		return $this->blueScreenLogger->getExceptionFile($exception);
 	}
 
 
 	/**
-	 * Logs exception to the file if file doesn't exist.
-	 * @param  \Exception|\Throwable  $exception
-	 * @return string logged error filename
+	 * @deprecated
 	 */
-	protected function logException($exception, $file = null)
+	protected function logException(\Throwable $exception, ?string $file = null): string
 	{
-		$file = $file ?: $this->getExceptionFile($exception);
-		$bs = $this->blueScreen ?: new BlueScreen;
-		$bs->renderToFile($exception, $file);
-		return $file;
+		$reflection = new \ReflectionMethod($this->blueScreenLogger, 'logException');
+		$reflection->setAccessible(true);
+		return $reflection->invoke($this->blueScreenLogger, $exception, $file);
 	}
 
 
 	/**
-	 * @param  mixed  $message
-	 * @return void
+	 * @deprecated
 	 */
-	protected function sendEmail($message)
+	protected function sendEmail($message): void
 	{
-		$snooze = is_numeric($this->emailSnooze)
-			? $this->emailSnooze
-			: @strtotime($this->emailSnooze) - time(); // @ timezone may not be set
-
-		if (
-			$this->email
-			&& $this->mailer
-			&& @filemtime($this->directory . '/email-sent') + $snooze < time() // @ file may not exist
-			&& @file_put_contents($this->directory . '/email-sent', 'sent') // @ file may not be writable
-		) {
-			call_user_func($this->mailer, $message, implode(', ', (array) $this->email));
-		}
+		$reflection = new \ReflectionMethod($this->mailLogger, 'sendEmail');
+		$reflection->setAccessible(true);
+		$reflection->invoke($this->mailLogger, $message);
 	}
 
 
 	/**
-	 * Default mailer.
-	 * @param  mixed  $message
-	 * @param  string  $email
-	 * @return void
+	 * @deprecated
 	 * @internal
 	 */
-	public function defaultMailer($message, $email)
+	public function defaultMailer($message, string $email): void
 	{
-		$host = preg_replace('#[^\w.-]+#', '', isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : php_uname('n'));
-		$parts = str_replace(
-			["\r\n", "\n"],
-			["\n", PHP_EOL],
-			[
-				'headers' => implode("\n", [
-					'From: ' . ($this->fromEmail ?: "noreply@$host"),
-					'X-Mailer: Tracy',
-					'Content-Type: text/plain; charset=UTF-8',
-					'Content-Transfer-Encoding: 8bit',
-				]) . "\n",
-				'subject' => "PHP: An error occurred on the server $host",
-				'body' => static::formatMessage($message) . "\n\nsource: " . Helpers::getSource(),
-			]
-		);
-
-		mail($email, $parts['subject'], $parts['body'], $parts['headers']);
+		$this->mailLogger->defaultMailer($message, $email);
 	}
 }
diff --git a/src/Tracy/MailLogger.php b/src/Tracy/MailLogger.php
new file mode 100644
index 000000000..be37fe51a
--- /dev/null
+++ b/src/Tracy/MailLogger.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * This file is part of the Tracy (https://tracy.nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Tracy;
+
+
+/**
+ * Logger which sends emails.
+ */
+class MailLogger implements ILogger
+{
+	/** @var string|null name of the directory where errors should be logged */
+	public $directory;
+
+	/** @var string|array|null email or emails to which send error notifications */
+	public $email;
+
+	/** @var string sender of email notifications */
+	public $fromEmail;
+
+	/** @var mixed interval for sending email is 2 days */
+	public $emailSnooze = '2 days';
+
+	/** @var callable handler for sending emails */
+	public $mailer;
+
+
+	public function __construct(?string $directory, $email = null)
+	{
+		$this->directory = $directory;
+		$this->email = $email;
+		$this->mailer = [$this, 'defaultMailer'];
+	}
+
+
+	public function log($message, string $priority = self::INFO)
+	{
+		if (!$this->directory) {
+			throw new \LogicException('Logging directory is not specified.');
+		} elseif (!is_dir($this->directory)) {
+			throw new \RuntimeException("Logging directory '$this->directory' is not found or is not directory.");
+		}
+
+		if (in_array($priority, [self::ERROR, self::EXCEPTION, self::CRITICAL], true)) {
+			$this->sendEmail($message);
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * @param  mixed  $message
+	 */
+	protected function sendEmail($message): void
+	{
+		$snooze = is_numeric($this->emailSnooze)
+			? $this->emailSnooze
+			: @strtotime($this->emailSnooze) - time(); // @ timezone may not be set
+
+		if (
+			$this->email
+			&& $this->mailer
+			&& @filemtime($this->directory . '/email-sent') + $snooze < time() // @ file may not exist
+			&& @file_put_contents($this->directory . '/email-sent', 'sent') // @ file may not be writable
+		) {
+			($this->mailer)($message, implode(', ', (array) $this->email));
+		}
+	}
+
+
+	/**
+	 * Default mailer.
+	 * @param  mixed  $message
+	 * @internal
+	 */
+	public function defaultMailer($message, string $email): void
+	{
+		$host = preg_replace('#[^\w.-]+#', '', $_SERVER['HTTP_HOST'] ?? php_uname('n'));
+		$parts = str_replace(
+			["\r\n", "\n"],
+			["\n", PHP_EOL],
+			[
+				'headers' => implode("\n", [
+					'From: ' . ($this->fromEmail ?: "noreply@$host"),
+					'X-Mailer: Tracy',
+					'Content-Type: text/plain; charset=UTF-8',
+					'Content-Transfer-Encoding: 8bit',
+				]) . "\n",
+				'subject' => "PHP: An error occurred on the server $host",
+				'body' => static::formatMessage($message) . "\n\nsource: " . Helpers::getSource(),
+			]
+		);
+
+		mail($email, $parts['subject'], $parts['body'], $parts['headers']);
+	}
+}
diff --git a/src/Tracy/OutputDebugger.php b/src/Tracy/OutputDebugger.php
index 2e9c599cc..85f152bcb 100644
--- a/src/Tracy/OutputDebugger.php
+++ b/src/Tracy/OutputDebugger.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 
@@ -13,20 +15,20 @@
  */
 class OutputDebugger
 {
-	const BOM = "\xEF\xBB\xBF";
+	private const BOM = "\xEF\xBB\xBF";
 
 	/** @var array of [file, line, output, stack] */
 	private $list = [];
 
 
-	public static function enable()
+	public static function enable(): void
 	{
 		$me = new static;
 		$me->start();
 	}
 
 
-	public function start()
+	public function start(): void
 	{
 		foreach (get_included_files() as $file) {
 			if (fread(fopen($file, 'r'), 3) === self::BOM) {
@@ -38,7 +40,7 @@ public function start()
 
 
 	/** @internal */
-	public function handler($s, $phase)
+	public function handler(string $s, int $phase): ?string
 	{
 		$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 		if (isset($trace[0]['file'], $trace[0]['line'])) {
@@ -51,13 +53,13 @@ public function handler($s, $phase)
 				$this->list[] = [$trace[0]['file'], $trace[0]['line'], $s, $stack];
 			}
 		}
-		if ($phase === PHP_OUTPUT_HANDLER_FINAL) {
-			return $this->renderHtml();
-		}
+		return $phase === PHP_OUTPUT_HANDLER_FINAL
+			? $this->renderHtml()
+			: null;
 	}
 
 
-	private function renderHtml()
+	private function renderHtml(): string
 	{
 		$res = '<style>code, pre {white-space:nowrap} a {text-decoration:none} pre {color:gray;display:inline} big {color:red}</style><code>';
 		foreach ($this->list as $item) {
diff --git a/src/Tracy/StreamLogger.php b/src/Tracy/StreamLogger.php
new file mode 100644
index 000000000..7703c8cc8
--- /dev/null
+++ b/src/Tracy/StreamLogger.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of the Tracy (https://tracy.nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Tracy;
+
+
+/**
+ * Logger which writes to a file.
+ */
+class StreamLogger implements ILogger
+{
+	/** @var string path to a file where errors should be logged */
+	public $path;
+
+	/** @var BlueScreenLogger|null */
+	private $blueScreenLogger;
+
+
+	/**
+	 * @param string $path
+	 */
+	public function __construct($path, ?BlueScreenLogger $blueScreenLogger = null)
+	{
+		$this->path = $path;
+		$this->blueScreenLogger = $blueScreenLogger;
+	}
+
+
+	public function log($message, string $priority = self::INFO): ?string
+	{
+		$exceptionFile = $this->blueScreenLogger ? $this->blueScreenLogger->log($message, $priority) : null;
+		$line = Logger::formatLogLine($message, $exceptionFile);
+		if (!@file_put_contents($this->path, $line . PHP_EOL, FILE_APPEND | LOCK_EX)) { // @ is escalated to exception
+			throw new \RuntimeException("Unable to write to log file '{$this->path}'. Is directory writable?");
+		}
+
+		return $exceptionFile;
+	}
+}
diff --git a/src/Tracy/assets/Bar/bar.phtml b/src/Tracy/assets/Bar/bar.phtml
index 70b30df58..39b6f7e59 100644
--- a/src/Tracy/assets/Bar/bar.phtml
+++ b/src/Tracy/assets/Bar/bar.phtml
@@ -9,9 +9,11 @@
  * @param  array $rows
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
-$tabs = function ($panels) {
+$tabs = function ($panels): void {
 	foreach ($panels as $panel) {
 		if ($panel->tab) { ?>
 		<li><?php if ($panel->panel): ?><a href="#" rel="tracy-debug-panel-<?= $panel->id ?>"><?= trim($panel->tab) ?></a><?php else: echo '<span>', trim($panel->tab), '</span>'; endif ?></li><?php
diff --git a/src/Tracy/assets/Bar/dumps.panel.phtml b/src/Tracy/assets/Bar/dumps.panel.phtml
index a3f0a3399..8f0473883 100644
--- a/src/Tracy/assets/Bar/dumps.panel.phtml
+++ b/src/Tracy/assets/Bar/dumps.panel.phtml
@@ -7,6 +7,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 ?>
diff --git a/src/Tracy/assets/Bar/dumps.tab.phtml b/src/Tracy/assets/Bar/dumps.tab.phtml
index a5c272023..399a641c8 100644
--- a/src/Tracy/assets/Bar/dumps.tab.phtml
+++ b/src/Tracy/assets/Bar/dumps.tab.phtml
@@ -7,6 +7,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 if (empty($data)) {
diff --git a/src/Tracy/assets/Bar/errors.panel.phtml b/src/Tracy/assets/Bar/errors.panel.phtml
index cada65019..e8bc6717d 100644
--- a/src/Tracy/assets/Bar/errors.panel.phtml
+++ b/src/Tracy/assets/Bar/errors.panel.phtml
@@ -7,6 +7,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 ?>
@@ -17,7 +19,7 @@ namespace Tracy;
 <?php foreach ($data as $item => $count): list($file, $line, $message) = explode('|', $item, 3) ?>
 <tr>
 	<td class="tracy-right"><?= $count ? "$count\xC3\x97" : '' ?></td>
-	<td><pre><?= Helpers::escapeHtml($message), ' in ', Helpers::editorLink($file, $line) ?></pre></td>
+	<td><pre><?= Helpers::escapeHtml($message), ' in ', Helpers::editorLink($file, (int) $line) ?></pre></td>
 </tr>
 <?php endforeach ?>
 </table>
diff --git a/src/Tracy/assets/Bar/errors.tab.phtml b/src/Tracy/assets/Bar/errors.tab.phtml
index 3934047cc..677ae4b60 100644
--- a/src/Tracy/assets/Bar/errors.tab.phtml
+++ b/src/Tracy/assets/Bar/errors.tab.phtml
@@ -7,6 +7,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 if (empty($data)) {
diff --git a/src/Tracy/assets/Bar/info.panel.phtml b/src/Tracy/assets/Bar/info.panel.phtml
index fa6e48663..7d937c5d8 100644
--- a/src/Tracy/assets/Bar/info.panel.phtml
+++ b/src/Tracy/assets/Bar/info.panel.phtml
@@ -7,6 +7,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 if (isset($this->cpuUsage) && $this->time) {
@@ -17,8 +19,8 @@ if (isset($this->cpuUsage) && $this->time) {
 	$systemUsage = -round(($this->cpuUsage['ru_stime.tv_sec'] * 1e6 + $this->cpuUsage['ru_stime.tv_usec']) / $this->time / 10000);
 }
 
-$countClasses = function ($list) {
-	return count(array_filter($list, function ($name) {
+$countClasses = function (array $list): int {
+	return count(array_filter($list, function (string $name): bool {
 		return (new \ReflectionClass($name))->isUserDefined();
 	}));
 };
@@ -34,13 +36,13 @@ $info = [
 	'OPcache' => $opcache ? round(count($cachedFiles) * 100 / count(get_included_files())) . '% cached' : null,
 	'Classes + interfaces + traits' => $countClasses(get_declared_classes()) . ' + '
 		. $countClasses(get_declared_interfaces()) . ' + ' . $countClasses(get_declared_traits()),
-	'Your IP' => isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null,
-	'Server IP' => isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : null,
+	'Your IP' => $_SERVER['REMOTE_ADDR'] ?? null,
+	'Server IP' => $_SERVER['SERVER_ADDR'] ?? null,
 	'HTTP method / response code' => isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] . ' / ' . http_response_code() : null,
 	'PHP' => PHP_VERSION,
 	'Xdebug' => extension_loaded('xdebug') ? phpversion('xdebug') : null,
 	'Tracy' => Debugger::VERSION,
-	'Server' => isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null,
+	'Server' => $_SERVER['SERVER_SOFTWARE'] ?? null,
 ];
 
 $info = array_map('strval', array_filter($info + (array) $this->data));
@@ -51,10 +53,10 @@ if (class_exists('Composer\Autoload\ClassLoader', false)) {
 	$composer = @json_decode(file_get_contents($lockFile)); // @ may not exist or be valid
 	list($packages, $devPackages) = [(array) @$composer->packages, (array) @$composer->{'packages-dev'}]; // @ keys may not exist
 	foreach ([&$packages, &$devPackages] as &$items) {
-		@array_walk($items, function($package) { // @ keys may not exist
-			$package->hash = $package->source->reference ?: $package->dist->reference;
+		array_walk($items, function($package) {
+			$package->hash = $package->source->reference ?? $package->dist->reference ?? null;
 		}, $items);
-		usort($items, function ($a, $b) { return strcmp($a->name, $b->name); });
+		usort($items, function ($a, $b): int { return $a->name <=> $b->name; });
 	}
 }
 
diff --git a/src/Tracy/assets/Bar/info.tab.phtml b/src/Tracy/assets/Bar/info.tab.phtml
index 7e0997b7b..19926b780 100644
--- a/src/Tracy/assets/Bar/info.tab.phtml
+++ b/src/Tracy/assets/Bar/info.tab.phtml
@@ -7,6 +7,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 $this->time = microtime(true) - Debugger::$time;
diff --git a/src/Tracy/assets/Bar/loader.phtml b/src/Tracy/assets/Bar/loader.phtml
index 368b15202..fe11d1328 100644
--- a/src/Tracy/assets/Bar/loader.phtml
+++ b/src/Tracy/assets/Bar/loader.phtml
@@ -9,6 +9,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 $nonceAttr = $nonce ? ' nonce="' . Helpers::escapeHtml($nonce) . '"' : '';
diff --git a/src/Tracy/assets/Bar/panels.phtml b/src/Tracy/assets/Bar/panels.phtml
index 5292f122d..774070497 100644
--- a/src/Tracy/assets/Bar/panels.phtml
+++ b/src/Tracy/assets/Bar/panels.phtml
@@ -9,6 +9,8 @@
  * @param  array $rows
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 use Tracy\Helpers;
diff --git a/src/Tracy/assets/BlueScreen/content.phtml b/src/Tracy/assets/BlueScreen/content.phtml
index 9ab54d5e3..4dfc9a5f3 100644
--- a/src/Tracy/assets/BlueScreen/content.phtml
+++ b/src/Tracy/assets/BlueScreen/content.phtml
@@ -18,6 +18,8 @@
  * @return void
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 $code = $exception->getCode() ? ' #' . $exception->getCode() : '';
diff --git a/src/Tracy/assets/BlueScreen/page.phtml b/src/Tracy/assets/BlueScreen/page.phtml
index 95162d126..263af2f1c 100644
--- a/src/Tracy/assets/BlueScreen/page.phtml
+++ b/src/Tracy/assets/BlueScreen/page.phtml
@@ -12,6 +12,8 @@
  * @return void
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 $code = $exception->getCode() ? ' #' . $exception->getCode() : '';
diff --git a/src/Tracy/assets/Debugger/error.500.phtml b/src/Tracy/assets/Debugger/error.500.phtml
index 37105ac5a..13f67640f 100644
--- a/src/Tracy/assets/Debugger/error.500.phtml
+++ b/src/Tracy/assets/Debugger/error.500.phtml
@@ -5,6 +5,8 @@
  * @param  bool $logged
  */
 
+declare(strict_types=1);
+
 namespace Tracy;
 
 ?>
diff --git a/src/shortcuts.php b/src/shortcuts.php
index 02c70b20c..c90d5a621 100644
--- a/src/shortcuts.php
+++ b/src/shortcuts.php
@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 if (!function_exists('dump')) {
 	/**
 	 * Tracy\Debugger::dump() shortcut.
@@ -22,7 +24,7 @@ function dump($var)
 	 * Tracy\Debugger::dump() & exit shortcut.
 	 * @tracySkipLocation
 	 */
-	function dumpe($var)
+	function dumpe($var): void
 	{
 		array_map('Tracy\Debugger::dump', func_get_args());
 		exit;
@@ -36,7 +38,7 @@ function dumpe($var)
 	 */
 	function bdump($var)
 	{
-		call_user_func_array('Tracy\Debugger::barDump', func_get_args());
+		Tracy\Debugger::barDump(...func_get_args());
 		return $var;
 	}
 }
diff --git a/src/tracy.php b/src/tracy.php
index 61eb88042..06b127d92 100644
--- a/src/tracy.php
+++ b/src/tracy.php
@@ -6,6 +6,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 require __DIR__ . '/Tracy/IBarPanel.php';
 require __DIR__ . '/Tracy/Bar.php';
 require __DIR__ . '/Tracy/BlueScreen.php';
diff --git a/tests/Tracy.Bridges/PsrToTracyLoggerAdapter.phpt b/tests/Tracy.Bridges/PsrToTracyLoggerAdapter.phpt
new file mode 100644
index 000000000..c419c1601
--- /dev/null
+++ b/tests/Tracy.Bridges/PsrToTracyLoggerAdapter.phpt
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Test: PsrToTracyLoggerAdapter.
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+use Tracy\Bridges\Psr\PsrToTracyLoggerAdapter;
+use Tracy\ILogger;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+class DummyPsrLogger extends Psr\Log\AbstractLogger
+{
+	/** @var array */
+	public $entries = [];
+
+
+	public function log($level, $message, array $context = [])
+	{
+		$this->entries[] = [$level, $message, $context];
+	}
+}
+
+
+$psrLogger = new DummyPsrLogger;
+$tracyLogger = new PsrToTracyLoggerAdapter($psrLogger);
+$exception = new \Exception('Something went wrong');
+
+$tracyLogger->log('info');
+$tracyLogger->log('warning', ILogger::WARNING);
+$tracyLogger->log(123);
+$tracyLogger->log(['x' => 'y']);
+$tracyLogger->log($exception);
+
+Assert::same([
+	[Psr\Log\LogLevel::INFO, 'info', []],
+	[Psr\Log\LogLevel::WARNING, 'warning', []],
+	[Psr\Log\LogLevel::INFO, '123', []],
+	[Psr\Log\LogLevel::INFO, "array (1)\n   x => \"y\"", []],
+	[Psr\Log\LogLevel::INFO, 'Something went wrong', ['exception' => $exception]],
+], $psrLogger->entries);
diff --git a/tests/Tracy.Bridges/TracyExtension.services.phpt b/tests/Tracy.Bridges/TracyExtension.services.phpt
index 7f97de147..a3806a10c 100644
--- a/tests/Tracy.Bridges/TracyExtension.services.phpt
+++ b/tests/Tracy.Bridges/TracyExtension.services.phpt
@@ -4,6 +4,8 @@
  * Test: TracyExtension accessors.
  */
 
+declare(strict_types=1);
+
 use Nette\DI;
 use Tester\Assert;
 use Tracy\Bridges\Nette\TracyExtension;
@@ -14,13 +16,14 @@ require __DIR__ . '/../bootstrap.php';
 
 class CustomLogger implements ILogger
 {
-	public function log($value, $priority = self::INFO)
+	public function log($value, string $priority = self::INFO)
 	{
 	}
 }
 
 
 $compiler = new DI\Compiler;
+$compiler->setClassName('Container');
 $compiler->addExtension('tracy', new TracyExtension);
 $compiler->addConfig([
 	'tracy' => [
@@ -31,7 +34,7 @@ $compiler->addConfig([
 	],
 ]);
 
-eval(@$compiler->compile([], 'Container')); // @ compatiblity with DI 2.3 & 2.4
+eval($compiler->compile());
 
 $container = new Container;
 $container->initialize();
diff --git a/tests/Tracy.Bridges/TracyToPsrLoggerAdapter.phpt b/tests/Tracy.Bridges/TracyToPsrLoggerAdapter.phpt
new file mode 100644
index 000000000..115de84ff
--- /dev/null
+++ b/tests/Tracy.Bridges/TracyToPsrLoggerAdapter.phpt
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Test: TracyToPsrLoggerAdapter.
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+use Tracy\Bridges\Psr\TracyToPsrLoggerAdapter;
+use Tracy\ILogger;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+class DummyTracyLogger implements ILogger
+{
+	/** @var array */
+	public $entries = [];
+
+
+	public function log($value, string $priority = self::INFO)
+	{
+		$this->entries[] = [$priority, $value];
+	}
+}
+
+
+$tracyLogger = new DummyTracyLogger;
+$psrLogger = new TracyToPsrLoggerAdapter($tracyLogger);
+$exception = new \Exception('Something went wrong');
+
+$psrLogger->info('info');
+$psrLogger->warning('warning');
+$psrLogger->error('order failed with exception', ['exception' => $exception]);
+$psrLogger->error('order failed with context', ['orderId' => 123]);
+$psrLogger->error('order failed with context and exception', ['orderId' => 123, 'exception' => $exception]);
+
+Assert::same([
+	[ILogger::INFO, 'info'],
+	[ILogger::WARNING, 'warning'],
+	[ILogger::ERROR, $exception],
+	[ILogger::ERROR, 'order failed with exception'],
+	[ILogger::ERROR, ['message' => 'order failed with context', 'context' => ['orderId' => 123]]],
+	[ILogger::ERROR, $exception],
+	[ILogger::ERROR, ['message' => 'order failed with context and exception', 'context' => ['orderId' => 123]]],
+], $tracyLogger->entries);
diff --git a/tests/Tracy/BlueScreen.renderActions().phpt b/tests/Tracy/BlueScreen.renderActions().phpt
index 0393d6479..197e21f83 100644
--- a/tests/Tracy/BlueScreen.renderActions().phpt
+++ b/tests/Tracy/BlueScreen.renderActions().phpt
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Tester\Assert;
 
 
diff --git a/tests/Tracy/Bluescreen.collapsedPaths.phpt b/tests/Tracy/Bluescreen.collapsedPaths.phpt
index 0e7ba28bb..6aa337539 100644
--- a/tests/Tracy/Bluescreen.collapsedPaths.phpt
+++ b/tests/Tracy/Bluescreen.collapsedPaths.phpt
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Tester\Assert;
 
 
diff --git a/tests/Tracy/Debugger.Bar.disabled.phpt b/tests/Tracy/Debugger.Bar.disabled.phpt
index 58ec9d773..096846884 100644
--- a/tests/Tracy/Debugger.Bar.disabled.phpt
+++ b/tests/Tracy/Debugger.Bar.disabled.phpt
@@ -5,6 +5,8 @@
  * @outputMatch
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.Bar.html.phpt b/tests/Tracy/Debugger.Bar.html.phpt
index 68e071c36..abef9aa39 100644
--- a/tests/Tracy/Debugger.Bar.html.phpt
+++ b/tests/Tracy/Debugger.Bar.html.phpt
@@ -5,6 +5,8 @@
  * @outputMatch %A%<!-- Tracy Debug Bar -->%A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.Bar.production.phpt b/tests/Tracy/Debugger.Bar.production.phpt
index bbf4d8618..1349fa6ed 100644
--- a/tests/Tracy/Debugger.Bar.production.phpt
+++ b/tests/Tracy/Debugger.Bar.production.phpt
@@ -5,6 +5,8 @@
  * @outputMatch
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.Bar.text.phpt b/tests/Tracy/Debugger.Bar.text.phpt
index b52172fd7..25f96283a 100644
--- a/tests/Tracy/Debugger.Bar.text.phpt
+++ b/tests/Tracy/Debugger.Bar.text.phpt
@@ -5,6 +5,8 @@
  * @outputMatch
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.E_COMPILE_ERROR.console.phpt b/tests/Tracy/Debugger.E_COMPILE_ERROR.console.phpt
index 314b68119..7681aada5 100644
--- a/tests/Tracy/Debugger.E_COMPILE_ERROR.console.phpt
+++ b/tests/Tracy/Debugger.E_COMPILE_ERROR.console.phpt
@@ -7,6 +7,8 @@
  * @outputMatch OK!
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.E_ERROR.console.phpt b/tests/Tracy/Debugger.E_ERROR.console.phpt
index 4b4f5f776..83b0cfa4a 100644
--- a/tests/Tracy/Debugger.E_ERROR.console.phpt
+++ b/tests/Tracy/Debugger.E_ERROR.console.phpt
@@ -7,6 +7,8 @@
  * @outputMatch OK!
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
@@ -24,7 +26,7 @@ $onFatalErrorCalled = false;
 
 register_shutdown_function(function () use (&$onFatalErrorCalled) {
 	Assert::true($onFatalErrorCalled);
-	Assert::match(PHP_MAJOR_VERSION > 5 ?
+	Assert::match(
 "Error: Call to undefined function missing_function() in %a%
 Stack trace:
 #0 %a%: third(Array)
@@ -32,23 +34,7 @@ Stack trace:
 #2 %a%: first(10, 'any string')
 #3 {main}
 Unable to log error: Logging directory is not specified.
-" : (extension_loaded('xdebug') ? '
-Fatal error: Call to undefined function missing_function() in %a%
-ErrorException: Call to undefined function missing_function() in %a%
-Stack trace:
-#0 %a%: third()
-#1 %a%: second()
-#2 %a%: first()
-#3 {main}
-Unable to log error: Logging directory is not specified.
-' : '
-Fatal error: Call to undefined function missing_function() in %a%
-ErrorException: Call to undefined function missing_function() in %a%
-Stack trace:
-#0 [internal function]: Tracy\\Debugger::shutdownHandler()
-#1 {main}
-Unable to log error: Logging directory is not specified.
-'), ob_get_clean());
+", ob_get_clean());
 	echo 'OK!'; // prevents PHP bug #62725
 });
 
diff --git a/tests/Tracy/Debugger.E_ERROR.html.phpt b/tests/Tracy/Debugger.E_ERROR.html.phpt
index 7de4801d6..d5afd7e03 100644
--- a/tests/Tracy/Debugger.E_ERROR.html.phpt
+++ b/tests/Tracy/Debugger.E_ERROR.html.phpt
@@ -7,6 +7,8 @@
  * @outputMatch OK!
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
@@ -31,7 +33,7 @@ register_shutdown_function(function () use (&$onFatalErrorCalled) {
 	Assert::true($onFatalErrorCalled);
 	$output = ob_get_clean();
 	Assert::same(1, substr_count($output, '<!-- Tracy Debug Bar'));
-	Assert::matchFile(__DIR__ . '/expected/Debugger.E_ERROR.html' . (PHP_MAJOR_VERSION > 5 ? '' : (extension_loaded('xdebug') ? '.xdebug' : '.php5')) . '.expect', $output);
+	Assert::matchFile(__DIR__ . '/expected/Debugger.E_ERROR.html.expect', $output);
 	echo 'OK!'; // prevents PHP bug #62725
 });
 
diff --git a/tests/Tracy/Debugger.E_ERROR.production.console.phpt b/tests/Tracy/Debugger.E_ERROR.production.console.phpt
index 300cee8e0..b60ca9833 100644
--- a/tests/Tracy/Debugger.E_ERROR.production.console.phpt
+++ b/tests/Tracy/Debugger.E_ERROR.production.console.phpt
@@ -7,6 +7,8 @@
  * @outputMatch
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.E_ERROR.production.phpt b/tests/Tracy/Debugger.E_ERROR.production.phpt
index 742b1d15a..20a2b5edb 100644
--- a/tests/Tracy/Debugger.E_ERROR.production.phpt
+++ b/tests/Tracy/Debugger.E_ERROR.production.phpt
@@ -7,6 +7,8 @@
  * @outputMatch %A%<h1>Server Error</h1>%A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.E_RECOVERABLE_ERROR.phpt b/tests/Tracy/Debugger.E_RECOVERABLE_ERROR.phpt
index fb117d671..90be618c1 100644
--- a/tests/Tracy/Debugger.E_RECOVERABLE_ERROR.phpt
+++ b/tests/Tracy/Debugger.E_RECOVERABLE_ERROR.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger E_RECOVERABLE_ERROR error.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
@@ -40,14 +42,14 @@ $obj = new TestClass;
 Assert::exception(function () use ($obj) {
 	// Invalid argument #1
 	$obj->test1('hello');
-}, PHP_MAJOR_VERSION < 7 ? 'ErrorException' : 'TypeError', 'Argument 1 passed to TestClass::test1() must be %a% array, string given, called in %a%');
+}, TypeError::class, 'Argument 1 passed to TestClass::test1() must be %a% array, string given, called in %a%');
 
 Assert::exception(function () use ($obj) {
 	// Invalid argument #2
 	$obj->test2('hello');
-}, PHP_MAJOR_VERSION < 7 ? 'ErrorException' : 'TypeError', 'Argument 1 passed to TestClass::test2() must be an instance of TestClass, string given, called in %a%');
+}, TypeError::class, 'Argument 1 passed to TestClass::test2() must be an instance of TestClass, string given, called in %a%');
 
 Assert::exception(function () use ($obj) {
 	// Invalid toString
 	echo $obj;
-}, 'ErrorException', 'Method TestClass::__toString() must return a string value');
+}, ErrorException::class, 'Method TestClass::__toString() must return a string value');
diff --git a/tests/Tracy/Debugger.autoloading.phpt b/tests/Tracy/Debugger.autoloading.phpt
index 6bcc12119..7298172cc 100644
--- a/tests/Tracy/Debugger.autoloading.phpt
+++ b/tests/Tracy/Debugger.autoloading.phpt
@@ -5,6 +5,8 @@
  * @outputMatch %A%: Declaration of B::test(%a?%) should be compatible %a% A::test() in %A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.barDump().phpt b/tests/Tracy/Debugger.barDump().phpt
index c55e9e531..7dfd8ffbf 100644
--- a/tests/Tracy/Debugger.barDump().phpt
+++ b/tests/Tracy/Debugger.barDump().phpt
@@ -5,6 +5,8 @@
  * @outputMatch OK!
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tester\DomQuery;
 use Tracy\Debugger;
diff --git a/tests/Tracy/Debugger.barDump().showLocation.phpt b/tests/Tracy/Debugger.barDump().showLocation.phpt
index c3d33ec84..24e2647d5 100644
--- a/tests/Tracy/Debugger.barDump().showLocation.phpt
+++ b/tests/Tracy/Debugger.barDump().showLocation.phpt
@@ -5,6 +5,8 @@
  * @outputMatch OK!
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tester\DomQuery;
 use Tracy\Debugger;
diff --git a/tests/Tracy/Debugger.customCssFiles.phpt b/tests/Tracy/Debugger.customCssFiles.phpt
index 2b83b7259..d40f30513 100644
--- a/tests/Tracy/Debugger.customCssFiles.phpt
+++ b/tests/Tracy/Debugger.customCssFiles.phpt
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Tester\Assert;
 
 
diff --git a/tests/Tracy/Debugger.customJsFiles.phpt b/tests/Tracy/Debugger.customJsFiles.phpt
index 42f0c00a3..46872257b 100644
--- a/tests/Tracy/Debugger.customJsFiles.phpt
+++ b/tests/Tracy/Debugger.customJsFiles.phpt
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Tester\Assert;
 
 
diff --git a/tests/Tracy/Debugger.detectDebugMode.phpt b/tests/Tracy/Debugger.detectDebugMode.phpt
index 3cc19d24a..5e252027a 100644
--- a/tests/Tracy/Debugger.detectDebugMode.phpt
+++ b/tests/Tracy/Debugger.detectDebugMode.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger::detectDebugMode()
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.dump().phpt b/tests/Tracy/Debugger.dump().phpt
index ac9cf975c..78b87e492 100644
--- a/tests/Tracy/Debugger.dump().phpt
+++ b/tests/Tracy/Debugger.dump().phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger::dump() production vs development
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.enable().error.development.console.phpt b/tests/Tracy/Debugger.enable().error.development.console.phpt
index d3a929de2..6039f92bd 100644
--- a/tests/Tracy/Debugger.enable().error.development.console.phpt
+++ b/tests/Tracy/Debugger.enable().error.development.console.phpt
@@ -7,6 +7,8 @@
  * @outputMatch RuntimeException: %A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.enable().error.development.html.phpt b/tests/Tracy/Debugger.enable().error.development.html.phpt
index 348a94c55..f679d3e83 100644
--- a/tests/Tracy/Debugger.enable().error.development.html.phpt
+++ b/tests/Tracy/Debugger.enable().error.development.html.phpt
@@ -7,6 +7,8 @@
  * @outputMatch %A%<title>RuntimeException: Logging directory must be absolute path.</title>%A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.enable().error.production.console.phpt b/tests/Tracy/Debugger.enable().error.production.console.phpt
index 04bb19f2e..684f36949 100644
--- a/tests/Tracy/Debugger.enable().error.production.console.phpt
+++ b/tests/Tracy/Debugger.enable().error.production.console.phpt
@@ -7,6 +7,8 @@
  * @outputMatch
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.enable().error.production.html.phpt b/tests/Tracy/Debugger.enable().error.production.html.phpt
index 1d71c3ec0..38aff1974 100644
--- a/tests/Tracy/Debugger.enable().error.production.html.phpt
+++ b/tests/Tracy/Debugger.enable().error.production.html.phpt
@@ -7,6 +7,8 @@
  * @outputMatch %A%<title>Server Error</title>%A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.error-in-eval.phpt b/tests/Tracy/Debugger.error-in-eval.phpt
index d6e638e7d..32adaa494 100644
--- a/tests/Tracy/Debugger.error-in-eval.phpt
+++ b/tests/Tracy/Debugger.error-in-eval.phpt
@@ -7,6 +7,8 @@
  * @outputMatchFile expected/Debugger.error-in-eval.expect
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.error-in-toString.phpt b/tests/Tracy/Debugger.error-in-toString.phpt
index e47f22b51..a8192e7e3 100644
--- a/tests/Tracy/Debugger.error-in-toString.phpt
+++ b/tests/Tracy/Debugger.error-in-toString.phpt
@@ -7,6 +7,8 @@
  * @outputMatch %A%<title>User Error: Test::__toString</title>%A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.exception.html.phpt b/tests/Tracy/Debugger.exception.html.phpt
index e4c581a0c..f175fac98 100644
--- a/tests/Tracy/Debugger.exception.html.phpt
+++ b/tests/Tracy/Debugger.exception.html.phpt
@@ -7,6 +7,8 @@
  * @outputMatchFile expected/Debugger.exception.html.expect
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.exception.nonhtml.phpt b/tests/Tracy/Debugger.exception.nonhtml.phpt
index a8fdbad0d..d4a74daa9 100644
--- a/tests/Tracy/Debugger.exception.nonhtml.phpt
+++ b/tests/Tracy/Debugger.exception.nonhtml.phpt
@@ -7,6 +7,8 @@
  * @outputMatchFile expected/Debugger.exception.nonhtml.expect
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.exception.production.console.phpt b/tests/Tracy/Debugger.exception.production.console.phpt
index ff348026b..b6eb8f85d 100644
--- a/tests/Tracy/Debugger.exception.production.console.phpt
+++ b/tests/Tracy/Debugger.exception.production.console.phpt
@@ -7,6 +7,8 @@
  * @outputMatch
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.exception.production.phpt b/tests/Tracy/Debugger.exception.production.phpt
index 5b4a11388..840c109d8 100644
--- a/tests/Tracy/Debugger.exception.production.phpt
+++ b/tests/Tracy/Debugger.exception.production.phpt
@@ -7,6 +7,8 @@
  * @outputMatch %A%<h1>Server Error</h1>%A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.exceptionHandler.development.console.phpt b/tests/Tracy/Debugger.exceptionHandler.development.console.phpt
index 105c8e44d..63dfde7d4 100644
--- a/tests/Tracy/Debugger.exceptionHandler.development.console.phpt
+++ b/tests/Tracy/Debugger.exceptionHandler.development.console.phpt
@@ -7,6 +7,8 @@
  * @outputMatch Exception in%A%Unable to log error: %A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.exceptionHandler.development.html.phpt b/tests/Tracy/Debugger.exceptionHandler.development.html.phpt
index 9bd2cc48c..038137630 100644
--- a/tests/Tracy/Debugger.exceptionHandler.development.html.phpt
+++ b/tests/Tracy/Debugger.exceptionHandler.development.html.phpt
@@ -7,6 +7,8 @@
  * @outputMatch %A%<title>Exception: </title>%A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.exceptionHandler.production.console.phpt b/tests/Tracy/Debugger.exceptionHandler.production.console.phpt
index 8cff6d00f..f2dcea77e 100644
--- a/tests/Tracy/Debugger.exceptionHandler.production.console.phpt
+++ b/tests/Tracy/Debugger.exceptionHandler.production.console.phpt
@@ -7,6 +7,8 @@
  * @outputMatch
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.exceptionHandler.production.html.phpt b/tests/Tracy/Debugger.exceptionHandler.production.html.phpt
index 0cee20604..f774ae887 100644
--- a/tests/Tracy/Debugger.exceptionHandler.production.html.phpt
+++ b/tests/Tracy/Debugger.exceptionHandler.production.html.phpt
@@ -7,6 +7,8 @@
  * @outputMatch %A%<title>Server Error</title>%A%Tracy is unable to log error%A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.fireLog().basic.phpt b/tests/Tracy/Debugger.fireLog().basic.phpt
index 40a509475..670b7f4de 100644
--- a/tests/Tracy/Debugger.fireLog().basic.phpt
+++ b/tests/Tracy/Debugger.fireLog().basic.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger::fireLog()
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.fireLog().exception.phpt b/tests/Tracy/Debugger.fireLog().exception.phpt
index 350b6adfb..254517150 100644
--- a/tests/Tracy/Debugger.fireLog().exception.phpt
+++ b/tests/Tracy/Debugger.fireLog().exception.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger::fireLog() and exception.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.fireLog().production.phpt b/tests/Tracy/Debugger.fireLog().production.phpt
index e81d3973d..e6b906a8a 100644
--- a/tests/Tracy/Debugger.fireLog().production.phpt
+++ b/tests/Tracy/Debugger.fireLog().production.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger::fireLog() in production mode.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.log().error.phpt b/tests/Tracy/Debugger.log().error.phpt
index 7d4fd5e69..8951e5670 100644
--- a/tests/Tracy/Debugger.log().error.phpt
+++ b/tests/Tracy/Debugger.log().error.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger logging error.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.log().samefile.phpt b/tests/Tracy/Debugger.log().samefile.phpt
index 5bea098e5..70afe81a9 100644
--- a/tests/Tracy/Debugger.log().samefile.phpt
+++ b/tests/Tracy/Debugger.log().samefile.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger logging exceptions in log message.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.logSeverity.E_NOTICE.development.phpt b/tests/Tracy/Debugger.logSeverity.E_NOTICE.development.phpt
index 1dcfb5b95..0d641dfa2 100644
--- a/tests/Tracy/Debugger.logSeverity.E_NOTICE.development.phpt
+++ b/tests/Tracy/Debugger.logSeverity.E_NOTICE.development.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger logging E_NOTICE (bluescreen) in development mode.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.logSeverity.E_NOTICE.phpt b/tests/Tracy/Debugger.logSeverity.E_NOTICE.phpt
index 7af992191..a505a6c72 100644
--- a/tests/Tracy/Debugger.logSeverity.E_NOTICE.phpt
+++ b/tests/Tracy/Debugger.logSeverity.E_NOTICE.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger logging E_NOTICE (bluescreen) in production mode.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.logging.error.phpt b/tests/Tracy/Debugger.logging.error.phpt
index ca653584f..bd6d6c329 100644
--- a/tests/Tracy/Debugger.logging.error.phpt
+++ b/tests/Tracy/Debugger.logging.error.phpt
@@ -7,6 +7,8 @@
  * @outputMatch %A?%OK!
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.logging.warnings.phpt b/tests/Tracy/Debugger.logging.warnings.phpt
index 4bb58aaba..1b84f4abe 100644
--- a/tests/Tracy/Debugger.logging.warnings.phpt
+++ b/tests/Tracy/Debugger.logging.warnings.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger notices and warnings logging.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.scream.phpt b/tests/Tracy/Debugger.scream.phpt
index 4700e5757..025c02fe5 100644
--- a/tests/Tracy/Debugger.scream.phpt
+++ b/tests/Tracy/Debugger.scream.phpt
@@ -5,6 +5,8 @@
  * @outputMatchFile expected/Debugger.scream.expect
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
@@ -17,8 +19,7 @@ header('Content-Type: text/plain; charset=utf-8');
 
 Debugger::enable();
 
-@mktime(); // E_STRICT in PHP 5, E_DEPRECATED in PHP 7
-PHP_MAJOR_VERSION < 7 ? @mktime(0, 0, 0, 1, 23, 1978, 1) : @mktime(); // E_DEPRECATED
+@mktime(); // E_DEPRECATED
 @$x++; // E_NOTICE
 @min(1); // E_WARNING
 @require __DIR__ . '/fixtures/E_COMPILE_WARNING.php'; // E_COMPILE_WARNING (not working)
diff --git a/tests/Tracy/Debugger.shut-up.error.phpt b/tests/Tracy/Debugger.shut-up.error.phpt
index 76b454033..41b94cb76 100644
--- a/tests/Tracy/Debugger.shut-up.error.phpt
+++ b/tests/Tracy/Debugger.shut-up.error.phpt
@@ -7,6 +7,8 @@
  * @outputMatch Error%a?%: Call to undefined function missing_function() in %A%
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.shut-up.warnings.phpt b/tests/Tracy/Debugger.shut-up.warnings.phpt
index aeeedb23a..291d63943 100644
--- a/tests/Tracy/Debugger.shut-up.warnings.phpt
+++ b/tests/Tracy/Debugger.shut-up.warnings.phpt
@@ -5,6 +5,8 @@
  * @outputMatch
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
@@ -16,8 +18,7 @@ header('Content-Type: text/plain; charset=utf-8');
 
 Debugger::enable();
 
-@mktime(); // E_STRICT in PHP 5, E_DEPRECATED in PHP 7
-PHP_MAJOR_VERSION < 7 ? @mktime(0, 0, 0, 1, 23, 1978, 1) : @mktime(); // E_DEPRECATED
+@mktime(); // E_DEPRECATED
 @$x++; // E_NOTICE
 @min(1); // E_WARNING
 @require __DIR__ . '/fixtures/E_COMPILE_WARNING.php'; // E_COMPILE_WARNING
diff --git a/tests/Tracy/Debugger.strict.console.phpt b/tests/Tracy/Debugger.strict.console.phpt
index ffded3f39..2bf1f17e0 100644
--- a/tests/Tracy/Debugger.strict.console.phpt
+++ b/tests/Tracy/Debugger.strict.console.phpt
@@ -7,6 +7,8 @@
  * @outputMatchFile expected/Debugger.strict.console.expect
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.strict.html.phpt b/tests/Tracy/Debugger.strict.html.phpt
index a0dd71f56..fbe5552bf 100644
--- a/tests/Tracy/Debugger.strict.html.phpt
+++ b/tests/Tracy/Debugger.strict.html.phpt
@@ -7,6 +7,8 @@
  * @outputMatchFile expected/Debugger.strict.html.expect
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
diff --git a/tests/Tracy/Debugger.timer().phpt b/tests/Tracy/Debugger.timer().phpt
index 88a74a381..61938d333 100644
--- a/tests/Tracy/Debugger.timer().phpt
+++ b/tests/Tracy/Debugger.timer().phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger::timer()
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
diff --git a/tests/Tracy/Debugger.warnings.console.phpt b/tests/Tracy/Debugger.warnings.console.phpt
index 165176776..594239083 100644
--- a/tests/Tracy/Debugger.warnings.console.phpt
+++ b/tests/Tracy/Debugger.warnings.console.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Debugger notices and warnings in console.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Debugger;
 
@@ -32,8 +34,7 @@ function second($arg1, $arg2)
 
 function third($arg1)
 {
-	mktime(); // E_STRICT in PHP 5, E_DEPRECATED in PHP 7
-	PHP_MAJOR_VERSION < 7 ? mktime(0, 0, 0, 1, 23, 1978, 1) : mktime(); // E_DEPRECATED
+	mktime(); // E_DEPRECATED
 	$x++; // E_NOTICE
 	min(1); // E_WARNING
 	require __DIR__ . '/fixtures/E_COMPILE_WARNING.php'; // E_COMPILE_WARNING
@@ -42,9 +43,7 @@ function third($arg1)
 
 first(10, 'any string');
 Assert::match("
-%a%: mktime(): You should be using the time() function instead in %a% on line %d%
-
-Deprecated: mktime(): %a%
+Deprecated: mktime(): You should be using the time() function instead in %a% on line %d%
 
 Notice: Undefined variable: x in %a% on line %d%
 
diff --git a/tests/Tracy/Debugger.warnings.html.phpt b/tests/Tracy/Debugger.warnings.html.phpt
index a0077306a..ea30af315 100644
--- a/tests/Tracy/Debugger.warnings.html.phpt
+++ b/tests/Tracy/Debugger.warnings.html.phpt
@@ -5,6 +5,8 @@
  * @outputMatch OK!
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tester\DomQuery;
 use Tracy\Debugger;
@@ -34,11 +36,7 @@ Warning: Unsupported declare \'foo\' in %a% on line %d%%A%', $output);
 	Assert::match('%A%<table>
 <tr>
 	<td class="tracy-right">1%a%</td>
-	<td><pre>PHP %a%: mktime(): You should be using the time() function instead in %a%:%d%</a></pre></td>
-</tr>
-<tr>
-	<td class="tracy-right">1%a%</td>
-	<td><pre>PHP Deprecated: mktime(): %a%</a></pre></td>
+	<td><pre>PHP Deprecated: mktime(): You should be using the time() function instead in %a%:%d%</a></pre></td>
 </tr>
 <tr>
 	<td class="tracy-right">1%a%</td>
@@ -68,8 +66,7 @@ function second($arg1, $arg2)
 
 function third($arg1)
 {
-	mktime(); // E_STRICT in PHP 5, E_DEPRECATED in PHP 7
-	PHP_MAJOR_VERSION < 7 ? mktime(0, 0, 0, 1, 23, 1978, 1) : mktime(); // E_DEPRECATED
+	mktime(); // E_DEPRECATED
 	$x++; // E_NOTICE
 	min(1); // E_WARNING
 	require __DIR__ . '/fixtures/E_COMPILE_WARNING.php'; // E_COMPILE_WARNING
diff --git a/tests/Tracy/Debugger.warnings.production.phpt b/tests/Tracy/Debugger.warnings.production.phpt
index ccf90ac7c..77f01805e 100644
--- a/tests/Tracy/Debugger.warnings.production.phpt
+++ b/tests/Tracy/Debugger.warnings.production.phpt
@@ -5,6 +5,8 @@
  * @outputMatch
  */
 
+declare(strict_types=1);
+
 use Tracy\Debugger;
 
 
@@ -15,8 +17,7 @@ Debugger::$productionMode = true;
 
 Debugger::enable();
 
-mktime(); // E_STRICT in PHP 5, E_DEPRECATED in PHP 7
-PHP_MAJOR_VERSION < 7 ? @mktime(0, 0, 0, 1, 23, 1978, 1) : @mktime(); // E_DEPRECATED
+mktime(); // E_DEPRECATED
 $x++; // E_NOTICE
 min(1); // E_WARNING
 require __DIR__ . '/fixtures/E_COMPILE_WARNING.php'; // E_COMPILE_WARNING
diff --git a/tests/Tracy/Dumper.debugInfo.phpt b/tests/Tracy/Dumper.debugInfo.phpt
index efbe8c676..7d51db899 100644
--- a/tests/Tracy/Dumper.debugInfo.phpt
+++ b/tests/Tracy/Dumper.debugInfo.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper __debugInfo()
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.dump().phpt b/tests/Tracy/Dumper.dump().phpt
index b34957ec9..130a4a0bb 100644
--- a/tests/Tracy/Dumper.dump().phpt
+++ b/tests/Tracy/Dumper.dump().phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::dump() modes
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.encodeString().phpt b/tests/Tracy/Dumper.encodeString().phpt
index f789e2a33..87509766e 100644
--- a/tests/Tracy/Dumper.encodeString().phpt
+++ b/tests/Tracy/Dumper.encodeString().phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::encodeString()
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.objectExporters.phpt b/tests/Tracy/Dumper.objectExporters.phpt
index 4291f56c0..a226f5943 100644
--- a/tests/Tracy/Dumper.objectExporters.phpt
+++ b/tests/Tracy/Dumper.objectExporters.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper custom object exporters
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toHtml().live.phpt b/tests/Tracy/Dumper.toHtml().live.phpt
index 614c9ba72..125207192 100644
--- a/tests/Tracy/Dumper.toHtml().live.phpt
+++ b/tests/Tracy/Dumper.toHtml().live.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toHtml() live
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toHtml().location.phpt b/tests/Tracy/Dumper.toHtml().location.phpt
index 4ddecb554..af65de1c8 100644
--- a/tests/Tracy/Dumper.toHtml().location.phpt
+++ b/tests/Tracy/Dumper.toHtml().location.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toHtml() with location
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toHtml().php7.phpt b/tests/Tracy/Dumper.toHtml().php7.phpt
index 7f30994dd..fe3fd5820 100644
--- a/tests/Tracy/Dumper.toHtml().php7.phpt
+++ b/tests/Tracy/Dumper.toHtml().php7.phpt
@@ -5,6 +5,8 @@
  * @phpversion 7
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toHtml().phpt b/tests/Tracy/Dumper.toHtml().phpt
index 9af3cdca5..8867196ff 100644
--- a/tests/Tracy/Dumper.toHtml().phpt
+++ b/tests/Tracy/Dumper.toHtml().phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toHtml()
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toTerminal().phpt b/tests/Tracy/Dumper.toTerminal().phpt
index 47b317c49..1691b4a46 100644
--- a/tests/Tracy/Dumper.toTerminal().phpt
+++ b/tests/Tracy/Dumper.toTerminal().phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toTerminal()
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toText().depth.phpt b/tests/Tracy/Dumper.toText().depth.phpt
index a8c794df6..1a4c09238 100644
--- a/tests/Tracy/Dumper.toText().depth.phpt
+++ b/tests/Tracy/Dumper.toText().depth.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toText() depth & truncate
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toText().locale.phpt b/tests/Tracy/Dumper.toText().locale.phpt
index 1a577f10c..8bfd8e79a 100644
--- a/tests/Tracy/Dumper.toText().locale.phpt
+++ b/tests/Tracy/Dumper.toText().locale.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toText() locale
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toText().location.phpt b/tests/Tracy/Dumper.toText().location.phpt
index 8277febf0..723478b92 100644
--- a/tests/Tracy/Dumper.toText().location.phpt
+++ b/tests/Tracy/Dumper.toText().location.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toText() with location
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toText().phpt b/tests/Tracy/Dumper.toText().phpt
index efb44b85f..de01ce209 100644
--- a/tests/Tracy/Dumper.toText().phpt
+++ b/tests/Tracy/Dumper.toText().phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toText()
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toText().recursion.phpt b/tests/Tracy/Dumper.toText().recursion.phpt
index 4635972f1..826d3aa1d 100644
--- a/tests/Tracy/Dumper.toText().recursion.phpt
+++ b/tests/Tracy/Dumper.toText().recursion.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toText() recursion
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Dumper.toText().specialChars.phpt b/tests/Tracy/Dumper.toText().specialChars.phpt
index dc3f867c5..d6d90f52a 100644
--- a/tests/Tracy/Dumper.toText().specialChars.phpt
+++ b/tests/Tracy/Dumper.toText().specialChars.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Dumper::toText() special chars
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Dumper;
 
diff --git a/tests/Tracy/Helpers.getSuggestion().phpt b/tests/Tracy/Helpers.getSuggestion().phpt
index 0ffe981c1..fe282a243 100644
--- a/tests/Tracy/Helpers.getSuggestion().phpt
+++ b/tests/Tracy/Helpers.getSuggestion().phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Helpers::getSuggestion()
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Helpers;
 
diff --git a/tests/Tracy/Helpers.improveException.phpt b/tests/Tracy/Helpers.improveException.phpt
index 795e37752..60eeafc60 100644
--- a/tests/Tracy/Helpers.improveException.phpt
+++ b/tests/Tracy/Helpers.improveException.phpt
@@ -5,6 +5,8 @@
  * @phpversion 7
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Helpers;
 
diff --git a/tests/Tracy/Logger.extensible.phpt b/tests/Tracy/Logger.extensible.phpt
index d88f40380..ff42c3c85 100644
--- a/tests/Tracy/Logger.extensible.phpt
+++ b/tests/Tracy/Logger.extensible.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Logger it can be extended.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Logger;
 
@@ -17,7 +19,7 @@ class CustomLogger extends Logger
 	public $collector = [];
 
 
-	public function log($value, $priority = self::INFO)
+	public function log($value, string $priority = self::INFO): ?string
 	{
 		$exceptionFile = $value instanceof \Exception ? $this->logException($value) : null;
 
diff --git a/tests/Tracy/Logger.log().errors.phpt b/tests/Tracy/Logger.log().errors.phpt
index 74f3d2cc5..31bc82729 100644
--- a/tests/Tracy/Logger.log().errors.phpt
+++ b/tests/Tracy/Logger.log().errors.phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Logger::log() error.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Logger;
 
diff --git a/tests/Tracy/Logger.log().phpt b/tests/Tracy/Logger.log().phpt
index 0418a739c..c8eee25ec 100644
--- a/tests/Tracy/Logger.log().phpt
+++ b/tests/Tracy/Logger.log().phpt
@@ -4,6 +4,8 @@
  * Test: Tracy\Logger logging exceptions in log message.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 use Tracy\Logger;
 
diff --git a/tests/Tracy/PHP.errorHandler.phpt b/tests/Tracy/PHP.errorHandler.phpt
index e8fd88707..5b6548c81 100644
--- a/tests/Tracy/PHP.errorHandler.phpt
+++ b/tests/Tracy/PHP.errorHandler.phpt
@@ -4,6 +4,8 @@
  * Test: PHP error handler.
  */
 
+declare(strict_types=1);
+
 use Tester\Assert;
 
 
diff --git a/tests/Tracy/expected/Debugger.E_ERROR.html.php5.expect b/tests/Tracy/expected/Debugger.E_ERROR.html.php5.expect
deleted file mode 100644
index ee67bccc3..000000000
--- a/tests/Tracy/expected/Debugger.E_ERROR.html.php5.expect
+++ /dev/null
@@ -1,141 +0,0 @@
-
-Fatal error: Call to undefined function missing_function() in %a% on line %d%
-<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-	<meta name="generator" content="Tracy by Nette Framework">
-
-	<title>Fatal Error: Call to undefined function missing_function()</title>
-
-	%A%
-</head>
-
-
-<body>
-<div id="tracy-bs">
-	<a id="tracy-bs-toggle" href="#" class="tracy-toggle"></a>
-	<div>
-		<div id="tracy-bs-error" class="panel">
-			<p>Fatal Error</p>
-
-			<h1><span>Call to undefined function missing_function()</span>
-						<a href="%a%" target="_blank" rel="noreferrer noopener">search&#x25ba;</a>
-			</h1>
-		</div>
-
-
-
-
-
-
-
-
-
-			<div class="panel">
-			<h2><a data-tracy-ref="^+" class="tracy-toggle">Source file</a></h2>
-
-			<div class="inner">
-				<p><b>File:</b> %a%</p>
-				<pre data-tracy-href="%a%" class='code'><div><code><span style="color: #06B"><span style="color: #D24; font-weight: bold"><span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    function </span><span style="color: #000">second</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">$arg1</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">$arg2</span><span style="color: #D24; font-weight: bold">)
-<span class='line'>%d%:</span>    {
-<span class='line'>%d%:</span>        </span><span style="color: #000">third</span><span style="color: #D24; font-weight: bold">([</span><span style="color: #000">1</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">2</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">3</span><span style="color: #D24; font-weight: bold">]);
-<span class='line'>%d%:</span>    }
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    function </span><span style="color: #000">third</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">$arg1</span><span style="color: #D24; font-weight: bold">)
-<span class='line'>%d%:</span>    {
-<span class='highlight'>%d%:        missing_function();
-</span></span><span style="color: #000"></span><span style="color: #D24; font-weight: bold"><span class='line'>%d%:</span>    }
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    </span><span style="color: #000">first</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">10</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #080">'any string'</span><span style="color: #D24; font-weight: bold">);
-</span></span></code></div></pre>			</div></div>
-
-
-
-
-
-
-
-				<div class="panel">
-		<h2><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Exception</a></h2>
-		<div class="tracy-collapsed inner">
-		<pre class="tracy-dump" data-tracy-dump='{"object":"01"}'></pre>
-		</div></div>
-
-
-
-
-
-
-		<div class="panel">
-		<h2><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Environment</a></h2>
-
-		<div class="tracy-collapsed inner">
-			<h3><a data-tracy-ref="^+" class="tracy-toggle">$_SERVER</a></h3>
-			<div class="outer">
-			<table>%A%</table>
-			</div>
-
-
-			<h3><a data-tracy-ref="^+" class="tracy-toggle">$_SESSION</a></h3>
-			<div class="outer">%A%</div>
-
-
-
-
-						<h3><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Constants</a></h3>
-			<div class="outer tracy-collapsed">
-			<table>%A%</table>
-			</div>
-
-
-			<h3><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Configuration options</a></h3>
-			<div class="outer tracy-collapsed">
-			%A%</div>
-		</div></div>
-
-
-		<div class="panel">
-		<h2><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">HTTP request</a></h2>
-
-		<div class="tracy-collapsed inner">
-%A%
-						<h3>$_GET</h3>
-						<p><i>empty</i></p>
-									<h3>$_POST</h3>
-						<p><i>empty</i></p>
-									<h3>$_COOKIE</h3>
-						<p><i>empty</i></p>
-								</div></div>
-
-
-		<div class="panel">
-		<h2><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">HTTP response</a></h2>
-
-		<div class="tracy-collapsed inner">
-			<h3>Headers</h3>
-						<pre>%A%</pre>
-					</div></div>
-
-
-
-
-		<ul>
-			<li>Report generated at %a%</li>
-			<li>CLI%a?%</li>
-			<li>PHP %a%</li>		</ul>
-
-		<div id="tracy-bs-logo"><a href="https://tracy.nette.org" rel="noreferrer"></a></div>
-	</div>
-</div>
-
-<script>%A%</script>
-</body>
-</html>
-
-%A%<!-- Tracy Debug Bar -->%A%
diff --git a/tests/Tracy/expected/Debugger.E_ERROR.html.xdebug.expect b/tests/Tracy/expected/Debugger.E_ERROR.html.xdebug.expect
deleted file mode 100644
index 226208cd1..000000000
--- a/tests/Tracy/expected/Debugger.E_ERROR.html.xdebug.expect
+++ /dev/null
@@ -1,208 +0,0 @@
-
-Fatal error: Call to undefined function missing_function() in %a% on line %d%
-<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-	<meta name="generator" content="Tracy by Nette Framework">
-
-	<title>Fatal Error: Call to undefined function missing_function()</title>
-
-	%A%
-</head>
-
-
-<body>
-<div id="tracy-bs">
-	<a id="tracy-bs-toggle" href="#" class="tracy-toggle"></a>
-	<div>
-		<div id="tracy-bs-error" class="panel">
-			<p>Fatal Error</p>
-
-			<h1><span>Call to undefined function missing_function()</span>
-						<a href="%a%" target="_blank" rel="noreferrer noopener">search&#x25ba;</a>
-			</h1>
-		</div>
-
-
-
-
-
-
-
-
-
-			<div class="panel">
-			<h2><a data-tracy-ref="^+" class="tracy-toggle">Source file</a></h2>
-
-			<div class="inner">
-				<p><b>File:</b> %a%</p>
-				<pre data-tracy-href="%a%" class='code'><div><code><span style="color: #06B"><span style="color: #D24; font-weight: bold"><span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    function </span><span style="color: #000">second</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">$arg1</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">$arg2</span><span style="color: #D24; font-weight: bold">)
-<span class='line'>%d%:</span>    {
-<span class='line'>%d%:</span>        </span><span style="color: #000">third</span><span style="color: #D24; font-weight: bold">([</span><span style="color: #000">1</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">2</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">3</span><span style="color: #D24; font-weight: bold">]);
-<span class='line'>%d%:</span>    }
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    function </span><span style="color: #000">third</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">$arg1</span><span style="color: #D24; font-weight: bold">)
-<span class='line'>%d%:</span>    {
-<span class='highlight'>%d%:        missing_function();
-</span></span><span style="color: #000"></span><span style="color: #D24; font-weight: bold"><span class='line'>%d%:</span>    }
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    </span><span style="color: #000">first</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">10</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #080">'any string'</span><span style="color: #D24; font-weight: bold">);
-</span></span></code></div></pre>			</div></div>
-
-
-									<div class="panel">
-				<h2><a data-tracy-ref="^+" class="tracy-toggle">Call stack</a></h2>
-
-				<div class="inner">
-				<ol>
-										<li><p>
-
-											%a%
-					<a data-tracy-ref="^p + .file" class="tracy-toggle tracy-collapsed">source</a>&nbsp;
-					third()
-					</p>
-
-											<div class="tracy-collapsed file"><pre data-tracy-href="%a%" class='code'><div><code><span style="color: #06B"><span style="color: #D24; font-weight: bold"><span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    function </span><span style="color: #000">first</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">$arg1</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">$arg2</span><span style="color: #D24; font-weight: bold">)
-<span class='line'>%d%:</span>    {
-<span class='line'>%d%:</span>        </span><span style="color: #000">second</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">true</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">false</span><span style="color: #D24; font-weight: bold">);
-<span class='line'>%d%:</span>    }
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    function </span><span style="color: #000">second</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">$arg1</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">$arg2</span><span style="color: #D24; font-weight: bold">)
-<span class='line'>%d%:</span>    {
-<span class='highlight'>%d%:        third([1, 2, 3]);
-</span></span><span style="color: #000"></span><span style="color: #D24; font-weight: bold"></span><span style="color: #000"></span><span style="color: #D24; font-weight: bold"></span><span style="color: #000"></span><span style="color: #D24; font-weight: bold"></span><span style="color: #000"></span><span style="color: #D24; font-weight: bold"><span class='line'>%d%:</span>    }
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    function </span><span style="color: #000">third</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">$arg1</span><span style="color: #D24; font-weight: bold">)
-</span></span></code></div></pre></div>
-
-
-										</li>
-										<li><p>
-
-											%a%
-					<a data-tracy-ref="^p + .file" class="tracy-toggle tracy-collapsed">source</a>&nbsp;
-					second()
-					</p>
-
-											<div class="tracy-collapsed file"><pre data-tracy-href="%a%" class='code'><div><code><span style="color: #06B"><span style="color: #D24; font-weight: bold"><span class='line'>%d%:</span>%A%</div>
-
-
-										</li>
-										<li><p>
-
-											%a%
-					<a data-tracy-ref="^p + .file" class="tracy-toggle tracy-collapsed">source</a>&nbsp;
-					first()
-					</p>
-
-											<div class="tracy-collapsed file"><pre data-tracy-href="%a%" class='code'><div><code><span style="color: #06B"><span style="color: #D24; font-weight: bold"><span class='line'>%d%:</span>        </span><span style="color: #000">third</span><span style="color: #D24; font-weight: bold">([</span><span style="color: #000">1</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">2</span><span style="color: #D24; font-weight: bold">, </span><span style="color: #000">3</span><span style="color: #D24; font-weight: bold">]);
-<span class='line'>%d%:</span>    }
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>    function </span><span style="color: #000">third</span><span style="color: #D24; font-weight: bold">(</span><span style="color: #000">$arg1</span><span style="color: #D24; font-weight: bold">)
-<span class='line'>%d%:</span>    {
-<span class='line'>%d%:</span>        </span><span style="color: #000">missing_function</span><span style="color: #D24; font-weight: bold">();
-<span class='line'>%d%:</span>    }
-<span class='line'>%d%:</span>
-<span class='line'>%d%:</span>
-<span class='highlight'>%d%:    first(10, 'any string');
-</span></span><span style="color: #000"></span><span style="color: #D24; font-weight: bold"></span><span style="color: #000"></span><span style="color: #D24; font-weight: bold"></span><span style="color: #080"></span><span style="color: #D24; font-weight: bold"><span class='line'>%d%:</span>    </span>
-</span></code></div></pre></div>
-
-
-										</li>
-									</ol>
-			</div></div>
-
-
-
-
-
-				<div class="panel">
-		<h2><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Exception</a></h2>
-		<div class="tracy-collapsed inner">
-		<pre class="tracy-dump" data-tracy-dump='{"object":"01"}'></pre>
-		</div></div>
-
-
-
-
-
-
-		<div class="panel">
-		<h2><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Environment</a></h2>
-
-		<div class="tracy-collapsed inner">
-			<h3><a data-tracy-ref="^+" class="tracy-toggle">$_SERVER</a></h3>
-			<div class="outer">
-			<table>%A%</table>
-			</div>
-
-
-			<h3><a data-tracy-ref="^+" class="tracy-toggle">$_SESSION</a></h3>
-			<div class="outer">%A%</div>
-
-
-
-
-						<h3><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Constants</a></h3>
-			<div class="outer tracy-collapsed">
-			<table>%A%</table>
-			</div>
-
-
-			<h3><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Configuration options</a></h3>
-			<div class="outer tracy-collapsed">
-			%A%</div>
-		</div></div>
-
-
-		<div class="panel">
-		<h2><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">HTTP request</a></h2>
-
-		<div class="tracy-collapsed inner">
-%A%
-						<h3>$_GET</h3>
-						<p><i>empty</i></p>
-									<h3>$_POST</h3>
-						<p><i>empty</i></p>
-									<h3>$_COOKIE</h3>
-						<p><i>empty</i></p>
-								</div></div>
-
-
-		<div class="panel">
-		<h2><a data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">HTTP response</a></h2>
-
-		<div class="tracy-collapsed inner">
-			<h3>Headers</h3>
-						<pre>%A%</pre>
-					</div></div>
-
-
-
-
-		<ul>
-			<li>Report generated at %a%</li>
-			<li>CLI%a?%</li>
-			<li>PHP %a%</li>		</ul>
-
-		<div id="tracy-bs-logo"><a href="https://tracy.nette.org" rel="noreferrer"></a></div>
-	</div>
-</div>
-
-<script>%A%</script>
-</body>
-</html>
-
-%A%<!-- Tracy Debug Bar -->%A%
diff --git a/tests/Tracy/expected/Debugger.scream.expect b/tests/Tracy/expected/Debugger.scream.expect
index 8adc0fd09..db3de6c92 100644
--- a/tests/Tracy/expected/Debugger.scream.expect
+++ b/tests/Tracy/expected/Debugger.scream.expect
@@ -1,7 +1,5 @@
 
-%a%: mktime(): You should be using the time() function instead in %a% on line %d%
-
-Deprecated: mktime(): %a%
+Deprecated: mktime(): You should be using the time() function instead in %a% on line %d%
 
 Notice: Undefined variable: x in %a% on line %d%
 
diff --git a/tests/Tracy/fixtures/DumpClass.php b/tests/Tracy/fixtures/DumpClass.php
index f337cf00e..efefb9b7e 100644
--- a/tests/Tracy/fixtures/DumpClass.php
+++ b/tests/Tracy/fixtures/DumpClass.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 class Test
 {
 	public $x = [10, null];
diff --git a/tests/Tracy/fixtures/E_COMPILE_ERROR.php b/tests/Tracy/fixtures/E_COMPILE_ERROR.php
index 9f4a92300..f78d3bda1 100644
--- a/tests/Tracy/fixtures/E_COMPILE_ERROR.php
+++ b/tests/Tracy/fixtures/E_COMPILE_ERROR.php
@@ -1,3 +1,5 @@
 <?php
 
+declare(strict_types=1);
+
 $this = 2;
diff --git a/tests/Tracy/fixtures/E_COMPILE_WARNING.php b/tests/Tracy/fixtures/E_COMPILE_WARNING.php
index 4f453e94d..da025907c 100644
--- a/tests/Tracy/fixtures/E_COMPILE_WARNING.php
+++ b/tests/Tracy/fixtures/E_COMPILE_WARNING.php
@@ -1,3 +1,5 @@
 <?php
 
+declare(strict_types=1);
+
 declare(foo='bar');
diff --git a/tests/Tracy/fixtures/E_STRICT.php b/tests/Tracy/fixtures/E_STRICT.php
index 2475f188d..b24eaaa43 100644
--- a/tests/Tracy/fixtures/E_STRICT.php
+++ b/tests/Tracy/fixtures/E_STRICT.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 class A
 {
 	public function test()
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 9a31b3104..07a45a28b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 // The Nette Tester command-line runner can be
 // invoked through the command: ../vendor/bin/tester .
 
diff --git a/tools/create-phar/create-phar.php b/tools/create-phar/create-phar.php
index 93a8f2cc2..3f13ddb1f 100644
--- a/tools/create-phar/create-phar.php
+++ b/tools/create-phar/create-phar.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 // creates tracy.phar
 if (!class_exists('Phar') || ini_get('phar.readonly')) {
 	echo "Enable Phar extension and set directive 'phar.readonly=off'.\n";
@@ -7,7 +9,7 @@
 }
 
 
-function compressJs($s)
+function compressJs(string $s): string
 {
 	if (function_exists('curl_init')) {
 		$curl = curl_init('https://closure-compiler.appspot.com/compile');
@@ -21,7 +23,7 @@ function compressJs($s)
 }
 
 
-function compressCss($s)
+function compressCss(string $s): string
 {
 	$s = preg_replace('#/\*.*?\*/#s', '', $s); // remove comments
 	$s = preg_replace('#[ \t\r\n]+#', ' ', $s); // compress space, ignore hard space
@@ -56,7 +58,7 @@ function compressCss($s)
 		$s = compressCss($s);
 
 	} elseif ($file->getExtension() === 'phtml') {
-		$s = preg_replace_callback('#(<(script|style).*(?<![?=])>)(.*)(</)#Uis', function ($m) {
+		$s = preg_replace_callback('#(<(script|style).*(?<![?=])>)(.*)(</)#Uis', function ($m): string {
 			list(, $begin, $type, $s, $end) = $m;
 
 			if ($s === '' || strpos($s, '<?') !== false) {