diff --git a/phpstan/phpstan.neon b/phpstan/phpstan.neon
index 3299687..c3eacd4 100755
--- a/phpstan/phpstan.neon
+++ b/phpstan/phpstan.neon
@@ -8,7 +8,7 @@ parameters:
 	excludePaths:
 		- %currentWorkingDirectory%/tests/temp/*
 
-	level: 7
+	level: 8
 
 	checkMissingIterableValueType: false
 
diff --git a/src/Compiler.php b/src/Compiler.php
index 78a89c3..717be7c 100755
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader;
 
@@ -17,7 +17,6 @@
  */
 class Compiler
 {
-
 	private IFileCollection $collection;
 	private IOutputNamingConvention $namingConvention;
 	private string $outputDir;
@@ -206,7 +205,9 @@ protected function generateFiles(array $files, array $watchFiles = []): File
 	{
 		$name = $this->namingConvention->getFilename($files, $this);
 		$path = $this->outputDir . '/' . $name;
-		$lastModified = $this->checkLastModified ? $this->getLastModified($watchFiles) : 0;
+		$lastModified = $this->checkLastModified
+			? $this->getLastModified($watchFiles)
+			: 0;
 
 		if (!file_exists($path) || $lastModified > filemtime($path) || $this->debugging === true) {
 			// disabled: https://github.com/nette/safe-stream/pull/5
diff --git a/src/Contract/IBatchCollection.php b/src/Contract/IBatchCollection.php
index e986330..a8a40a4 100755
--- a/src/Contract/IBatchCollection.php
+++ b/src/Contract/IBatchCollection.php
@@ -1,10 +1,11 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Contract;
 
 interface IBatchCollection
 {
 	public function getBatches(): array;
+
 	public function addBatch(string $type, string $name, array $batch): void;
 }
diff --git a/src/Contract/IFileCollection.php b/src/Contract/IFileCollection.php
index 7aaa3e8..506d77f 100755
--- a/src/Contract/IFileCollection.php
+++ b/src/Contract/IFileCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Contract;
 
diff --git a/src/Contract/IOutputNamingConvention.php b/src/Contract/IOutputNamingConvention.php
index e838f00..c8158b9 100755
--- a/src/Contract/IOutputNamingConvention.php
+++ b/src/Contract/IOutputNamingConvention.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Contract;
 
diff --git a/src/Contract/IWebloaderAssetProvider.php b/src/Contract/IWebloaderAssetProvider.php
index 5db21d2..47ef041 100755
--- a/src/Contract/IWebloaderAssetProvider.php
+++ b/src/Contract/IWebloaderAssetProvider.php
@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Contract;
 
diff --git a/src/DefaultOutputNamingConvention.php b/src/DefaultOutputNamingConvention.php
index 97b6674..070e9d7 100644
--- a/src/DefaultOutputNamingConvention.php
+++ b/src/DefaultOutputNamingConvention.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader;
 
@@ -13,14 +13,13 @@
  */
 class DefaultOutputNamingConvention implements IOutputNamingConvention
 {
-
 	private string $prefix = '';
 	private string $suffix = '';
 
 
 	public static function createCssConvention(): self
 	{
-		$convention = new self();
+		$convention = new self;
 		$convention->setSuffix('.css');
 
 		return $convention;
@@ -29,7 +28,7 @@ public static function createCssConvention(): self
 
 	public static function createJsConvention(): self
 	{
-		$convention = new self();
+		$convention = new self;
 		$convention->setSuffix('.js');
 
 		return $convention;
diff --git a/src/Exception/BatchAlreadyExistsException.php b/src/Exception/BatchAlreadyExistsException.php
index 7117731..718be6f 100755
--- a/src/Exception/BatchAlreadyExistsException.php
+++ b/src/Exception/BatchAlreadyExistsException.php
@@ -1,9 +1,8 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 
-use WebLoader\Exception\WebLoaderException;
 
 class BatchAlreadyExistsException extends WebLoaderException
 {
diff --git a/src/Exception/CompilationException.php b/src/Exception/CompilationException.php
index 9a128fd..887ef9d 100755
--- a/src/Exception/CompilationException.php
+++ b/src/Exception/CompilationException.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 
diff --git a/src/Exception/FileNotFoundException.php b/src/Exception/FileNotFoundException.php
index 9be7131..822cfc3 100644
--- a/src/Exception/FileNotFoundException.php
+++ b/src/Exception/FileNotFoundException.php
@@ -1,10 +1,9 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 
-use WebLoader\Exception\WebLoaderException;
 
 /**
  * FileNotFoundException
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 3c924ed..0d301e1 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 
diff --git a/src/Exception/WebLoaderException.php b/src/Exception/WebLoaderException.php
index 3d894e1..a6db2e8 100644
--- a/src/Exception/WebLoaderException.php
+++ b/src/Exception/WebLoaderException.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Exception;
 
diff --git a/src/File.php b/src/File.php
index 337e8b4..acebbbc 100644
--- a/src/File.php
+++ b/src/File.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader;
 
diff --git a/src/FileCollection.php b/src/FileCollection.php
index d5a3a60..1b38bfa 100755
--- a/src/FileCollection.php
+++ b/src/FileCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader;
 
@@ -16,16 +16,13 @@
  */
 class FileCollection implements IFileCollection
 {
-
-	private string $root;
 	private array $files = [];
 	private array $watchFiles = [];
 	private array $remoteFiles = [];
 
 
-	public function __construct(?string $root = null)
+	public function __construct(private string $root)
 	{
-		$this->root = (string) $root;
 	}
 
 
diff --git a/src/Filter/CssMinFilter.php b/src/Filter/CssMinFilter.php
index fd0dcd0..0b72468 100755
--- a/src/Filter/CssMinFilter.php
+++ b/src/Filter/CssMinFilter.php
@@ -8,7 +8,6 @@
 
 class CssMinFilter
 {
-
 	public function __invoke(string $code, Compiler $compiler, string $file = ''): string
 	{
 		$minifier = new Minifier;
diff --git a/src/Filter/CssUrlsFilter.php b/src/Filter/CssUrlsFilter.php
index 1aad49f..02beef0 100755
--- a/src/Filter/CssUrlsFilter.php
+++ b/src/Filter/CssUrlsFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -16,20 +16,18 @@
  */
 class CssUrlsFilter
 {
-
-	protected string $basePath;
 	private string $docRoot;
 
 
-	public function __construct(string $docRoot, string $basePath = '/')
-	{
+	public function __construct(
+		string $docRoot,
+		protected string $basePath = '/'
+	) {
 		$this->docRoot = Path::normalize($docRoot);
 
 		if (!is_dir($this->docRoot)) {
 			throw new InvalidArgumentException('Given document root is not directory.');
 		}
-
-		$this->basePath = $basePath;
 	}
 
 
@@ -109,9 +107,7 @@ public function __invoke(string $code, Compiler $loader, ?string $file = null):
 
 		$self = $this;
 
-		$return = preg_replace_callback($regexp, function ($matches) use ($self, $file) {
-			return "url('" . $self->absolutizeUrl($matches[2], $matches[1], $file) . "')";
-		}, $code);
+		$return = preg_replace_callback($regexp, fn($matches) => "url('" . $self->absolutizeUrl($matches[2], $matches[1], $file) . "')", $code);
 
 		return (string) $return;
 	}
diff --git a/src/Filter/LessBinFilter.php b/src/Filter/LessBinFilter.php
index b56a873..a09ee1f 100644
--- a/src/Filter/LessBinFilter.php
+++ b/src/Filter/LessBinFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -14,14 +14,11 @@
  */
 class LessBinFilter
 {
-
-	private string $bin;
 	private array $env;
 
 
-	public function __construct(string $bin = 'lessc', array $env = [])
+	public function __construct(private string $bin = 'lessc', array $env = [])
 	{
-		$this->bin = $bin;
 		$this->env = $env + $_ENV;
 		unset($this->env['argv'], $this->env['argc']);
 	}
diff --git a/src/Filter/Process.php b/src/Filter/Process.php
index 9eadfc4..f504558 100644
--- a/src/Filter/Process.php
+++ b/src/Filter/Process.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -19,8 +19,7 @@ public static function run(
 		?string $stdin = null,
 		?string $cwd = null,
 		?array $env = null
-	): string
-	{
+	): string {
 		$descriptorspec = [
 			0 => ['pipe', 'r'], // stdin
 			1 => ['pipe', 'w'], // stdout
diff --git a/src/Filter/ScssFilter.php b/src/Filter/ScssFilter.php
index b73eaae..43fb255 100644
--- a/src/Filter/ScssFilter.php
+++ b/src/Filter/ScssFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -15,13 +15,8 @@
  */
 class ScssFilter
 {
-
-	private ?ScssCompiler $sc;
-
-
-	public function __construct(?ScssCompiler $sc = null)
+	public function __construct(private ?ScssCompiler $sc = null)
 	{
-		$this->sc = $sc;
 	}
 
 
@@ -29,7 +24,7 @@ private function getScssC(): ScssCompiler
 	{
 		// lazy loading
 		if (empty($this->sc)) {
-			$this->sc = new ScssCompiler();
+			$this->sc = new ScssCompiler;
 		}
 
 		return $this->sc;
diff --git a/src/Filter/StylusFilter.php b/src/Filter/StylusFilter.php
index ccf6f47..7ac4b30 100755
--- a/src/Filter/StylusFilter.php
+++ b/src/Filter/StylusFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -14,15 +14,12 @@
  */
 class StylusFilter
 {
-
 	public bool $compress = false;
 	public bool $includeCss = false;
-	private string $bin;
 
 
-	public function __construct(string $bin = 'stylus')
+	public function __construct(private string $bin = 'stylus')
 	{
-		$this->bin = $bin;
 	}
 
 
diff --git a/src/Filter/TypeScriptFilter.php b/src/Filter/TypeScriptFilter.php
index 833106a..b11f174 100755
--- a/src/Filter/TypeScriptFilter.php
+++ b/src/Filter/TypeScriptFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -14,14 +14,11 @@
  */
 class TypeScriptFilter
 {
-
-	private ?string $bin;
 	private ?array $env;
 
 
-	public function __construct(string $bin = 'tsc', array $env = [])
+	public function __construct(private string $bin = 'tsc', array $env = [])
 	{
-		$this->bin = $bin;
 		$this->env = $env + $_ENV;
 		unset($this->env['argv'], $this->env['argc']);
 	}
diff --git a/src/Filter/VariablesFilter.php b/src/Filter/VariablesFilter.php
index be326d4..3ec1203 100644
--- a/src/Filter/VariablesFilter.php
+++ b/src/Filter/VariablesFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Filter;
 
@@ -14,13 +14,11 @@
  */
 class VariablesFilter
 {
-
 	private string $startVariable = '{{$';
 	private string $endVariable = '}}';
-	private array $variables = [];
 
 
-	public function __construct(array $variables = [])
+	public function __construct(private array $variables = [])
 	{
 		foreach ($variables as $key => $value) {
 			$this->$key = $value;
@@ -30,8 +28,8 @@ public function __construct(array $variables = [])
 
 	public function setDelimiter(string $start, string $end): self
 	{
-		$this->startVariable = (string) $start;
-		$this->endVariable = (string) $end;
+		$this->startVariable = $start;
+		$this->endVariable = $end;
 		return $this;
 	}
 
@@ -41,9 +39,7 @@ public function __invoke(string $code): string
 		$start = $this->startVariable;
 		$end = $this->endVariable;
 
-		$variables = array_map(function ($key) use ($start, $end) {
-			return $start . $key . $end;
-		}, array_keys($this->variables));
+		$variables = array_map(fn($key) => $start . $key . $end, array_keys($this->variables));
 
 		$values = array_values($this->variables);
 
diff --git a/src/Nette/CssLoader.php b/src/Nette/CssLoader.php
index b8687c6..8b77dab 100755
--- a/src/Nette/CssLoader.php
+++ b/src/Nette/CssLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Nette;
 
@@ -22,7 +22,7 @@ class CssLoader extends WebLoader
 	private bool $alternate = false;
 
 
-	public function getMedia(): string
+	public function getMedia(): ?string
 	{
 		return $this->media;
 	}
@@ -34,7 +34,7 @@ public function getType(): string
 	}
 
 
-	public function getTitle(): string
+	public function getTitle(): ?string
 	{
 		return $this->title;
 	}
@@ -105,5 +105,4 @@ public function getInlineElement(File $file): Html
 
 		return $el;
 	}
-
 }
diff --git a/src/Nette/CssUrlFilter.php b/src/Nette/CssUrlFilter.php
index 17e5091..2733164 100755
--- a/src/Nette/CssUrlFilter.php
+++ b/src/Nette/CssUrlFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Nette;
 
diff --git a/src/Nette/Diagnostics/Panel.php b/src/Nette/Diagnostics/Panel.php
index e49b614..e239733 100644
--- a/src/Nette/Diagnostics/Panel.php
+++ b/src/Nette/Diagnostics/Panel.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Nette\Diagnostics;
 
@@ -9,7 +9,6 @@
 use Tracy\Debugger;
 use Tracy\IBarPanel;
 use WebLoader\Compiler;
-use WebLoader\File;
 
 /**
  * Debugger panel.
@@ -17,7 +16,6 @@
  */
 class Panel implements IBarPanel
 {
-
 	public static array $types = [
 		'css' => 'CSS files',
 		'js' => 'JavaScript files',
@@ -36,7 +34,9 @@ class Panel implements IBarPanel
 
 	public function __construct(?string $appDir = null)
 	{
-		$this->root = $appDir ? str_replace('\\', DIRECTORY_SEPARATOR, (string) realpath(dirname($appDir))) : '';
+		$this->root = $appDir
+			? str_replace('\\', DIRECTORY_SEPARATOR, (string) realpath(dirname($appDir)))
+			: '';
 		Debugger::getBar()->addPanel($this);
 	}
 
@@ -88,7 +88,7 @@ private function compute(): array
 
 			$generated = $compiler->generate();
 
-			if (is_null($generated)) {
+			if (null === $generated) {
 				continue;
 			}
 
@@ -133,9 +133,7 @@ private function getTable(): string
 	{
 		$latte = new Latte\Engine;
 
-		$latte->addFilter('extension', function ($extension) {
-			return isset(self::$types[$extension]) ? self::$types[$extension] : $extension;
-		});
+		$latte->addFilter('extension', fn($extension) => self::$types[$extension] ?? $extension);
 
 		return $latte->renderToString(__DIR__ . '/panel.latte', [
 			'files' => $this->files,
@@ -161,6 +159,10 @@ public function getTab(): string
 	{
 		$this->compute();
 
+		if (empty($this->size['combined'])) {
+			return '';
+		}
+
 		return '<span title="WebLoader">'
 			. '<svg viewBox="0 -50 600 600" style="vertical-align: bottom; width:1.23em; height:1.55em"><polygon fill="#1565C0" points="75.089,23.98 58.245,108.778 403.138,108.778 392.289,163.309 47.111,163.309 30.549,248.104 375.445,248.104 356.027,344.887 217.273,390.856 96.789,344.887 105.069,302.921 20.272,302.921 0,404.559 199.286,480.791 428.831,404.559 504.771,23.98"/></svg>'
 			. Filters::bytes($this->size['combined'])
diff --git a/src/Nette/Extension.php b/src/Nette/Extension.php
index 6f93257..c258f7f 100644
--- a/src/Nette/Extension.php
+++ b/src/Nette/Extension.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Nette;
 
@@ -8,7 +8,6 @@
 use Nette\DI\Compiler;
 use Nette\DI\CompilerExtension;
 use Nette\DI\ContainerBuilder;
-use Nette\PhpGenerator\ClassType;
 use Nette\Schema\Expect;
 use Nette\Schema\Helpers as SchemaHelpers;
 use Nette\Schema\Processor;
@@ -19,8 +18,8 @@
 use WebLoader\Compiler as WebloaderCompiler;
 use WebLoader\Contract\IWebloaderAssetProvider;
 use WebLoader\Exception\CompilationException;
-use WebLoader\FileCollection;
 use WebLoader\Exception\FileNotFoundException;
+use WebLoader\FileCollection;
 use WebLoader\Nette\Diagnostics\Panel;
 use WebLoader\Nette\SymfonyConsole\GenerateCommand;
 
@@ -57,7 +56,9 @@ private function getJsConfigSchema(bool $useDefaults = false): Schema
 		$async = $useDefaults ? false : null;
 		$defer = $useDefaults ? false : null;
 		$absoluteUrl = $useDefaults ? false : null;
-		$namingConvention = $useDefaults ? ('@' . $this->prefix('jsNamingConvention')) : null;
+		$namingConvention = $useDefaults
+			? ('@' . $this->prefix('jsNamingConvention'))
+			: null;
 
 		return Expect::structure([
 			'checkLastModified' => Expect::bool($checkLastModified),
@@ -89,7 +90,9 @@ private function getCssConfigSchema(bool $useDefaults = false): Schema
 		$async = $useDefaults ? false : null;
 		$defer = $useDefaults ? false : null;
 		$absoluteUrl = $useDefaults ? false : null;
-		$namingConvention = $useDefaults ? ('@' . $this->prefix('cssNamingConvention')) : null;
+		$namingConvention = $useDefaults
+			? ('@' . $this->prefix('cssNamingConvention'))
+			: null;
 
 		return Expect::structure([
 			'checkLastModified' => Expect::bool($checkLastModified),
@@ -343,7 +346,7 @@ private function extractBatchesFromExtensions(): void
 
 		$schemaProcessor = new Processor;
 
-		foreach($batchProviders as $batchProvider) {
+		foreach ($batchProviders as $batchProvider) {
 			$assets = $batchProvider->getWebloaderAssets();
 			$schemaProcessor->process($this->getConfigSchema(), $assets);
 
diff --git a/src/Nette/JavaScriptLoader.php b/src/Nette/JavaScriptLoader.php
index 8833ba4..45ee64e 100644
--- a/src/Nette/JavaScriptLoader.php
+++ b/src/Nette/JavaScriptLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Nette;
 
@@ -36,5 +36,4 @@ public function getInlineElement(File $file): Html
 
 		return $el;
 	}
-
 }
diff --git a/src/Nette/LoaderFactory.php b/src/Nette/LoaderFactory.php
index bc9ca46..6c51603 100644
--- a/src/Nette/LoaderFactory.php
+++ b/src/Nette/LoaderFactory.php
@@ -1,42 +1,24 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Nette;
 
 use Nette\DI\Container;
 use Nette\Http\IRequest;
 use WebLoader\Compiler;
-use WebLoader\DefaultOutputNamingConvention;
 use WebLoader\Contract\IOutputNamingConvention;
+use WebLoader\DefaultOutputNamingConvention;
 
 class LoaderFactory
 {
-
-	private IRequest $httpRequest;
-	private Container $diContainer;
-	private string $extensionName;
-
-	/** @var array<string> */
-	private array $tempPaths;
-
-
-	/**
-	 * @param array<string> $tempPaths
-	 * @param string $extensionName
-	 * @param IRequest $httpRequest
-	 * @param Container $diContainer
-	 */
+	/** @param array<string> $tempPaths */
 	public function __construct(
-		array $tempPaths,
-		string $extensionName,
-		IRequest $httpRequest,
-		Container $diContainer
+		private array $tempPaths,
+		private string $extensionName,
+		private IRequest $httpRequest,
+		private Container $diContainer
 	) {
-		$this->httpRequest = $httpRequest;
-		$this->diContainer = $diContainer;
-		$this->tempPaths = $tempPaths;
-		$this->extensionName = $extensionName;
 	}
 
 
diff --git a/src/Nette/SymfonyConsole/GenerateCommand.php b/src/Nette/SymfonyConsole/GenerateCommand.php
index eaa1a74..2cd5ac4 100644
--- a/src/Nette/SymfonyConsole/GenerateCommand.php
+++ b/src/Nette/SymfonyConsole/GenerateCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Nette\SymfonyConsole;
 
@@ -48,7 +48,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$noFiles = true;
 		foreach ($this->compilers as $compiler) {
 			$file = $compiler->generate();
-			if (!is_null($file)) {
+			if (null !== $file) {
 				$output->writeln($file->getFileName());
 				$noFiles = false;
 			}
diff --git a/src/Nette/WebLoader.php b/src/Nette/WebLoader.php
index 7fbe903..d0a9b63 100755
--- a/src/Nette/WebLoader.php
+++ b/src/Nette/WebLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader\Nette;
 
@@ -18,17 +18,11 @@
  */
 abstract class WebLoader extends Control
 {
-
-	private Compiler $compiler;
-	private string $tempPath;
-	private bool $appendLastModified;
-
-
-	public function __construct(Compiler $compiler, string $tempPath, bool $appendLastModified)
-	{
-		$this->compiler = $compiler;
-		$this->tempPath = $tempPath;
-		$this->appendLastModified = $appendLastModified;
+	public function __construct(
+		private Compiler $compiler,
+		private string $tempPath,
+		private bool $appendLastModified
+	) {
 	}
 
 
diff --git a/src/Path.php b/src/Path.php
index 5dd5b80..1b9a650 100755
--- a/src/Path.php
+++ b/src/Path.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace WebLoader;
 
diff --git a/tests/CompilerTest.php b/tests/CompilerTest.php
index 65a3412..b3104bc 100644
--- a/tests/CompilerTest.php
+++ b/tests/CompilerTest.php
@@ -3,12 +3,14 @@
 
 namespace WebLoader\Test;
 
+use Exception;
 use Mockery;
 use PHPUnit\Framework\TestCase;
 use TypeError;
 use WebLoader\Compiler;
 use WebLoader\Contract\IFileCollection;
 use WebLoader\Contract\IOutputNamingConvention;
+use WebLoader\File;
 use WebLoader\FileCollection;
 use WebLoader\Exception\FileNotFoundException;
 
@@ -52,13 +54,13 @@ protected function setUp(): void
 
 	private function getTempFiles(): array
 	{
-		return (array) glob(__DIR__ . '/temp/webloader-*');
+		return (array)glob(__DIR__ . '/temp/webloader-*');
 	}
 
 
 	public function testEmptyFiles(): void
 	{
-		$this->object->setFileCollection(new FileCollection());
+		$this->object->setFileCollection(new FileCollection(''));
 
 		$ret = $this->object->generate();
 		$this->assertNull($ret);
@@ -91,7 +93,7 @@ public function testGeneratingAndFilters(): void
 		$expectedContent = '-' . PHP_EOL . 'a:cba,' . PHP_EOL . 'b:fed,' . PHP_EOL .
 			'c:ihg,-' . PHP_EOL . 'a:cba,' . PHP_EOL . 'b:fed,' . PHP_EOL . 'c:ihg,';
 
-		$file = $this->object->generate();
+		$file = $this->generateFile();
 
 		$this->assertTrue(is_numeric($file->getLastModified()) && $file->getLastModified() > 0, 'Generate does not provide last modified timestamp correctly.');
 
@@ -103,7 +105,8 @@ public function testGeneratingAndFilters(): void
 
 	public function testGenerateReturnsSourceFilePaths(): void
 	{
-		$file = $this->object->generate();
+		$file = $this->generateFile();
+
 		$this->assertIsArray($file->getSourceFiles());
 		$this->assertCount(3, $file->getSourceFiles());
 		$this->assertFileExists($file->getSourceFiles()[0]);
@@ -144,4 +147,16 @@ public function testNonCallableFileFilter(): void
 		$this->expectException(TypeError::class);
 		$this->object->addFileFilter(4);
 	}
+
+
+	private function generateFile(): File
+	{
+		$file = $this->object->generate();
+
+		if ($file === null) {
+			throw new Exception('Should not be empty');
+		}
+
+		return $file;
+	}
 }