forked from doctrine/orm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request doctrine#7054 from cb8/foreign-id
Fix ID generation of foreign keys Ports doctrine#6701 using v3.0 structure.
- Loading branch information
Showing
4 changed files
with
255 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
lib/Doctrine/ORM/Sequencing/Planning/AssociationValueGeneratorExecutor.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Doctrine\ORM\Sequencing\Planning; | ||
|
|
||
| use Doctrine\ORM\EntityManagerInterface; | ||
|
|
||
| final class AssociationValueGeneratorExecutor implements ValueGenerationExecutor | ||
| { | ||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function execute(EntityManagerInterface $entityManager, object $entity) : array | ||
| { | ||
| // value set by inverse side | ||
| return []; | ||
| } | ||
|
|
||
| public function isDeferred() : bool | ||
| { | ||
| return true; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
191 changes: 191 additions & 0 deletions
191
tests/Doctrine/Tests/ORM/Functional/Ticket/GH6531Test.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| <?php | ||
|
|
||
| namespace Doctrine\Tests\ORM\Functional\Ticket; | ||
|
|
||
| use Doctrine\ORM\Annotation as ORM; | ||
| use Doctrine\Common\Collections\ArrayCollection; | ||
|
|
||
| final class GH6531Test extends \Doctrine\Tests\OrmFunctionalTestCase | ||
| { | ||
| protected function setUp() : void | ||
| { | ||
| parent::setup(); | ||
|
|
||
| $this->setUpEntitySchema( | ||
| [ | ||
| GH6531User::class, | ||
| GH6531Address::class, | ||
| GH6531Article::class, | ||
| GH6531ArticleAttribute::class, | ||
| GH6531Order::class, | ||
| GH6531OrderItem::class, | ||
| GH6531Product::class, | ||
| ] | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @group 6531 | ||
| */ | ||
| public function testSimpleDerivedIdentity() : void | ||
| { | ||
| $user = new GH6531User(); | ||
| $address = new GH6531Address(); | ||
| $address->user = $user; | ||
|
|
||
| $this->em->persist($user); | ||
| $this->em->persist($address); | ||
| $this->em->flush(); | ||
|
|
||
| self::assertSame($user, $this->em->find(GH6531User::class, $user->id)); | ||
| self::assertSame($address, $this->em->find(GH6531Address::class, $user)); | ||
| } | ||
|
|
||
| /** | ||
| * @group 6531 | ||
| */ | ||
| public function testDynamicAttributes() : void | ||
| { | ||
| $article = new GH6531Article(); | ||
| $article->addAttribute('name', 'value'); | ||
|
|
||
| $this->em->persist($article); | ||
| $this->em->flush(); | ||
|
|
||
| self::assertSame( | ||
| $article->attributes['name'], | ||
| $this->em->find(GH6531ArticleAttribute::class, ['article' => $article, 'attribute' => 'name']) | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @group 6531 | ||
| */ | ||
| public function testJoinTableWithMetadata() : void | ||
| { | ||
| $product = new GH6531Product(); | ||
| $this->em->persist($product); | ||
| $this->em->flush(); | ||
|
|
||
| $order = new GH6531Order(); | ||
| $order->addItem($product, 2); | ||
|
|
||
| $this->em->persist($order); | ||
| $this->em->flush(); | ||
|
|
||
| self::assertSame( | ||
| $order->items->first(), | ||
| $this->em->find(GH6531OrderItem::class, ['product' => $product, 'order' => $order]) | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @ORM\Entity | ||
| */ | ||
| class GH6531User | ||
| { | ||
| /** @ORM\Id @ORM\Column(type="integer") @ORM\GeneratedValue */ | ||
| public $id; | ||
| } | ||
|
|
||
| /** | ||
| * @ORM\Entity | ||
| */ | ||
| class GH6531Address | ||
| { | ||
| /** @ORM\Id @ORM\OneToOne(targetEntity=GH6531User::class) */ | ||
| public $user; | ||
| } | ||
|
|
||
| /** | ||
| * @ORM\Entity | ||
| */ | ||
| class GH6531Article | ||
| { | ||
| /** @ORM\Id @ORM\Column(type="integer") @ORM\GeneratedValue */ | ||
| public $id; | ||
|
|
||
| /** @ORM\OneToMany(targetEntity=GH6531ArticleAttribute::class, mappedBy="article", cascade={"ALL"}, indexBy="attribute") */ | ||
| public $attributes; | ||
|
|
||
| public function addAttribute(string $name, string $value) | ||
| { | ||
| $this->attributes[$name] = new GH6531ArticleAttribute($name, $value, $this); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @ORM\Entity | ||
| */ | ||
| class GH6531ArticleAttribute | ||
| { | ||
| /** @ORM\Id @ORM\ManyToOne(targetEntity=GH6531Article::class, inversedBy="attributes") */ | ||
| public $article; | ||
|
|
||
| /** @ORM\Id @ORM\Column(type="string") */ | ||
| public $attribute; | ||
|
|
||
| /** @ORM\Column(type="string") */ | ||
| public $value; | ||
|
|
||
| public function __construct(string $name, string $value, GH6531Article $article) | ||
| { | ||
| $this->attribute = $name; | ||
| $this->value = $value; | ||
| $this->article = $article; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @ORM\Entity | ||
| */ | ||
| class GH6531Order | ||
| { | ||
| /** @ORM\Id @ORM\Column(type="integer") @ORM\GeneratedValue */ | ||
| public $id; | ||
|
|
||
| /** @ORM\OneToMany(targetEntity=GH6531OrderItem::class, mappedBy="order", cascade={"ALL"}) */ | ||
| public $items; | ||
|
|
||
| public function __construct() | ||
| { | ||
| $this->items = new ArrayCollection(); | ||
| } | ||
|
|
||
| public function addItem(GH6531Product $product, int $amount) : void | ||
| { | ||
| $this->items->add(new GH6531OrderItem($this, $product, $amount)); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @ORM\Entity | ||
| */ | ||
| class GH6531Product | ||
| { | ||
| /** @ORM\Id @ORM\Column(type="integer") @ORM\GeneratedValue */ | ||
| public $id; | ||
| } | ||
|
|
||
| /** | ||
| * @ORM\Entity | ||
| */ | ||
| class GH6531OrderItem | ||
| { | ||
| /** @ORM\Id @ORM\ManyToOne(targetEntity=GH6531Order::class) */ | ||
| public $order; | ||
|
|
||
| /** @ORM\Id @ORM\ManyToOne(targetEntity=GH6531Product::class) */ | ||
| public $product; | ||
|
|
||
| /** @ORM\Column(type="integer") */ | ||
| public $amount = 1; | ||
|
|
||
| public function __construct(GH6531Order $order, GH6531Product $product, int $amount = 1) | ||
| { | ||
| $this->order = $order; | ||
| $this->product = $product; | ||
| $this->amount = $amount; | ||
| } | ||
| } |