From f31ee143c891c038fa433e2e6f0e4f32c0c96321 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Wed, 18 Jan 2023 07:51:51 +0000
Subject: [PATCH 1/2] Fixup GH8127 test case

This removes the unnecessary "middle2" class and puts back in the effect of the data provider.

Both changes were accidentally committed when I was working on #10411 and just meant as experiments during debugging.
---
 .../ORM/Functional/Ticket/GH8127Test.php      | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8127Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8127Test.php
index ca0c673aa8b..b390291aa39 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8127Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8127Test.php
@@ -16,7 +16,6 @@ protected function setUp(): void
         $this->createSchemaForModels(
             GH8127Root::class,
             GH8127Middle::class,
-            GH8127Middle2::class,
             GH8127Leaf::class
         );
     }
@@ -29,18 +28,16 @@ public function testLoadFieldsFromAllClassesInHierarchy(string $queryClass): voi
         $entity          = new GH8127Leaf();
         $entity->root    = 'root';
         $entity->middle  = 'middle';
-        $entity->middle2 = 'middle2';
         $entity->leaf    = 'leaf';
 
         $this->_em->persist($entity);
         $this->_em->flush();
         $this->_em->clear();
 
-        $loadedEntity = $this->_em->find(GH8127Root::class, $entity->id);
+        $loadedEntity = $this->_em->find($queryClass, $entity->id);
 
         self::assertSame('root', $loadedEntity->root);
         self::assertSame('middle', $loadedEntity->middle);
-        self::assertSame('middle2', $loadedEntity->middle2);
         self::assertSame('leaf', $loadedEntity->leaf);
     }
 
@@ -94,20 +91,7 @@ abstract class GH8127Middle extends GH8127Root
 /**
  * @ORM\Entity
  */
-abstract class GH8127Middle2 extends GH8127Middle
-{
-    /**
-     * @ORM\Column
-     *
-     * @var string
-     */
-    public $middle2;
-}
-
-/**
- * @ORM\Entity
- */
-class GH8127Leaf extends GH8127Middle2
+class GH8127Leaf extends GH8127Middle
 {
     /**
      * @ORM\Column

From 9926940235fdee3cdf722a6ff116b722739bd394 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Wed, 18 Jan 2023 08:59:56 +0000
Subject: [PATCH 2/2] Fix CS

---
 tests/Doctrine/Tests/ORM/Functional/Ticket/GH8127Test.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8127Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8127Test.php
index b390291aa39..439edfa1887 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8127Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8127Test.php
@@ -25,10 +25,10 @@ protected function setUp(): void
      */
     public function testLoadFieldsFromAllClassesInHierarchy(string $queryClass): void
     {
-        $entity          = new GH8127Leaf();
-        $entity->root    = 'root';
-        $entity->middle  = 'middle';
-        $entity->leaf    = 'leaf';
+        $entity         = new GH8127Leaf();
+        $entity->root   = 'root';
+        $entity->middle = 'middle';
+        $entity->leaf   = 'leaf';
 
         $this->_em->persist($entity);
         $this->_em->flush();