support for final promoted property in PHP 8.5

Author: dg

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "nette/php-generator",
-	"description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 8.4 features.",
+	"description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 8.5 features.",
 	"keywords": ["nette", "php", "code", "scaffolding"],
 	"homepage": "https://nette.org",
 	"license": ["BSD-3-Clause", "GPL-2.0-only", "GPL-3.0-only"],

src/PhpGenerator/Printer.php

@@ -345,7 +345,10 @@ private function formatParameters(Closure|GlobalFunction|Method|PropertyHook $fu
 				$this->printDocComment($param)
 				. ($attrs ? ($multiline ? substr($attrs, 0, -1) . "\n" : $attrs) : '')
 				. ($param instanceof PromotedParameter
-					? $this->printPropertyVisibility($param) . ($param->isReadOnly() && $param->getType() ? ' readonly' : '') . ' '
+					? ($param->isFinal() ? 'final ' : '')
+						. $this->printPropertyVisibility($param)
+						. ($param->isReadOnly() && $param->getType() ? ' readonly' : '')
+						. ' '
 					: '')
 				. ltrim($this->printType($param->getType(), $param->isNullable()) . ' ')
 				. ($param->isReference() ? '&' : '')

src/PhpGenerator/Property.php

@@ -28,7 +28,6 @@ final class Property
 	private ?string $type = null;
 	private bool $nullable = false;
 	private bool $initialized = false;
-	private bool $final = false;
 	private bool $abstract = false;
 
 
@@ -101,19 +100,6 @@ public function isInitialized(): bool
 	}
 
 
-	public function setFinal(bool $state = true): static
-	{
-		$this->final = $state;
-		return $this;
-	}
-
-
-	public function isFinal(): bool
-	{
-		return $this->final;
-	}
-
-
 	public function setAbstract(bool $state = true): static
 	{
 		$this->abstract = $state;

src/PhpGenerator/Traits/PropertyLike.php

@@ -23,6 +23,7 @@ trait PropertyLike
 {
 	/** @var array{'set' => ?string, 'get' => ?string} */
 	private array $visibility = [PropertyAccessMode::Set => null, PropertyAccessMode::Get => null];
+	private bool $final = false;
 	private bool $readOnly = false;
 
 	/** @var array<string, ?PropertyHook> */
@@ -95,6 +96,19 @@ public function isPrivate(string $mode = PropertyAccessMode::Get): bool
 	}
 
 
+	public function setFinal(bool $state = true): static
+	{
+		$this->final = $state;
+		return $this;
+	}
+
+
+	public function isFinal(): bool
+	{
+		return $this->final;
+	}
+
+
 	public function setReadOnly(bool $state = true): static
 	{
 		$this->readOnly = $state;

tests/PhpGenerator/PropertyLike.hooks.phpt

@@ -79,6 +79,14 @@ $method->addPromotedParameter('second')
 		->addParameter('value')
 			->setType('string');
 
+$method->addPromotedParameter('third')
+	->setPublic()
+	->setProtected('set')
+	->setFinal()
+	->setType('string')
+	->addComment('hello')
+	->addAttribute('Example');
+
 same(<<<'XX'
 	class Demo
 	{
@@ -91,6 +99,9 @@ same(<<<'XX'
 			public string $second {
 				final set(string $value) => $value;
 			},
+			/** hello */
+			#[Example]
+			final public protected(set) string $third,
 		) {
 		}
 	}