From 594e60d3f7610016d3fa0b9de5d71de3308293f2 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 14:19:01 +0200 Subject: [PATCH] #6613 #6614 simplifying entity definition - using auto-assigned string identifiers to reduce moving parts --- tests/Doctrine/Tests/Models/DDC6613/Phone.php | 7 +++++-- tests/Doctrine/Tests/Models/DDC6613/User.php | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/Doctrine/Tests/Models/DDC6613/Phone.php b/tests/Doctrine/Tests/Models/DDC6613/Phone.php index 32f878eee..9ce090960 100644 --- a/tests/Doctrine/Tests/Models/DDC6613/Phone.php +++ b/tests/Doctrine/Tests/Models/DDC6613/Phone.php @@ -10,7 +10,6 @@ namespace Doctrine\Tests\Models\DDC6613; /** - * @Entity(readOnly=true) * @Table(name="ddc6613_phone") */ @@ -19,9 +18,13 @@ class Phone /** * @Id - * @GeneratedValue + * @GeneratedValue(strategy="NONE") * @Column(type="integer") */ public $id; + public function __construct() + { + $this->id = uniqid('phone', true); + } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/Models/DDC6613/User.php b/tests/Doctrine/Tests/Models/DDC6613/User.php index ee4e7260b..6b233c0a2 100644 --- a/tests/Doctrine/Tests/Models/DDC6613/User.php +++ b/tests/Doctrine/Tests/Models/DDC6613/User.php @@ -20,10 +20,10 @@ class User /** * @Id - * @GeneratedValue - * @Column(type="integer") + * @GeneratedValue(strategy="NONE") + * @Column(type="string") */ - public $id; + private $id; /** @@ -36,6 +36,7 @@ class User */ public function __construct() { + $this->id = uniqid('user', true); $this->phones = new ArrayCollection(); }