Modernize codebase to use PHP 8.2 features

Roman3349 · Roman3349 · commit 30d63837bddb · 2026-01-16T20:41:50.000+01:00
Signed-off-by: Roman Ondráček &lt;mail@romanondracek.cz&gt;
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
   },
   "require-dev": {
     "contributte/console": "^0.11.0 || ^0.12.0",
-    "contributte/phpstan": "^0.1.0",
+    "contributte/phpstan": "^0.3.1",
     "contributte/qa": "^0.4.0",
     "contributte/tester": "^0.4.0",
     "latte/latte": "^3.0.12",
diff --git a/src/Cache/Cleaners/LocalFilesystemCleaner.php b/src/Cache/Cleaners/LocalFilesystemCleaner.php
@@ -9,20 +9,15 @@
 class LocalFilesystemCleaner implements ICleaner
 {
 
-	/** @var string[] */
-	private array $directories;
-
-	/** @var string[] */
-	private array $ignored;
-
 	/**
 	 * @param string[] $directories
 	 * @param string[] $ignored
 	 */
-	public function __construct(array $directories, array $ignored = [])
+	public function __construct(
+		private readonly array $directories,
+		private readonly array $ignored = [],
+	)
 	{
-		$this->directories = $directories;
-		$this->ignored = $ignored;
 	}
 
 	public function getDescription(): string
diff --git a/src/Cache/Cleaners/MemcachedCleaner.php b/src/Cache/Cleaners/MemcachedCleaner.php
@@ -10,15 +10,13 @@
 class MemcachedCleaner implements ICleaner
 {
 
-	/** @var Memcached[]|Memcache[] */
-	private array $memcaches;
-
 	/**
 	 * @param Memcached[]|Memcache[] $memcaches
 	 */
-	public function __construct(array $memcaches)
+	public function __construct(
+		private readonly array $memcaches,
+	)
 	{
-		$this->memcaches = $memcaches;
 	}
 
 	public function getDescription(): string
diff --git a/src/Cache/Cleaners/NetteCachingStorageCleaner.php b/src/Cache/Cleaners/NetteCachingStorageCleaner.php
@@ -10,15 +10,13 @@
 class NetteCachingStorageCleaner implements ICleaner
 {
 
-	/** @var Storage[] */
-	private array $storages;
-
 	/**
 	 * @param Storage[] $storages
 	 */
-	public function __construct(array $storages)
+	public function __construct(
+		private readonly array $storages,
+	)
 	{
-		$this->storages = $storages;
 	}
 
 	public function getDescription(): string
diff --git a/src/Cache/Generators/DiContainersCacheGenerator.php b/src/Cache/Generators/DiContainersCacheGenerator.php
@@ -9,18 +9,14 @@
 class DiContainersCacheGenerator implements IGenerator
 {
 
-	/** @var mixed[] */
-	private array $config;
-
-	private Configurator $configurator;
-
 	/**
 	 * @param mixed[] $config
 	 */
-	public function __construct(array $config, Configurator $configurator)
+	public function __construct(
+		private readonly array $config,
+		private readonly Configurator $configurator,
+	)
 	{
-		$this->config = $config;
-		$this->configurator = $configurator;
 	}
 
 	public function getDescription(): string
diff --git a/src/Cache/Generators/LatteTemplatesCacheGenerator.php b/src/Cache/Generators/LatteTemplatesCacheGenerator.php
@@ -12,26 +12,17 @@
 class LatteTemplatesCacheGenerator implements IGenerator
 {
 
-	private TemplateFactory $templateFactory;
-
-	/** @var string[] */
-	private array $dirs;
-
-	/** @var string[] */
-	private array $excludeDirs;
-
-	private ?string $rootDir = null;
-
 	/**
 	 * @param string[] $dirs
 	 * @param string[] $excludeDirs
 	 */
-	public function __construct(TemplateFactory $templateFactory, array $dirs, array $excludeDirs = [], ?string $rootDir = null)
+	public function __construct(
+		private readonly TemplateFactory $templateFactory,
+		private readonly array $dirs,
+		private readonly array $excludeDirs = [],
+		private readonly ?string $rootDir = null,
+	)
 	{
-		$this->templateFactory = $templateFactory;
-		$this->dirs = $dirs;
-		$this->excludeDirs = $excludeDirs;
-		$this->rootDir = $rootDir;
 	}
 
 	public function getDescription(): string
diff --git a/src/Command/AdvancedCache/CacheCleanCommand.php b/src/Command/AdvancedCache/CacheCleanCommand.php
@@ -20,17 +20,14 @@
 class CacheCleanCommand extends Command
 {
 
-	/** @var ICleaner[] */
-	private array $cleaners = [];
-
 	/**
 	 * @param ICleaner[] $cleaners
 	 */
-	public function __construct(array $cleaners)
+	public function __construct(
+		private readonly array $cleaners = [],
+	)
 	{
 		parent::__construct();
-
-		$this->cleaners = $cleaners;
 	}
 
 	protected function configure(): void
diff --git a/src/Command/Cache/CachePurgeCommand.php b/src/Command/Cache/CachePurgeCommand.php
@@ -18,17 +18,14 @@
 class CachePurgeCommand extends Command
 {
 
-	/** @var string[] */
-	private array $dirs;
-
 	/**
 	 * @param string[] $dirs
 	 */
-	public function __construct(array $dirs)
+	public function __construct(
+		private readonly array $dirs,
+	)
 	{
 		parent::__construct();
-
-		$this->dirs = $dirs;
 	}
 
 	protected function configure(): void
diff --git a/src/Command/Caching/CachingClearCommand.php b/src/Command/Caching/CachingClearCommand.php
@@ -19,13 +19,11 @@
 class CachingClearCommand extends Command
 {
 
-	private Storage $storage;
-
-	public function __construct(Storage $storage)
+	public function __construct(
+		private readonly Storage $storage,
+	)
 	{
 		parent::__construct();
-
-		$this->storage = $storage;
 	}
 
 	protected function configure(): void
diff --git a/src/Command/DI/DIPurgeCommand.php b/src/Command/DI/DIPurgeCommand.php
@@ -16,17 +16,14 @@
 class DIPurgeCommand extends Command
 {
 
-	/** @var string[] */
-	private array $dirs;
-
 	/**
 	 * @param string[] $dirs
 	 */
-	public function __construct(array $dirs)
+	public function __construct(
+		private readonly array $dirs,
+	)
 	{
 		parent::__construct();
-
-		$this->dirs = $dirs;
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int
diff --git a/src/Command/Database/BackupCommand.php b/src/Command/Database/BackupCommand.php
@@ -18,13 +18,11 @@
 class BackupCommand extends Command
 {
 
-	private string $backupPath;
-
-	public function __construct(string $backupPath = '')
+	public function __construct(
+		private readonly string $backupPath = '',
+	)
 	{
 		parent::__construct();
-
-		$this->backupPath = $backupPath;
 	}
 
 	protected function configure(): void
diff --git a/src/Command/Latte/LattePurgeCommand.php b/src/Command/Latte/LattePurgeCommand.php
@@ -16,17 +16,14 @@
 class LattePurgeCommand extends Command
 {
 
-	/** @var string[] */
-	private array $dirs;
-
 	/**
 	 * @param string[] $dirs
 	 */
-	public function __construct(array $dirs)
+	public function __construct(
+		private readonly array $dirs,
+	)
 	{
 		parent::__construct();
-
-		$this->dirs = $dirs;
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int
diff --git a/src/Command/Latte/LatteWarmupCommand.php b/src/Command/Latte/LatteWarmupCommand.php
@@ -5,7 +5,6 @@
 use Nette\Bridges\ApplicationLatte\Template;
 use Nette\Bridges\ApplicationLatte\TemplateFactory;
 use Nette\Utils\Finder;
-use SplFileInfo;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -20,25 +19,17 @@
 class LatteWarmupCommand extends Command
 {
 
-	private TemplateFactory $templateFactory;
-
-	/** @var string[] */
-	private array $dirs;
-
-	/** @var string[] */
-	private array $excludeDirs;
-
 	/**
 	 * @param string[] $dirs
 	 * @param string[] $excludeDirs
 	 */
-	public function __construct(TemplateFactory $templateFactory, array $dirs, array $excludeDirs = [])
+	public function __construct(
+		private readonly TemplateFactory $templateFactory,
+		private readonly array $dirs,
+		private readonly array $excludeDirs = [],
+	)
 	{
 		parent::__construct();
-
-		$this->templateFactory = $templateFactory;
-		$this->dirs = $dirs;
-		$this->excludeDirs = $excludeDirs;
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int
@@ -58,7 +49,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$stats = ['ok' => 0, 'error' => 0];
 
-		/** @var SplFileInfo $file */
 		foreach ($finder as $file) {
 			try {
 				$latte->warmupCache($file->getPathname());
diff --git a/src/Command/Router/RouterDumpCommand.php b/src/Command/Router/RouterDumpCommand.php
@@ -20,13 +20,11 @@
 final class RouterDumpCommand extends Command
 {
 
-	private Router $router;
-
-	public function __construct(Router $router)
+	public function __construct(
+		private readonly Router $router,
+	)
 	{
 		parent::__construct();
-
-		$this->router = $router;
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int
diff --git a/src/Command/Security/SecurityPasswordCommand.php b/src/Command/Security/SecurityPasswordCommand.php
@@ -22,13 +22,11 @@
 class SecurityPasswordCommand extends Command
 {
 
-	private Passwords $passwords;
-
-	public function __construct(Passwords $passwords)
+	public function __construct(
+		private readonly Passwords $passwords,
+	)
 	{
 		parent::__construct();
-
-		$this->passwords = $passwords;
 	}
 
 	protected function configure(): void
diff --git a/src/DI/AbstractCompilerExtension.php b/src/DI/AbstractCompilerExtension.php
@@ -13,15 +13,13 @@
 abstract class AbstractCompilerExtension extends CompilerExtension
 {
 
-	protected bool $cliMode;
-
-	public function __construct(bool $cliMode = false)
+	public function __construct(
+		protected bool $cliMode = false,
+	)
 	{
 		if (func_num_args() <= 0) {
 			throw new LogicalException(sprintf('Provide CLI mode, e.q. %s(%%consoleMode%%).', static::class));
 		}
-
-		$this->cliMode = $cliMode;
 	}
 
 }
diff --git a/src/DI/ConsoleBridgesExtension.php b/src/DI/ConsoleBridgesExtension.php
@@ -51,8 +51,7 @@ public function loadConfiguration(): void
 			return;
 		}
 
-		/** @var mixed[] $config */
-		$config = $this->config;
+		$config = get_object_vars($this->config);
 
 		/** @var false|array<mixed>|object|null $bridgeConfig */
 		foreach ($config as $bridge => $bridgeConfig) {
diff --git a/tests/Cases/Command/Latte/LatteWarmupCommand.phpt b/tests/Cases/Command/Latte/LatteWarmupCommand.phpt
@@ -30,7 +30,7 @@ Toolkit::test(function (): void {
 	);
 
 	$application = new Application();
-	$application->add(new LatteWarmupCommand(
+	$application->addCommand(new LatteWarmupCommand(
 		$templateFactory,
 		[__DIR__ . '/../../../Fixtures/Latte']
 	));

Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,13 @@`
`10`	`10`	`class MemcachedCleaner implements ICleaner`
`11`	`11`	`{`
`12`	`12`
`13`		`- /** @var Memcached[]\|Memcache[] */`
`14`		`- private array $memcaches;`
`15`		`-`
`16`	`13`	`/**`
`17`	`14`	`* @param Memcached[]\|Memcache[] $memcaches`
`18`	`15`	`*/`
`19`		`- public function __construct(array $memcaches)`
	`16`	`+ public function __construct(`
	`17`	`+ private readonly array $memcaches,`
	`18`	`+ )`
`20`	`19`	`{`
`21`		`- $this->memcaches = $memcaches;`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`public function getDescription(): string`
Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,14 @@`
`20`	`20`	`class CacheCleanCommand extends Command`
`21`	`21`	`{`
`22`	`22`
`23`		`- /** @var ICleaner[] */`
`24`		`- private array $cleaners = [];`
`25`		`-`
`26`	`23`	`/**`
`27`	`24`	`* @param ICleaner[] $cleaners`
`28`	`25`	`*/`
`29`		`- public function __construct(array $cleaners)`
	`26`	`+ public function __construct(`
	`27`	`+ private readonly array $cleaners = [],`
	`28`	`+ )`
`30`	`29`	`{`
`31`	`30`	`parent::__construct();`
`32`		`-`
`33`		`- $this->cleaners = $cleaners;`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`protected function configure(): void`
Original file line number	Diff line number	Diff line change
`@@ -18,17 +18,14 @@`
`18`	`18`	`class CachePurgeCommand extends Command`
`19`	`19`	`{`
`20`	`20`
`21`		`- /** @var string[] */`
`22`		`- private array $dirs;`
`23`		`-`
`24`	`21`	`/**`
`25`	`22`	`* @param string[] $dirs`
`26`	`23`	`*/`
`27`		`- public function __construct(array $dirs)`
	`24`	`+ public function __construct(`
	`25`	`+ private readonly array $dirs,`
	`26`	`+ )`
`28`	`27`	`{`
`29`	`28`	`parent::__construct();`
`30`		`-`
`31`		`- $this->dirs = $dirs;`
`32`	`29`	`}`
`33`	`30`
`34`	`31`	`protected function configure(): void`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,11 @@`
`19`	`19`	`class CachingClearCommand extends Command`
`20`	`20`	`{`
`21`	`21`
`22`		`- private Storage $storage;`
`23`		`-`
`24`		`- public function __construct(Storage $storage)`
	`22`	`+ public function __construct(`
	`23`	`+ private readonly Storage $storage,`
	`24`	`+ )`
`25`	`25`	`{`
`26`	`26`	`parent::__construct();`
`27`		`-`
`28`		`- $this->storage = $storage;`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`protected function configure(): void`
Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,14 @@`
`16`	`16`	`class DIPurgeCommand extends Command`
`17`	`17`	`{`
`18`	`18`
`19`		`- /** @var string[] */`
`20`		`- private array $dirs;`
`21`		`-`
`22`	`19`	`/**`
`23`	`20`	`* @param string[] $dirs`
`24`	`21`	`*/`
`25`		`- public function __construct(array $dirs)`
	`22`	`+ public function __construct(`
	`23`	`+ private readonly array $dirs,`
	`24`	`+ )`
`26`	`25`	`{`
`27`	`26`	`parent::__construct();`
`28`		`-`
`29`		`- $this->dirs = $dirs;`
`30`	`27`	`}`
`31`	`28`
`32`	`29`	`protected function execute(InputInterface $input, OutputInterface $output): int`