From 5fbcb1833453c0159ec7241f811457585530b3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Wed, 5 Oct 2022 21:55:24 +0200 Subject: [PATCH 1/3] Spell cities properly --- tests/Doctrine/Tests/Models/Cache/City.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Doctrine/Tests/Models/Cache/City.php b/tests/Doctrine/Tests/Models/Cache/City.php index 13246d50ae8..09cf8703da7 100644 --- a/tests/Doctrine/Tests/Models/Cache/City.php +++ b/tests/Doctrine/Tests/Models/Cache/City.php @@ -51,7 +51,7 @@ class City * @JoinColumn(name="state_id", referencedColumnName="id") */ #[ORM\Cache] - #[ORM\ManyToOne(targetEntity: 'State', inversedBy: 'citities')] + #[ORM\ManyToOne(targetEntity: 'State', inversedBy: 'cities')] #[ORM\JoinColumn(name: 'state_id', referencedColumnName: 'id')] protected $state; From 5a528bef5d611b1eb6ce50776a72da29609b8c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Wed, 5 Oct 2022 21:55:36 +0200 Subject: [PATCH 2/3] Use short class name It is more friendly with conversion to attributes --- .../Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php | 2 +- tests/Doctrine/Tests/ORM/Functional/Ticket/GH6141Test.php | 4 ++-- tests/Doctrine/Tests/ORM/Functional/Ticket/GH7012Test.php | 2 +- tests/Doctrine/Tests/ORM/Functional/Ticket/GH7512Test.php | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php index da847f34769..181b7fad54d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php @@ -125,7 +125,7 @@ class DDC5684Object /** * @var DDC5684ObjectIdType * @Id - * @Column(type=Doctrine\Tests\ORM\Functional\Ticket\DDC5684ObjectIdType::class) + * @Column(type=DDC5684ObjectIdType::class) * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6141Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6141Test.php index 6bb6badeda1..102609d93f0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6141Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6141Test.php @@ -153,8 +153,8 @@ public function __toString(): string * @InheritanceType("JOINED") * @DiscriminatorColumn(name="discr", type="gh6141people") * @DiscriminatorMap({ - * Doctrine\Tests\ORM\Functional\Ticket\GH6141People::BOSS = GH6141Boss::class, - * Doctrine\Tests\ORM\Functional\Ticket\GH6141People::EMPLOYEE = GH6141Employee::class + * GH6141People::BOSS = GH6141Boss::class, + * GH6141People::EMPLOYEE = GH6141Employee::class * }) */ abstract class GH6141Person diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7012Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7012Test.php index 4421a4ce465..836f40ce253 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7012Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7012Test.php @@ -58,7 +58,7 @@ class GH7012UserData /** * @var QuotedUser * @Id - * @OneToOne(targetEntity=Doctrine\Tests\Models\Quote\User::class) + * @OneToOne(targetEntity=QuotedUser::class) * @JoinColumn(name="`user-id`", referencedColumnName="`user-id`", onDelete="CASCADE") */ public $user; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7512Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7512Test.php index 253138ed6db..fa58570274f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7512Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7512Test.php @@ -48,8 +48,8 @@ public function testFindEntityByAssociationPropertyJoinedChildWithClearMetadata( * @Entity() * @InheritanceType("JOINED") * @DiscriminatorMap({ - * "entitya"=Doctrine\Tests\ORM\Functional\Ticket\GH7512EntityA::class, - * "entityB"=Doctrine\Tests\ORM\Functional\Ticket\GH7512EntityB::class + * "entitya"=GH7512EntityA::class, + * "entityB"=GH7512EntityB::class * }) */ class GH7512EntityA @@ -63,7 +63,7 @@ class GH7512EntityA public $id; /** - * @OneToMany(targetEntity="Doctrine\Tests\ORM\Functional\Ticket\GH7512EntityC", mappedBy="entityA") + * @OneToMany(targetEntity="GH7512EntityC", mappedBy="entityA") * @var Collection */ public $entityCs; @@ -86,7 +86,7 @@ class GH7512EntityC public $id; /** - * @ManyToOne(targetEntity="Doctrine\Tests\ORM\Functional\Ticket\GH7512EntityA", inversedBy="entityCs") + * @ManyToOne(targetEntity="GH7512EntityA", inversedBy="entityCs") * @var GH7512EntityA */ public $entityA; From 021722acc762db0475b12a3371bd24fccf941fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Wed, 5 Oct 2022 22:14:49 +0200 Subject: [PATCH 3/3] Remove ignored annotation Making it a separate, valid annotation breaks the tests --- tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php index 90dd6b4cda8..c88de7e28ae 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php @@ -366,7 +366,7 @@ class DDC1649Two { /** * @var DDC1649One - * @Id @ManyToOne(targetEntity="DDC1649One")@JoinColumn(name="id", referencedColumnName="id") + * @Id @ManyToOne(targetEntity="DDC1649One") */ public $one; }