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
4 changes: 4 additions & 0 deletions src/Node/ClassPropertiesNode.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ public function getUninitializedProperties(
continue;
}

if ($propertyReflection->getDeclaringClass()->getName() !== $classReflection->getName()) {
$is = TrinaryLogic::createYes();
}

foreach ($extensions as $extension) {
if (!$extension->isInitialized($propertyReflection, $property->getName())) {
continue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,15 @@ public function testBug13856(): void
$this->analyse([__DIR__ . '/data/bug-13856-phpdoc.php'], []);
}

#[RequiresPhp('>= 8.0.0')]
public function testBug14983(): void
{
$this->analyse([__DIR__ . '/data/bug-14983-phpdoc.php'], [
[
'Class Bug14983PhpDoc\UninitializedFromTrait has an uninitialized @readonly property $property. Assign it in the constructor.',
9,
],
]);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,17 @@ public function testRule(): void
]);
}

#[RequiresPhp('>= 8.1.0')]
public function testBug14983(): void
{
$this->analyse([__DIR__ . '/data/bug-14983.php'], [
[
'Class Bug14983\UninitializedFromTrait has an uninitialized readonly property $property. Assign it in the constructor.',
8,
],
]);
}

#[RequiresPhp('>= 8.1.0')]
public function testBug7119(): void
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,10 @@ public function testBug12547(): void
$this->analyse([__DIR__ . '/data/bug-12547.php'], []);
}

#[RequiresPhp('>= 8.0.0')]
public function testBug14983(): void
{
$this->analyse([__DIR__ . '/data/bug-14983-uninitialized.php'], []);
}

}
43 changes: 43 additions & 0 deletions tests/PHPStan/Rules/Properties/data/bug-14983-phpdoc.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php // lint >= 8.0

declare(strict_types = 1);

namespace Bug14983PhpDoc;

trait TraitA {
/** @readonly */
protected string $property;
}

trait TraitB {
use TraitA;
}

class ClassA {
use TraitA;

public function __construct(
/** @readonly */
protected string $property,
) {}
}

class ClassB extends ClassA {
use TraitB;
}

class BodyInitClassA {
use TraitA;

public function __construct(string $property) {
$this->property = $property;
}
}

class BodyInitClassB extends BodyInitClassA {
use TraitB;
}

class UninitializedFromTrait {
use TraitA;
}
35 changes: 35 additions & 0 deletions tests/PHPStan/Rules/Properties/data/bug-14983-uninitialized.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?php // lint >= 8.0

declare(strict_types = 1);

namespace Bug14983Uninitialized;

trait TraitA {
protected string $property;
}

trait TraitB {
use TraitA;
}

class ClassA {
use TraitA;

public function __construct(protected string $property) {}
}

class ClassB extends ClassA {
use TraitB;
}

class BodyInitClassA {
use TraitA;

public function __construct(string $property) {
$this->property = $property;
}
}

class BodyInitClassB extends BodyInitClassA {
use TraitB;
}
55 changes: 55 additions & 0 deletions tests/PHPStan/Rules/Properties/data/bug-14983.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php // lint >= 8.1

declare(strict_types = 1);

namespace Bug14983;

trait TraitA {
protected readonly string $property;
}

trait TraitB {
use TraitA;
}

class ClassA {
use TraitA;

public function __construct(protected readonly string $property) {}
}

class ClassB extends ClassA {
use TraitB;
}

class BodyInitClassA {
use TraitA;

public function __construct(string $property) {
$this->property = $property;
}
}

class BodyInitClassB extends BodyInitClassA {
use TraitB;
}

trait GrandTrait {
use TraitA;
}

class GrandParent1 {
use TraitA;

public function __construct(protected readonly string $property) {}
}

class Parent1 extends GrandParent1 {}

class Child1 extends Parent1 {
use GrandTrait;
}

class UninitializedFromTrait {
use GrandTrait;
}
Loading