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
26 changes: 25 additions & 1 deletion packages/Doctrine/src/NodeFactory/EntityUuidNodeFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Property;
use Rector\Doctrine\PhpDocParser\Ast\PhpDoc\PhpDocTagNodeFactory;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockManipulator;

final class EntityUuidNodeFactory
Expand Down Expand Up @@ -78,11 +81,17 @@ public function createUuidPropertyDefaultValueAssign(): Expression
* $this->uid = \Ramsey\Uuid\Uuid::uuid4();
* }
*/
public function createConstructorWithUuidPropertyDefaultValueAssign(): ClassMethod
public function createConstructorWithUuidInitialization(Class_ $class): ClassMethod
{
$classMethodBuilder = $this->builderFactory->method('__construct');
$classMethodBuilder->makePublic();

// keep parent constructor call
if ($this->hasParentClassConstructor($class)) {
$parentClassCall = $this->createParentConstructCall();
$classMethodBuilder->addStmt($parentClassCall);
}

$assign = $this->createUuidPropertyDefaultValueAssign();
$classMethodBuilder->addStmt($assign);

Expand Down Expand Up @@ -139,4 +148,19 @@ private function replaceIntSerializerTypeWithString(Node $node): void

$node->setDocComment(new Doc($stringTypeText));
}

private function hasParentClassConstructor(Class_ $class): bool
{
$parentClassName = $class->getAttribute(AttributeKey::PARENT_CLASS_NAME);
if ($parentClassName === null) {
return false;
}

return method_exists($parentClassName, '__construct');
}

private function createParentConstructCall(): StaticCall
{
return new StaticCall(new Name('parent'), '__construct');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function refactor(Node $node): ?Node
$assignExpression = $this->entityUuidNodeFactory->createUuidPropertyDefaultValueAssign();
$constructClassMethod->stmts = array_merge([$assignExpression], (array) $constructClassMethod->stmts);
} else {
$constructClassMethod = $this->entityUuidNodeFactory->createConstructorWithUuidPropertyDefaultValueAssign();
$constructClassMethod = $this->entityUuidNodeFactory->createConstructorWithUuidInitialization($node);
$node->stmts = array_merge([$constructClassMethod], $node->stmts);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public function test(): void
__DIR__ . '/Fixture/fixture.php.inc',
__DIR__ . '/Fixture/already_has_constructor.php.inc',
__DIR__ . '/Fixture/process_string_id.php.inc',
__DIR__ . '/Fixture/with_parent_constructor.php.inc',
// skip
__DIR__ . '/Fixture/skip_id_with_uuid_type.php.inc',
__DIR__ . '/Fixture/skip_id_with_uuid_binary_type.php.inc',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

namespace Rector\Doctrine\Tests\Rector\Class_\AddUuidToEntityWhereMissingRector\Fixture;

use Doctrine\ORM\Mapping as ORM;
use Rector\Doctrine\Tests\Rector\Class_\AddUuidToEntityWhereMissingRector\Source\BaseEntityWithConstructor;

/**
* @ORM\Entity
*/
class WithParentConstructor extends BaseEntityWithConstructor
{
/**
* @var int
* @ORM\Id
* @ORM\Column(type="string")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
}

?>
-----
<?php

namespace Rector\Doctrine\Tests\Rector\Class_\AddUuidToEntityWhereMissingRector\Fixture;

use Doctrine\ORM\Mapping as ORM;
use Rector\Doctrine\Tests\Rector\Class_\AddUuidToEntityWhereMissingRector\Source\BaseEntityWithConstructor;

/**
* @ORM\Entity
*/
class WithParentConstructor extends BaseEntityWithConstructor
{
public function __construct()
{
parent::__construct();
$this->uuid = \Ramsey\Uuid\Uuid::uuid4();
}
/**
* @var \Ramsey\Uuid\UuidInterface
* @ORM\Column (type="uuid_binary", unique=true, nullable=true)
*/
private $uuid;
/**
* @var int
* @ORM\Id
* @ORM\Column(type="string")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php declare(strict_types=1);

namespace Rector\Doctrine\Tests\Rector\Class_\AddUuidToEntityWhereMissingRector\Source;

class BaseEntityWithConstructor
{
private $items;

public function __construct()
{
$this->items = [];
}
}