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
7 changes: 7 additions & 0 deletions ecs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,11 @@ parameters:
# often soo many cases that need manual attention → skip and resole in automated way
SlevomatCodingStandard\Sniffs\Namespaces\ReferenceUsedNamesOnlySniff.PartialUse: null

SlevomatCodingStandard\Sniffs\Namespaces\ReferenceUsedNamesOnlySniff.ReferenceViaFullyQualifiedName:
# special case for optional entity classes in refactored project
- 'packages/better-php-doc-parser/src/PhpDocNodeFactory/Doctrine/Property_/DoctrineTargetEntityPhpDocNodeFactory.php'
- 'packages/better-php-doc-parser/src/PhpDocNodeFactory/Doctrine/Property_/JoinTablePhpDocNodeFactory.php'
- 'packages/better-php-doc-parser/src/PhpDocNodeFactory/Doctrine/Class_/TablePhpDocNodeFactory.php'
- 'packages/better-php-doc-parser/src/PhpDocNodeFactory/JMS/JMSInjectPhpDocNodeFactory.php'

line_ending: "\n"
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Rector\BetterPhpDocParser\PhpDocNodeFactory\Doctrine\Class_;

use Doctrine\ORM\Mapping\Table;
use Nette\Utils\Strings;
use PhpParser\Node;
use PhpParser\Node\Stmt\Class_;
Expand Down Expand Up @@ -39,7 +38,7 @@ public function __construct(
*/
public function getClasses(): array
{
return [Table::class];
return ['Doctrine\ORM\Mapping\Table'];
}

public function createFromNodeAndTokens(
Expand All @@ -51,7 +50,7 @@ public function createFromNodeAndTokens(
throw new ShouldNotHappenException();
}

/** @var Table|null $table */
/** @var \Doctrine\ORM\Mapping\Table|null $table */
$table = $this->nodeAnnotationReader->readClassAnnotation($node, $annotationClass);
if ($table === null) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

namespace Rector\BetterPhpDocParser\PhpDocNodeFactory\Doctrine\Property_;

use Doctrine\ORM\Mapping\ManyToMany;
use Doctrine\ORM\Mapping\ManyToOne;
use Doctrine\ORM\Mapping\OneToMany;
use Doctrine\ORM\Mapping\OneToOne;
use PhpParser\Node;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
use PHPStan\PhpDocParser\Parser\TokenIterator;
Expand All @@ -25,10 +21,10 @@ final class DoctrineTargetEntityPhpDocNodeFactory extends AbstractPhpDocNodeFact
public function getClasses(): array
{
return [
OneToOneTagValueNode::class => OneToOne::class,
OneToManyTagValueNode::class => OneToMany::class,
ManyToManyTagValueNode::class => ManyToMany::class,
ManyToOneTagValueNode::class => ManyToOne::class,
OneToOneTagValueNode::class => 'Doctrine\ORM\Mapping\OneToOne',
OneToManyTagValueNode::class => 'Doctrine\ORM\Mapping\OneToMany',
ManyToManyTagValueNode::class => 'Doctrine\ORM\Mapping\ManyToMany',
ManyToOneTagValueNode::class => 'Doctrine\ORM\Mapping\ManyToOne',
];
}

Expand All @@ -37,7 +33,7 @@ public function createFromNodeAndTokens(
TokenIterator $tokenIterator,
string $annotationClass
): ?PhpDocTagValueNode {
/** @var OneToOne|OneToMany|ManyToMany|ManyToOne|null $annotation */
/** @var \Doctrine\ORM\Mapping\OneToOne|\Doctrine\ORM\Mapping\OneToMany|\Doctrine\ORM\Mapping\ManyToMany|\Doctrine\ORM\Mapping\ManyToOne|null $annotation */
$annotation = $this->nodeAnnotationReader->readAnnotation($node, $annotationClass);
if ($annotation === null) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Rector\BetterPhpDocParser\PhpDocNodeFactory\Doctrine\Property_;

use Doctrine\ORM\Mapping\JoinTable;
use Nette\Utils\Strings;
use PhpParser\Node;
use PhpParser\Node\Stmt\Property;
Expand Down Expand Up @@ -37,7 +36,7 @@ final class JoinTablePhpDocNodeFactory extends AbstractPhpDocNodeFactory
*/
public function getClasses(): array
{
return [JoinTable::class];
return ['Doctrine\ORM\Mapping\JoinTable'];
}

/**
Expand All @@ -52,7 +51,7 @@ public function createFromNodeAndTokens(
throw new ShouldNotHappenException();
}

/** @var JoinTable|null $joinTable */
/** @var \Doctrine\ORM\Mapping\JoinTable|null $joinTable */
$joinTable = $this->nodeAnnotationReader->readPropertyAnnotation($node, $annotationClass);
if ($joinTable === null) {
return null;
Expand Down Expand Up @@ -104,9 +103,10 @@ public function createFromNodeAndTokens(
}

/**
* @param \Doctrine\ORM\Mapping\JoinTable $joinTable
* @return JoinColumnTagValueNode[]
*/
private function createJoinColumnTagValues(string $annotationContent, JoinTable $joinTable, string $type): array
private function createJoinColumnTagValues(string $annotationContent, $joinTable, string $type): array
{
$joinColumnContents = $this->matchJoinColumnContents($annotationContent);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Rector\BetterPhpDocParser\PhpDocNodeFactory\JMS;

use JMS\DiExtraBundle\Annotation\Inject;
use PhpParser\Node;
use PhpParser\Node\Stmt\Property;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
Expand All @@ -30,7 +29,7 @@ public function __construct(NodeNameResolver $nodeNameResolver)
*/
public function getClasses(): array
{
return [Inject::class];
return ['JMS\DiExtraBundle\Annotation\Inject'];
}

/**
Expand All @@ -45,7 +44,7 @@ public function createFromNodeAndTokens(
return null;
}

/** @var Inject|null $inject */
/** @var \JMS\DiExtraBundle\Annotation\Inject|null $inject */
$inject = $this->nodeAnnotationReader->readPropertyAnnotation($node, $annotationClass);
if ($inject === null) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use Ramsey\Uuid\UuidInterface;
use Rector\AttributeAwarePhpDoc\Ast\PhpDoc\AttributeAwareVarTagValueNode;
use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\SpacelessPhpDocTagNode;
use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Property_\ColumnTagValueNode;
Expand Down Expand Up @@ -40,7 +39,7 @@ public function createVarTagIntValueNode(): AttributeAwareVarTagValueNode

public function createUuidInterfaceVarTagValueNode(): AttributeAwareVarTagValueNode
{
$identifierTypeNode = new IdentifierTypeNode('\\' . UuidInterface::class);
$identifierTypeNode = new IdentifierTypeNode('\Ramsey\Uuid\UuidInterface');

return $this->createVarTagValueNodeWithType($identifierTypeNode);
}
Expand Down