Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
17 changes: 9 additions & 8 deletions src/Reflection/Php/PhpClassReflectionExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -891,14 +891,6 @@ public function createUserlandMethodReflection(ClassReflection $fileDeclaringCla
}
$phpDocParameterTypes[$paramName] = $paramTag->getType();
}
foreach ($phpDocParameterTypes as $paramName => $paramType) {
$phpDocParameterTypes[$paramName] = TemplateTypeHelper::resolveTemplateTypes(
$paramType,
$phpDocBlockClassReflection->getActiveTemplateTypeMap(),
$phpDocBlockClassReflection->getCallSiteVarianceMap(),
TemplateTypeVariance::createContravariant(),
);
}
foreach ($resolvedPhpDoc->getParamOutTags() as $paramName => $paramOutTag) {
$phpDocParameterOutTypes[$paramName] = TemplateTypeHelper::resolveTemplateTypes(
$paramOutTag->getType(),
Expand Down Expand Up @@ -938,6 +930,15 @@ public function createUserlandMethodReflection(ClassReflection $fileDeclaringCla
}
}

foreach ($phpDocParameterTypes as $paramName => $paramType) {
$phpDocParameterTypes[$paramName] = TemplateTypeHelper::resolveTemplateTypes(
$paramType,
$phpDocBlockClassReflection->getActiveTemplateTypeMap(),
$phpDocBlockClassReflection->getCallSiteVarianceMap(),
TemplateTypeVariance::createContravariant(),
);
}

return $this->methodReflectionFactory->create(
$actualDeclaringClass,
$declaringTrait,
Expand Down
12 changes: 12 additions & 0 deletions tests/PHPStan/Rules/Classes/InstantiationRuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -615,4 +615,16 @@ public function testBug11006(): void
$this->analyse([__DIR__ . '/data/bug-11006.php'], []);
}

#[RequiresPhp('>= 8.0')]
public function testBug14138(): void
{
$this->analyse([__DIR__ . '/data/bug-14138.php'], [
[
'Parameter #1 $data of class Bug14138\Foo constructor expects array{foo: int, bar: int}, array{foo: 1} given.',
36,
"Array does not have offset 'bar'.",
],
]);
}

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

declare(strict_types = 1);

namespace Bug14138;

/**
* @template T of array
*/
abstract class AbstractApiData
{
public function __construct(
/** @var T */
protected array $data
) {}

/**
* @return T
*/
public function getData(): array
{
return $this->data;
}
}


/**
* @extends AbstractApiData<array{
* foo: int,
* bar: int,
* }>
*/
class Foo extends AbstractApiData {}

function testing(): void {
$a = new Foo(["foo" => 1]);
}
Loading