Skip to content

fix dockblock parsing which considers phpstan tags a classes #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2025
Merged

fix dockblock parsing which considers phpstan tags a classes #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9dafdc
wip
micheleorselli Jun 8, 2025
e202f97
improves test
micheleorselli Jun 16, 2025
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/Analyzer/DocblockTypesResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private function resolvePropertyTypes(Node $node): void
$doctrineAnnotations = $docblock->getDoctrineLikeAnnotationTypes();
$doctrineAnnotations = array_shift($doctrineAnnotations);

if (null === $doctrineAnnotations) {
if (!$this->isTypeClass($doctrineAnnotations)) {
return;
}

Expand Down
30 changes: 22 additions & 8 deletions tests/Unit/Analyzer/DocblockTypesResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public function test_it_should_collect_dependencies_defined_in_docblock(): void

use Application\MyDto;
use Domain\ValueObject;
use Symfony\Component\Validator\Constraints AS Assert;

use Application\Model\{User, Product};

Expand All @@ -39,9 +40,20 @@ class MyClass
/** @var array<int, int|string> */
public array $myArray;

/** @var array<int, User> */
/**
* @var array<int, User>
*/
public array $users;

/**
* @Assert\NotBlank
*/
public array $myAssertedArray;

/**
* @phpstan-ignore property.readOnlyByPhpDocDefaultValue
*/
private static ?\UuidFactoryInterface $factory = null;

/**
* @param MyDto[] $dtoList
Expand Down Expand Up @@ -76,13 +88,15 @@ public function myMethod2(array $aParam, array $users): array
$cd = $parser->getClassDescriptions()[0];
$dep = $cd->getDependencies();

self::assertCount(7, $cd->getDependencies());
self::assertCount(9, $cd->getDependencies());
self::assertEquals('Application\Model\User', $dep[0]->getFQCN()->toString());
self::assertEquals('Application\MyDto', $dep[1]->getFQCN()->toString());
self::assertEquals('Domain\ValueObject', $dep[2]->getFQCN()->toString());
self::assertEquals('Application\Model\User', $dep[3]->getFQCN()->toString());
self::assertEquals('Application\Model\Product', $dep[4]->getFQCN()->toString());
self::assertEquals('Domain\Foo\MyOtherClass', $dep[5]->getFQCN()->toString());
self::assertEquals('Application\Model\User', $dep[6]->getFQCN()->toString());
self::assertEquals('Symfony\Component\Validator\Constraints\NotBlank', $dep[1]->getFQCN()->toString());
self::assertEquals('UuidFactoryInterface', $dep[2]->getFQCN()->toString());
self::assertEquals('Application\MyDto', $dep[3]->getFQCN()->toString());
self::assertEquals('Domain\ValueObject', $dep[4]->getFQCN()->toString());
self::assertEquals('Application\Model\User', $dep[5]->getFQCN()->toString());
self::assertEquals('Application\Model\Product', $dep[6]->getFQCN()->toString());
self::assertEquals('Domain\Foo\MyOtherClass', $dep[7]->getFQCN()->toString());
self::assertEquals('Application\Model\User', $dep[8]->getFQCN()->toString());
}
}