Accessor, Locator, Factory: generates promoted properties

nette · Jul 30, 2023 · f90dab0 · f90dab0
1 parent a0c9ea4
commit f90dab0
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 45 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
 		"php": ">=8.0 <8.4",
 		"ext-tokenizer": "*",
 		"nette/neon": "^3.3 || ^4.0",
-		"nette/php-generator": "^4.0",
+		"nette/php-generator": "^4.0.6",
 		"nette/robot-loader": "^4.0",
 		"nette/schema": "^1.2.3",
 		"nette/utils": "^4.0"

diff --git a/src/DI/Definitions/AccessorDefinition.php b/src/DI/Definitions/AccessorDefinition.php
@@ -112,13 +112,10 @@ public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGe
 		$class = (new Nette\PhpGenerator\ClassType)
 			->addImplement($this->getType());
 
-		$class->addProperty('container')
-			->setPrivate();
-
 		$class->addMethod('__construct')
-			->addBody('$this->container = $container;')
-			->addParameter('container')
-			->setType($generator->getClassName());
+			->addPromotedParameter('container')
+				->setPrivate()
+				->setType($generator->getClassName());
 
 		$rm = new \ReflectionMethod($this->getType(), self::MethodGet);
 

diff --git a/src/DI/Definitions/FactoryDefinition.php b/src/DI/Definitions/FactoryDefinition.php
@@ -202,13 +202,10 @@ public function generateMethod(Php\Method $method, Nette\DI\PhpGenerator $genera
 		$class = (new Php\ClassType)
 			->addImplement($this->getType());
 
-		$class->addProperty('container')
-			->setPrivate();
-
 		$class->addMethod('__construct')
-			->addBody('$this->container = $container;')
-			->addParameter('container')
-			->setType($generator->getClassName());
+			->addPromotedParameter('container')
+				->setPrivate()
+				->setType($generator->getClassName());
 
 		$methodCreate = $class->addMethod(self::MethodCreate);
 		$this->resultDefinition->generateMethod($methodCreate, $generator);

diff --git a/src/DI/Definitions/LocatorDefinition.php b/src/DI/Definitions/LocatorDefinition.php
@@ -133,13 +133,10 @@ public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGe
 		$class = (new Nette\PhpGenerator\ClassType)
 			->addImplement($this->getType());
 
-		$class->addProperty('container')
-			->setPrivate();
-
 		$class->addMethod('__construct')
-			->addBody('$this->container = $container;')
-			->addParameter('container')
-			->setType($generator->getClassName());
+			->addPromotedParameter('container')
+				->setPrivate()
+				->setType($generator->getClassName());
 
 		foreach ((new \ReflectionClass($this->getType()))->getMethods() as $rm) {
 			preg_match('#^(get|create)(.*)#', $rm->name, $m);

diff --git a/tests/DI/Definitions.AccessorDefinition.render.phpt b/tests/DI/Definitions.AccessorDefinition.render.phpt
@@ -39,12 +39,9 @@ test('', function () {
 			public function createServiceAbc(): Good2
 			{
 				return new class ($this) implements Good2 {
-					private $container;
-
-
-					public function __construct($container)
-					{
-						$this->container = $container;
+					public function __construct(
+						private $container,
+					) {
 					}
 
 

diff --git a/tests/DI/Definitions.FactoryDefinition.render.phpt b/tests/DI/Definitions.FactoryDefinition.render.phpt
@@ -39,12 +39,9 @@ test('', function () {
 			public function createServiceAbc(): Good2
 			{
 				return new class ($this) implements Good2 {
-					private $container;
-
-
-					public function __construct($container)
-					{
-						$this->container = $container;
+					public function __construct(
+						private $container,
+					) {
 					}
 
 

diff --git a/tests/DI/Definitions.LocatorDefinition.render.create.phpt b/tests/DI/Definitions.LocatorDefinition.render.create.phpt
@@ -40,13 +40,12 @@ test('', function () {
 			public function createServiceAbc(): Good
 			{
 				return new class ($this) implements Good {
-					private $container;%A?%
 					private $mapping = ['first' => 'a', 'second' => 'a'];
 
 
-					public function __construct($container)
-					{
-						$this->container = $container;
+					public function __construct(
+						private $container,
+					) {
 					}
 
 

diff --git a/tests/DI/Definitions.LocatorDefinition.render.get.phpt b/tests/DI/Definitions.LocatorDefinition.render.get.phpt
@@ -40,13 +40,12 @@ test('', function () {
 			public function createServiceAbc(): Good
 			{
 				return new class ($this) implements Good {
-					private $container;%A?%
 					private $mapping = ['first' => 'a', 'second' => 'a'];
 
 
-					public function __construct($container)
-					{
-						$this->container = $container;
+					public function __construct(
+						private $container,
+					) {
 					}
 
 

diff --git a/tests/DI/Definitions.LocatorDefinition.render.multi.phpt b/tests/DI/Definitions.LocatorDefinition.render.multi.phpt
@@ -42,12 +42,9 @@ test('', function () {
 			public function createServiceAbc(): Good
 			{
 				return new class ($this) implements Good {
-					private $container;
-
-
-					public function __construct($container)
-					{
-						$this->container = $container;
+					public function __construct(
+						private $container,
+					) {
 					}