used constructor promotion

Author: dg

src/Application/ErrorPresenter.php

@@ -22,12 +22,9 @@ final class ErrorPresenter implements Application\IPresenter
 {
 	use Nette\SmartObject;
 
-	private ?ILogger $logger;
-
-
-	public function __construct(ILogger $logger = null)
-	{
-		$this->logger = $logger;
+	public function __construct(
+		private ?ILogger $logger = null,
+	) {
 	}
 
 

src/Application/LinkGenerator.php

@@ -21,18 +21,11 @@ final class LinkGenerator
 {
 	use Nette\SmartObject;
 
-	private Router $router;
-
-	private UrlScript $refUrl;
-
-	private ?IPresenterFactory $presenterFactory;
-
-
-	public function __construct(Router $router, UrlScript $refUrl, IPresenterFactory $presenterFactory = null)
-	{
-		$this->router = $router;
-		$this->refUrl = $refUrl;
-		$this->presenterFactory = $presenterFactory;
+	public function __construct(
+		private Router $router,
+		private UrlScript $refUrl,
+		private ?IPresenterFactory $presenterFactory = null,
+	) {
 	}
 
 

src/Application/MicroPresenter.php

@@ -24,23 +24,14 @@ final class MicroPresenter implements Application\IPresenter
 {
 	use Nette\SmartObject;
 
-	private ?Nette\DI\Container $context;
-
-	private ?Nette\Http\IRequest $httpRequest;
-
-	private ?Router $router;
-
 	private ?Application\Request $request;
 
 
 	public function __construct(
-		Nette\DI\Container $context = null,
-		Http\IRequest $httpRequest = null,
-		Router $router = null,
+		private ?Nette\DI\Container $context = null,
+		private ?Nette\Http\IRequest $httpRequest = null,
+		private ?Router $router = null,
 	) {
-		$this->context = $context;
-		$this->httpRequest = $httpRequest;
-		$this->router = $router;
 	}
 
 

src/Application/Request.php

@@ -37,36 +37,18 @@ final class Request
 	/** flag */
 	public const VARYING = 'varying';
 
-	private ?string $method;
-
-	private array $flags = [];
-
-	private string $name;
-
-	private array $params;
-
-	private array $post;
-
-	private array $files;
-
 
 	/**
 	 * @param  string  $name  presenter name (module:module:presenter)
 	 */
 	public function __construct(
-		string $name,
-		string $method = null,
-		array $params = [],
-		array $post = [],
-		array $files = [],
-		array $flags = [],
+		private string $name,
+		private ?string $method = null,
+		private array $params = [],
+		private array $post = [],
+		private array $files = [],
+		private array $flags = [],
 	) {
-		$this->name = $name;
-		$this->method = $method;
-		$this->params = $params;
-		$this->post = $post;
-		$this->files = $files;
-		$this->flags = $flags;
 	}
 
 

src/Bridges/ApplicationDI/ApplicationExtension.php

@@ -22,27 +22,18 @@
  */
 final class ApplicationExtension extends Nette\DI\CompilerExtension
 {
-	private bool $debugMode;
-
 	private array $scanDirs;
 
-	private ?Nette\Loaders\RobotLoader $robotLoader;
-
 	private int $invalidLinkMode;
 
-	private ?string $tempDir;
-
 
 	public function __construct(
-		bool $debugMode = false,
+		private bool $debugMode = false,
 		array $scanDirs = null,
-		string $tempDir = null,
-		Nette\Loaders\RobotLoader $robotLoader = null,
+		private ?string $tempDir = null,
+		private ?Nette\Loaders\RobotLoader $robotLoader = null,
 	) {
-		$this->debugMode = $debugMode;
 		$this->scanDirs = (array) $scanDirs;
-		$this->tempDir = $tempDir;
-		$this->robotLoader = $robotLoader;
 	}
 
 

src/Bridges/ApplicationDI/PresenterFactoryCallback.php

@@ -18,18 +18,11 @@
  */
 final class PresenterFactoryCallback
 {
-	private Nette\DI\Container $container;
-
-	private int $invalidLinkMode;
-
-	private ?string $touchToRefresh;
-
-
-	public function __construct(Nette\DI\Container $container, int $invalidLinkMode, ?string $touchToRefresh)
-	{
-		$this->container = $container;
-		$this->invalidLinkMode = $invalidLinkMode;
-		$this->touchToRefresh = $touchToRefresh;
+	public function __construct(
+		private Nette\DI\Container $container,
+		private int $invalidLinkMode,
+		private ?string $touchToRefresh,
+	) {
 	}
 
 

src/Bridges/ApplicationLatte/TemplateFactory.php

@@ -24,28 +24,16 @@ class TemplateFactory implements UI\TemplateFactory
 	/** @var array<callable(Template): void>  Occurs when a new template is created */
 	public $onCreate = [];
 
-	private LatteFactory $latteFactory;
-
-	private ?Nette\Http\IRequest $httpRequest;
-
-	private ?Nette\Security\User $user;
-
-	private ?Nette\Caching\Storage $cacheStorage;
-
 	private string $templateClass;
 
 
 	public function __construct(
-		LatteFactory $latteFactory,
-		Nette\Http\IRequest $httpRequest = null,
-		Nette\Security\User $user = null,
-		Nette\Caching\Storage $cacheStorage = null,
+		private LatteFactory $latteFactory,
+		private ?Nette\Http\IRequest $httpRequest = null,
+		private ?Nette\Security\User $user = null,
+		private ?Nette\Caching\Storage $cacheStorage = null,
 		$templateClass = null,
 	) {
-		$this->latteFactory = $latteFactory;
-		$this->httpRequest = $httpRequest;
-		$this->user = $user;
-		$this->cacheStorage = $cacheStorage;
 		if ($templateClass && (!class_exists($templateClass) || !is_a($templateClass, Template::class, true))) {
 			throw new Nette\InvalidArgumentException("Class $templateClass does not implement " . Template::class . ' or it does not exist.');
 		}