Skip to content

Commit

Permalink
fixup! fixup! fix TagValueNodeReprintTest
Browse files Browse the repository at this point in the history
  • Loading branch information
TomasVotruba committed Mar 29, 2021
1 parent f899cfe commit e210efc
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
use Rector\BetterPhpDocParser\ValueObject\PhpDocNode\PHPDI\PHPDIInjectTagValueNode;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\PhpVersionFeature;
Expand All @@ -23,7 +22,6 @@
use Rector\FamilyTree\NodeAnalyzer\PropertyUsageAnalyzer;
use Rector\Nette\PhpDoc\Node\NetteInjectTagNode;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Symfony\PhpDoc\Node\JMS\JMSInjectTagValueNode;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;

Expand Down Expand Up @@ -142,7 +140,6 @@ public function refactor(Node $node): ?Node
return $this->refactorNetteInjectProperty($phpDocInfo, $node);
}


dump($phpDocInfo->getPhpDocNode()->children);

foreach (self::INJECT_ANNOTATION_CLASSES as $injectAnnotationClass) {
Expand All @@ -155,7 +152,7 @@ public function refactor(Node $node): ?Node

if ($serviceType instanceof MixedType) {
$injectTagNode = $phpDocInfo->getByAnnotationClass($injectAnnotationClass);
if (!$injectTagNode instanceof DoctrineAnnotationTagValueNode) {
if (! $injectTagNode instanceof DoctrineAnnotationTagValueNode) {
continue;
}

Expand Down
10 changes: 8 additions & 2 deletions rules/DependencyInjection/TypeAnalyzer/JMSDITypeResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,17 @@ public function __construct(
$this->reflectionProvider = $reflectionProvider;
}

public function resolve(PhpDocInfo $phpDocInfo, Property $property, DoctrineAnnotationTagValueNode $doctrineAnnotationTagValueNode): Type
public function resolve(
PhpDocInfo $phpDocInfo,
Property $property,
DoctrineAnnotationTagValueNode $doctrineAnnotationTagValueNode
): Type
{
$serviceMap = $this->serviceMapProvider->provide();

$serviceName = $doctrineAnnotationTagValueNode->getValueWithoutQuotes('serviceName') ?: $doctrineAnnotationTagValueNode->getSilentValue();
$serviceName = $doctrineAnnotationTagValueNode->getValueWithoutQuotes(
'serviceName'
) ?: $doctrineAnnotationTagValueNode->getSilentValue();

if ($serviceName) {
if ($this->reflectionProvider->hasClass($serviceName)) {
Expand Down
1 change: 0 additions & 1 deletion src/PhpParser/Node/NodeFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
use Rector\Core\Php\PhpVersionProvider;
use Rector\Core\ValueObject\MethodName;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\Nette\PhpDoc\Node\NetteInjectTagNode;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\PostRector\ValueObject\PropertyMetadata;
Expand Down

0 comments on commit e210efc

Please sign in to comment.