Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Reflection/ReflectionClass.php
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ private function createImmediateProperties(ClassNode|InterfaceNode|TraitNode|Enu

$propertyNode = new Node\Stmt\Property(
$parameterNode->flags,
[new Node\PropertyItem($parameterNameNode->name)],
[new Node\PropertyItem($parameterNameNode->name, $parameterNode->default)],
$parameterNode->getAttributes(),
$parameterNode->type,
$parameterNode->attrGroups,
Expand Down
7 changes: 7 additions & 0 deletions test/unit/Fixture/ExampleClass.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ interface ExampleInterface
{
}

class ClassWithPromotedPropertyWithArrayDefault
{
public function __construct(protected array $parameters = [])
{
}
}

class ExampleClassWhereConstructorIsNotFirstMethod
{
public function someMethod()
Expand Down
17 changes: 15 additions & 2 deletions test/unit/Reflection/ReflectionPropertyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
use Roave\BetterReflectionTest\Fixture\ClassForHinting;
use Roave\BetterReflectionTest\Fixture\ClassUsesTraitStaticPropertyGetSet;
use Roave\BetterReflectionTest\Fixture\ClassWithAttributes;
use Roave\BetterReflectionTest\Fixture\ClassWithPromotedPropertyWithArrayDefault;
use Roave\BetterReflectionTest\Fixture\DefaultProperties;
use Roave\BetterReflectionTest\Fixture\ExampleClass;
use Roave\BetterReflectionTest\Fixture\InitializedProperties;
Expand Down Expand Up @@ -298,15 +299,27 @@ public function testIsPromoted(): void
self::assertTrue($promotedProperty->isPrivate());
self::assertTrue($promotedProperty->hasType());
self::assertSame('int|null', $promotedProperty->getType()->__toString());
self::assertFalse($promotedProperty->hasDefaultValue());
self::assertNull($promotedProperty->getDefaultValue());
self::assertTrue($promotedProperty->hasDefaultValue());
self::assertSame(123, $promotedProperty->getDefaultValue());
self::assertSame(54, $promotedProperty->getStartLine());
self::assertSame(54, $promotedProperty->getEndLine());
self::assertSame(60, $promotedProperty->getStartColumn());
self::assertSame(95, $promotedProperty->getEndColumn());
self::assertSame('/** Some doccomment */', $promotedProperty->getDocComment());
}

public function testPromotedPropertyWithArrayDefaultValue(): void
{
$reflector = new DefaultReflector(new SingleFileSourceLocator(__DIR__ . '/../Fixture/ExampleClass.php', $this->astLocator));
$classInfo = $reflector->reflectClass(ClassWithPromotedPropertyWithArrayDefault::class);

$property = $classInfo->getProperty('parameters');

self::assertTrue($property->isPromoted());
self::assertTrue($property->hasDefaultValue());
self::assertSame([], $property->getDefaultValue());
}

public function testIsDefaultAndIsDynamic(): void
{
$classInfo = $this->reflector->reflectClass(ExampleClass::class);
Expand Down
2 changes: 1 addition & 1 deletion test/unit/Reflector/DefaultReflectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function testReflectAllClasses(): void
))->reflectAllClasses();

self::assertContainsOnlyInstancesOf(ReflectionClass::class, $classes);
self::assertCount(11, $classes);
self::assertCount(12, $classes);
}

public function testReflectFunction(): void
Expand Down
Loading