Fixied PromotedParameter in the Reactor (#922)

spiral · Apr 20, 2023 · 2a98a77 · 2a98a77
1 parent 566d6a2
commit 2a98a77
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "spiral/files": "^3.7",
+        "spiral/files": "^3.8",
         "doctrine/inflector": "^1.4|^2.0",
         "nette/php-generator": "^4.0.1"
     },
@@ -50,7 +50,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.7.x-dev"
+            "dev-master": "3.8.x-dev"
         }
     },
     "config": {

diff --git a/src/Partial/Parameter.php b/src/Partial/Parameter.php
@@ -16,14 +16,14 @@ class Parameter implements NamedInterface, AggregableInterface
     use Traits\AttributeAware;
     use Traits\NameAware;
 
-    private NetteParameter $element;
+    protected NettePromotedParameter|NetteParameter $element;
 
     public function __construct(string $name)
     {
         $this->element = new NetteParameter((new InflectorFactory())->build()->camelize($name));
     }
 
-    public function setReference(bool $state = true): self
+    public function setReference(bool $state = true): static
     {
         $this->element->setReference($state);
 
@@ -35,7 +35,7 @@ public function isReference(): bool
         return $this->element->isReference();
     }
 
-    public function setType(?string $type): self
+    public function setType(?string $type): static
     {
         $this->element->setType($type);
 
@@ -49,7 +49,7 @@ public function getType(): ?string
         return $type === null ? null : (string) $type;
     }
 
-    public function setNullable(bool $state = true): self
+    public function setNullable(bool $state = true): static
     {
         $this->element->setNullable($state);
 
@@ -61,7 +61,7 @@ public function isNullable(): bool
         return $this->element->isNullable();
     }
 
-    public function setDefaultValue(mixed $value): self
+    public function setDefaultValue(mixed $value): static
     {
         $this->element->setDefaultValue($value);
 

diff --git a/src/Partial/PromotedParameter.php b/src/Partial/PromotedParameter.php
@@ -13,8 +13,6 @@ final class PromotedParameter extends Parameter
     use Traits\CommentAware;
     use Traits\VisibilityAware;
 
-    private NettePromotedParameter $element;
-
     public function __construct(string $name)
     {
         $this->element = new NettePromotedParameter((new InflectorFactory())->build()->camelize($name));

diff --git a/tests/ClassDeclarationTest.php b/tests/ClassDeclarationTest.php
@@ -97,8 +97,8 @@ public function testClassDeclarationWithMethods(): void
             ->setBody('return count($items ?: $this->items);');
 
         $method->addParameter('items', [])
-        ->setReference()
-        ->setType('array');
+            ->setReference()
+            ->setType('array');
 
         $this->assertSame(preg_replace('/\s+/', '', '
         class MyClass extends Spiral\Tests\Reactor\ClassDeclarationTest implements Countable
@@ -251,6 +251,19 @@ final class MyClass extends Spiral\Tests\Reactor\ClassDeclarationTest implements
         $this->assertSame($expect, preg_replace('/\s+/', '', $class->__toString()));
     }
 
+    public function testRenderPromotedParameter(): void
+    {
+        $class = new ClassDeclaration('MyClass');
+
+        $class->addMethod('__construct')
+            ->addPromotedParameter('foo')
+            ->setType('string')
+            ->setPrivate()
+            ->setReadOnly();
+
+        $this->assertStringContainsString('private readonly string $foo', $class->render());
+    }
+
     public function testFromElement(): void
     {
         $class = ClassDeclaration::fromElement(new ClassType('Test'));