octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-07-22 17:30:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1969 from rectorphp/spacing

Browse Source 
fix spacing with SpacelessPhpDocTagNode
This commit is contained in:
Tomáš Votruba 2019-09-10 20:35:54 +02:00 committed by GitHub
commit 7249858618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/SpacelessPhpDocTagNode.php Normal file
View File

@ -0,0 +1,21 @@
<?php declare(strict_types=1);
namespace Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
/**
* Useful for annotation class based annotation, e.g. @ORM\Entity to prevent space
* between the @ORM\Entity and (someContent)
*/
final class SpacelessPhpDocTagNode extends PhpDocTagNode implements AttributeAwareNodeInterface
{
use AttributeTrait;
public function __toString(): string
{
return $this->name . $this->value;
}
}

16
packages/Doctrine/src/PhpDocParser/Ast/PhpDoc/PhpDocTagNodeFactory.php
View File

@ -6,7 +6,7 @@ use PhpParser\Node\Stmt\Property;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwarePhpDocTagNode;
use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\SpacelessPhpDocTagNode;
use Rector\Doctrine\Uuid\JoinTableNameResolver;
use Rector\Doctrine\ValueObject\DoctrineClass;
use Rector\DoctrinePhpDocParser\Ast\PhpDoc\Property_\ColumnTagValueNode;
@ -44,7 +44,7 @@ final class PhpDocTagNodeFactory
public function createIdTag(): PhpDocTagNode
{
return new PhpDocTagNode(IdTagValueNode::SHORT_NAME, new IdTagValueNode());
return new SpacelessPhpDocTagNode(IdTagValueNode::SHORT_NAME, new IdTagValueNode());
}
public function createUuidColumnTag(bool $isNullable): PhpDocTagNode
@ -59,17 +59,19 @@ final class PhpDocTagNodeFactory
$isNullable ? true : null
);
return new PhpDocTagNode($columnTagValueNode::SHORT_NAME, $columnTagValueNode);
return new SpacelessPhpDocTagNode($columnTagValueNode::SHORT_NAME, $columnTagValueNode);
}
public function createGeneratedValueTag(): PhpDocTagNode
{
return new PhpDocTagNode(GeneratedValueTagValueNode::SHORT_NAME, new GeneratedValueTagValueNode('CUSTOM'));
return new SpacelessPhpDocTagNode(GeneratedValueTagValueNode::SHORT_NAME, new GeneratedValueTagValueNode(
'CUSTOM'
));
}
public function createCustomIdGeneratorTag(): PhpDocTagNode
{
return new PhpDocTagNode(
return new SpacelessPhpDocTagNode(
CustomIdGeneratorTagValueNode::SHORT_NAME,
new CustomIdGeneratorTagValueNode($this->doctrineUuidGeneratorClass)
);
@ -86,13 +88,13 @@ final class PhpDocTagNodeFactory
[new JoinColumnTagValueNode(null, 'uuid')]
);
return new AttributeAwarePhpDocTagNode(JoinTableTagValueNode::SHORT_NAME, $joinTableTagValueNode);
return new SpacelessPhpDocTagNode(JoinTableTagValueNode::SHORT_NAME, $joinTableTagValueNode);
}
public function createJoinColumnTagNode(): PhpDocTagNode
{
$joinColumnTagValueNode = new JoinColumnTagValueNode(null, 'uuid', null, false);
return new AttributeAwarePhpDocTagNode(JoinColumnTagValueNode::SHORT_NAME, $joinColumnTagValueNode);
return new SpacelessPhpDocTagNode(JoinColumnTagValueNode::SHORT_NAME, $joinColumnTagValueNode);
}
}

2
packages/Doctrine/tests/Rector/Class_/AddUuidMirrorForRelationPropertyRector/Fixture/to_many.php.inc
View File

@ -52,7 +52,7 @@ class ToMany
private $amenity;
/**
* @ORM\ManyToMany(targetEntity="Rector\Doctrine\Tests\Rector\Class_\AddUuidMirrorForRelationPropertyRector\Fixture\FooEntity", cascade={"persist", "merge"})
* @ORM\JoinTable (name="tomany_fooentity_uuid", joinColumns={@ORM\JoinColumn(referencedColumnName="uuid")}, inverseJoinColumns={@ORM\JoinColumn(referencedColumnName="uuid")})
* @ORM\JoinTable(name="tomany_fooentity_uuid", joinColumns={@ORM\JoinColumn(referencedColumnName="uuid")}, inverseJoinColumns={@ORM\JoinColumn(referencedColumnName="uuid")})
*/
private $amenityUuid;
}

2
packages/Doctrine/tests/Rector/Class_/AddUuidToEntityWhereMissingRector/Fixture/add_single_table_inheritance_with_identifier.php.inc
View File

@ -46,7 +46,7 @@ abstract class ParentSingleTableInheritanceWithIdentifier
}
/**
* @var \Ramsey\Uuid\UuidInterface
* @ORM\Column (type="uuid_binary", unique=true, nullable=true)
* @ORM\Column(type="uuid_binary", unique=true, nullable=true)
*/
private $uuid;
/**