From 309b286ed38e04aa21e640a24cbe9ba6efd0e704 Mon Sep 17 00:00:00 2001
From: Waleed Gadelkareem <gadelkareem@gmail.com>
Date: Fri, 10 Feb 2017 17:12:51 +0100
Subject: [PATCH 01/17] Add tests for #6217

---
 .../ORM/Mapping/ClassMetadataInfo.php         |  14 +-
 .../ORM/Functional/Ticket/GH6217Test.php      | 162 ++++++++++++++++++
 2 files changed, 174 insertions(+), 2 deletions(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index b5eebcdde..5fa349933 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -29,6 +29,7 @@ use ReflectionClass;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\Common\ClassLoader;
 use Doctrine\ORM\Cache\CacheException;
+use Doctrine\ORM\Cache\AssociationCacheEntry;
 
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@@ -718,7 +719,7 @@ class ClassMetadataInfo implements ClassMetadata
             $id = [];
 
             foreach ($this->identifier as $idField) {
-                $value = $this->reflFields[$idField]->getValue($entity);
+                $value = $this->getIndentifierValue($entity, $idField);
 
                 if (null !== $value) {
                     $id[$idField] = $value;
@@ -729,7 +730,7 @@ class ClassMetadataInfo implements ClassMetadata
         }
 
         $id = $this->identifier[0];
-        $value = $this->reflFields[$id]->getValue($entity);
+        $value = $this->getIndentifierValue($entity, $id);
 
         if (null === $value) {
             return [];
@@ -738,6 +739,15 @@ class ClassMetadataInfo implements ClassMetadata
         return [$id => $value];
     }
 
+    private function getIndentifierValue($entity, $id)
+    {
+        if ($entity instanceof AssociationCacheEntry) {
+             return $entity->identifier[$id];
+        }
+
+        return $this->reflFields[$id]->getValue($entity);
+    }
+
     /**
      * Populates the entity identifier of an entity.
      *
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
new file mode 100644
index 000000000..d87b9642e
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -0,0 +1,162 @@
+<?php
+namespace Doctrine\Tests\Functional\Ticket;
+
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+final class GH6217Test extends OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        $this->enableSecondLevelCache();
+
+        parent::setUp();
+
+        $this->_schemaTool->createSchema(
+            [
+                $this->_em->getClassMetadata(GH6217User::class),
+                $this->_em->getClassMetadata(GH6217Profile::class),
+                $this->_em->getClassMetadata(GH6217Category::class),
+                $this->_em->getClassMetadata(GH6217UserProfile::class),
+            ]
+        );
+    }
+
+    /**
+     * @group 6217
+     */
+    public function testRetrievingCacheShouldNotThrowUndefinedIndexException()
+    {
+        $user = new GH6217User(1, 'user 1');
+        $profile = new GH6217Profile(1);
+        $category = new GH6217Category(1, 'category 1');
+        $userProfile = new GH6217UserProfile($user, $profile, $category);
+
+        $this->_em->persist($category);
+        $this->_em->persist($user);
+        $this->_em->persist($profile);
+        $this->_em->persist($userProfile);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $repository = $this->_em->getRepository(GH6217UserProfile::class);
+        $filters = ['user' => 1, 'category' => 1];
+
+        $this->assertCount(1, $repository->findBy($filters));
+        $queryCount = $this->getCurrentQueryCount();
+
+        $this->_em->clear();
+
+        $this->assertCount(1, $repository->findBy($filters));
+        $this->assertEquals($queryCount, $this->getCurrentQueryCount());
+    }
+}
+
+/**
+ * @Entity
+ * @Cache(usage="NONSTRICT_READ_WRITE")
+ */
+class GH6217User
+{
+    /**
+     * @Id
+     * @Column(type="integer")
+     *
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @Column(type="string", length=60, unique=true)
+     *
+     * @var string
+     */
+    public $username;
+
+    public function __construct(int $id, string $username)
+    {
+        $this->id = $id;
+        $this->username = $username;
+    }
+}
+
+/**
+ * @Entity
+ * @Cache(usage="NONSTRICT_READ_WRITE")
+ */
+class GH6217Profile
+{
+    /**
+     * @Id
+     * @Column(type="integer")
+     *
+     * @var int
+     */
+    public $id;
+
+    public function __construct(int $id)
+    {
+        $this->id = $id;
+    }
+}
+
+/**
+ * @Entity
+ * @Cache(usage="NONSTRICT_READ_WRITE")
+ */
+class GH6217Category
+{
+    /**
+     * @Id
+     * @Column(type="integer")
+     *
+     * @var int
+     */
+    public $id;
+
+    public function __construct(int $id)
+    {
+        $this->id = $id;
+    }
+}
+
+/**
+ * @Entity
+ * @Cache(usage="NONSTRICT_READ_WRITE")
+ */
+class GH6217UserProfile
+{
+    /**
+     * @Id
+     * @Cache("NONSTRICT_READ_WRITE")
+     * @ManyToOne(targetEntity="GH6217User")
+     * @JoinColumn(nullable=false)
+     *
+     * @var GH6217User
+     */
+    public $user;
+
+    /**
+     * @Id
+     * @Cache("NONSTRICT_READ_WRITE")
+     * @ManyToOne(targetEntity="GH6217Profile", fetch="EAGER")
+     *
+     * @var GH6217Profile
+     */
+    public $profile;
+
+    /**
+     * @Id
+     * @Cache("NONSTRICT_READ_WRITE")
+     * @ManyToOne(targetEntity="GH6217Category", fetch="EAGER")
+     *
+     * @var GH6217Category
+     */
+    public $category;
+
+    public function __construct(GH6217User $user, GH6217Profile $profile, GH6217Category $category)
+    {
+        $this->user = $user;
+        $this->profile = $profile;
+        $this->category = $category;
+    }
+}

From a8453dda89104ce0e2ee9f36491709b942a79c09 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:03:14 +0200
Subject: [PATCH 02/17] #6284 removing the "WTF" part of the logic - an
 association cache entry should never ever reach metadata

---
 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 5fa349933..4057455b3 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -715,6 +715,9 @@ class ClassMetadataInfo implements ClassMetadata
      */
     public function getIdentifierValues($entity)
     {
+        if ($entity instanceof AssociationCacheEntry) {
+            throw new \InvalidArgumentException('WTF DUDE: ' . $entity->class . ' - ' . \serialize($entity->identifier));
+        }
         if ($this->isIdentifierComposite) {
             $id = [];
 

From c7281f6aded9a6c11197d1fdc42f0874e97c08eb Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:08:06 +0200
Subject: [PATCH 03/17] #6284 simplifying tests to a minimum, removing unused
 auto-generated id field

---
 .../ORM/Functional/Ticket/GH6217Test.php      | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index d87b9642e..fd138aa47 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -26,9 +26,9 @@ final class GH6217Test extends OrmFunctionalTestCase
      */
     public function testRetrievingCacheShouldNotThrowUndefinedIndexException()
     {
-        $user = new GH6217User(1, 'user 1');
-        $profile = new GH6217Profile(1);
-        $category = new GH6217Category(1, 'category 1');
+        $user = new GH6217User(1);
+        $profile = new GH6217Profile();
+        $category = new GH6217Category(1);
         $userProfile = new GH6217UserProfile($user, $profile, $category);
 
         $this->_em->persist($category);
@@ -65,37 +65,27 @@ class GH6217User
      */
     public $id;
 
-    /**
-     * @Column(type="string", length=60, unique=true)
-     *
-     * @var string
-     */
-    public $username;
-
-    public function __construct(int $id, string $username)
+    public function __construct(int $id)
     {
         $this->id = $id;
-        $this->username = $username;
     }
 }
 
-/**
- * @Entity
- * @Cache(usage="NONSTRICT_READ_WRITE")
- */
+/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Profile
 {
     /**
      * @Id
-     * @Column(type="integer")
+     * @Column(type="string")
+     * @GeneratedValue(strategy="NONE")
      *
-     * @var int
+     * @var string
      */
     public $id;
 
-    public function __construct(int $id)
+    public function __construct()
     {
-        $this->id = $id;
+        $this->id = uniqid(self::class, true);
     }
 }
 

From 3842ad8ea10ad4e4d6222852b8c315f3ecf7a820 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:11:03 +0200
Subject: [PATCH 04/17] #6284 simplifying tests to a minimum, removing unused
 auto-generated id field

---
 .../ORM/Functional/Ticket/GH6217Test.php      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index fd138aa47..8e1333723 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -26,9 +26,9 @@ final class GH6217Test extends OrmFunctionalTestCase
      */
     public function testRetrievingCacheShouldNotThrowUndefinedIndexException()
     {
-        $user = new GH6217User(1);
+        $user = new GH6217User();
         $profile = new GH6217Profile();
-        $category = new GH6217Category(1);
+        $category = new GH6217Category();
         $userProfile = new GH6217UserProfile($user, $profile, $category);
 
         $this->_em->persist($category);
@@ -39,7 +39,7 @@ final class GH6217Test extends OrmFunctionalTestCase
         $this->_em->clear();
 
         $repository = $this->_em->getRepository(GH6217UserProfile::class);
-        $filters = ['user' => 1, 'category' => 1];
+        $filters = ['user' => $user->id, 'category' => $category->id];
 
         $this->assertCount(1, $repository->findBy($filters));
         $queryCount = $this->getCurrentQueryCount();
@@ -59,15 +59,16 @@ class GH6217User
 {
     /**
      * @Id
-     * @Column(type="integer")
+     * @Column(type="string")
+     * @GeneratedValue(strategy="NONE")
      *
-     * @var int
+     * @var string
      */
     public $id;
 
-    public function __construct(int $id)
+    public function __construct()
     {
-        $this->id = $id;
+        $this->id = uniqid(self::class, true);
     }
 }
 
@@ -97,15 +98,16 @@ class GH6217Category
 {
     /**
      * @Id
-     * @Column(type="integer")
+     * @Column(type="string")
+     * @GeneratedValue(strategy="NONE")
      *
-     * @var int
+     * @var string
      */
     public $id;
 
-    public function __construct(int $id)
+    public function __construct()
     {
-        $this->id = $id;
+        $this->id = uniqid(self::class, true);
     }
 }
 
@@ -119,7 +121,6 @@ class GH6217UserProfile
      * @Id
      * @Cache("NONSTRICT_READ_WRITE")
      * @ManyToOne(targetEntity="GH6217User")
-     * @JoinColumn(nullable=false)
      *
      * @var GH6217User
      */

From 805ba041ef5ff4367d6899a7b28de436d31be93e Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:12:45 +0200
Subject: [PATCH 05/17] #6284 reducing annotation mapping clutter

---
 .../ORM/Functional/Ticket/GH6217Test.php      | 63 +++----------------
 1 file changed, 9 insertions(+), 54 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 8e1333723..26e2c80ad 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -51,19 +51,10 @@ final class GH6217Test extends OrmFunctionalTestCase
     }
 }
 
-/**
- * @Entity
- * @Cache(usage="NONSTRICT_READ_WRITE")
- */
+/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217User
 {
-    /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue(strategy="NONE")
-     *
-     * @var string
-     */
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
 
     public function __construct()
@@ -75,13 +66,7 @@ class GH6217User
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Profile
 {
-    /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue(strategy="NONE")
-     *
-     * @var string
-     */
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
 
     public function __construct()
@@ -90,19 +75,10 @@ class GH6217Profile
     }
 }
 
-/**
- * @Entity
- * @Cache(usage="NONSTRICT_READ_WRITE")
- */
+/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Category
 {
-    /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue(strategy="NONE")
-     *
-     * @var string
-     */
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
 
     public function __construct()
@@ -111,37 +87,16 @@ class GH6217Category
     }
 }
 
-/**
- * @Entity
- * @Cache(usage="NONSTRICT_READ_WRITE")
- */
+/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217UserProfile
 {
-    /**
-     * @Id
-     * @Cache("NONSTRICT_READ_WRITE")
-     * @ManyToOne(targetEntity="GH6217User")
-     *
-     * @var GH6217User
-     */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217User::class) */
     public $user;
 
-    /**
-     * @Id
-     * @Cache("NONSTRICT_READ_WRITE")
-     * @ManyToOne(targetEntity="GH6217Profile", fetch="EAGER")
-     *
-     * @var GH6217Profile
-     */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Profile::class) */
     public $profile;
 
-    /**
-     * @Id
-     * @Cache("NONSTRICT_READ_WRITE")
-     * @ManyToOne(targetEntity="GH6217Category", fetch="EAGER")
-     *
-     * @var GH6217Category
-     */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Category::class) */
     public $category;
 
     public function __construct(GH6217User $user, GH6217Profile $profile, GH6217Category $category)

From 4e0b76ce693ea401fbb6e5e8ccd5546e35c8c783 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:14:38 +0200
Subject: [PATCH 06/17] #6284 eager fetching is strictly required to verify the
 issue

---
 .../ORM/Functional/Ticket/GH6217Test.php      | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 26e2c80ad..2afed3db7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -54,7 +54,13 @@ final class GH6217Test extends OrmFunctionalTestCase
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217User
 {
-    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
+    /**
+     * @Id
+     * @Column(type="string")
+     * @GeneratedValue(strategy="NONE")
+     *
+     * @var string
+     */
     public $id;
 
     public function __construct()
@@ -66,7 +72,13 @@ class GH6217User
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Profile
 {
-    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
+    /**
+     * @Id
+     * @Column(type="string")
+     * @GeneratedValue(strategy="NONE")
+     *
+     * @var string
+     */
     public $id;
 
     public function __construct()
@@ -78,7 +90,13 @@ class GH6217Profile
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Category
 {
-    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
+    /**
+     * @Id
+     * @Column(type="string")
+     * @GeneratedValue(strategy="NONE")
+     *
+     * @var string
+     */
     public $id;
 
     public function __construct()
@@ -93,10 +111,10 @@ class GH6217UserProfile
     /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217User::class) */
     public $user;
 
-    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Profile::class) */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Profile::class, fetch="EAGER") */
     public $profile;
 
-    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Category::class) */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Category::class, fetch="EAGER") */
     public $category;
 
     public function __construct(GH6217User $user, GH6217Profile $profile, GH6217Category $category)

From ca39abcd71db89e6185988a37a5431592ee9a611 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:17:14 +0200
Subject: [PATCH 07/17] #6284 reducing annotation mapping clutter

---
 .../ORM/Functional/Ticket/GH6217Test.php      | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 2afed3db7..be9ea2a74 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -54,13 +54,7 @@ final class GH6217Test extends OrmFunctionalTestCase
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217User
 {
-    /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue(strategy="NONE")
-     *
-     * @var string
-     */
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
 
     public function __construct()
@@ -72,13 +66,7 @@ class GH6217User
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Profile
 {
-    /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue(strategy="NONE")
-     *
-     * @var string
-     */
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
 
     public function __construct()
@@ -90,13 +78,7 @@ class GH6217Profile
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Category
 {
-    /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue(strategy="NONE")
-     *
-     * @var string
-     */
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
 
     public function __construct()

From dac1ce4172b006540b91e2fe12d916a52de33885 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:21:53 +0200
Subject: [PATCH 08/17] #6284 removing profile entity, since it is not needed
 to reproduce the issue

---
 .../ORM/Functional/Ticket/GH6217Test.php      | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index be9ea2a74..8f11d6de3 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -14,7 +14,6 @@ final class GH6217Test extends OrmFunctionalTestCase
         $this->_schemaTool->createSchema(
             [
                 $this->_em->getClassMetadata(GH6217User::class),
-                $this->_em->getClassMetadata(GH6217Profile::class),
                 $this->_em->getClassMetadata(GH6217Category::class),
                 $this->_em->getClassMetadata(GH6217UserProfile::class),
             ]
@@ -27,13 +26,11 @@ final class GH6217Test extends OrmFunctionalTestCase
     public function testRetrievingCacheShouldNotThrowUndefinedIndexException()
     {
         $user = new GH6217User();
-        $profile = new GH6217Profile();
         $category = new GH6217Category();
-        $userProfile = new GH6217UserProfile($user, $profile, $category);
+        $userProfile = new GH6217UserProfile($user, $category);
 
         $this->_em->persist($category);
         $this->_em->persist($user);
-        $this->_em->persist($profile);
         $this->_em->persist($userProfile);
         $this->_em->flush();
         $this->_em->clear();
@@ -63,18 +60,6 @@ class GH6217User
     }
 }
 
-/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
-class GH6217Profile
-{
-    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
-    public $id;
-
-    public function __construct()
-    {
-        $this->id = uniqid(self::class, true);
-    }
-}
-
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Category
 {
@@ -93,16 +78,12 @@ class GH6217UserProfile
     /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217User::class) */
     public $user;
 
-    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Profile::class, fetch="EAGER") */
-    public $profile;
-
     /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Category::class, fetch="EAGER") */
     public $category;
 
-    public function __construct(GH6217User $user, GH6217Profile $profile, GH6217Category $category)
+    public function __construct(GH6217User $user, GH6217Category $category)
     {
         $this->user = $user;
-        $this->profile = $profile;
         $this->category = $category;
     }
 }

From 6f6e88cfb642e0130a4adb08f97452718bd8206f Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:27:46 +0200
Subject: [PATCH 09/17] #6284 adding assertions about equality of the loaded
 classes

---
 .../Tests/ORM/Functional/Ticket/GH6217Test.php         | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 8f11d6de3..aeefc82d0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -36,14 +36,20 @@ final class GH6217Test extends OrmFunctionalTestCase
         $this->_em->clear();
 
         $repository = $this->_em->getRepository(GH6217UserProfile::class);
-        $filters = ['user' => $user->id, 'category' => $category->id];
+        $filters    = ['category' => $category->id];
 
         $this->assertCount(1, $repository->findBy($filters));
         $queryCount = $this->getCurrentQueryCount();
 
         $this->_em->clear();
 
-        $this->assertCount(1, $repository->findBy($filters));
+        /* @var $found GH6217UserProfile[] */
+        $found = $repository->findBy($filters);
+
+        $this->assertCount(1, $found);
+        $this->assertInstanceOf(GH6217UserProfile::class, $found[0]);
+        $this->assertSame($user->id, $found[0]->user->id);
+        $this->assertSame($category->id, $found[0]->category->id);
         $this->assertEquals($queryCount, $this->getCurrentQueryCount());
     }
 }

From 220dc79ebf12c7425ed53efeb26ec1c9d969c1b0 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:29:27 +0200
Subject: [PATCH 10/17] #6284 renaming entities to match the scope of this test

---
 .../ORM/Functional/Ticket/GH6217Test.php      | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index aeefc82d0..675024844 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -13,9 +13,9 @@ final class GH6217Test extends OrmFunctionalTestCase
 
         $this->_schemaTool->createSchema(
             [
-                $this->_em->getClassMetadata(GH6217User::class),
-                $this->_em->getClassMetadata(GH6217Category::class),
-                $this->_em->getClassMetadata(GH6217UserProfile::class),
+                $this->_em->getClassMetadata(GH6217LazyEntity::class),
+                $this->_em->getClassMetadata(GH6217EagerEntity::class),
+                $this->_em->getClassMetadata(GH6217FetchedEntity::class),
             ]
         );
     }
@@ -25,9 +25,9 @@ final class GH6217Test extends OrmFunctionalTestCase
      */
     public function testRetrievingCacheShouldNotThrowUndefinedIndexException()
     {
-        $user = new GH6217User();
-        $category = new GH6217Category();
-        $userProfile = new GH6217UserProfile($user, $category);
+        $user = new GH6217LazyEntity();
+        $category = new GH6217EagerEntity();
+        $userProfile = new GH6217FetchedEntity($user, $category);
 
         $this->_em->persist($category);
         $this->_em->persist($user);
@@ -35,7 +35,7 @@ final class GH6217Test extends OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        $repository = $this->_em->getRepository(GH6217UserProfile::class);
+        $repository = $this->_em->getRepository(GH6217FetchedEntity::class);
         $filters    = ['category' => $category->id];
 
         $this->assertCount(1, $repository->findBy($filters));
@@ -43,11 +43,11 @@ final class GH6217Test extends OrmFunctionalTestCase
 
         $this->_em->clear();
 
-        /* @var $found GH6217UserProfile[] */
+        /* @var $found GH6217FetchedEntity[] */
         $found = $repository->findBy($filters);
 
         $this->assertCount(1, $found);
-        $this->assertInstanceOf(GH6217UserProfile::class, $found[0]);
+        $this->assertInstanceOf(GH6217FetchedEntity::class, $found[0]);
         $this->assertSame($user->id, $found[0]->user->id);
         $this->assertSame($category->id, $found[0]->category->id);
         $this->assertEquals($queryCount, $this->getCurrentQueryCount());
@@ -55,7 +55,7 @@ final class GH6217Test extends OrmFunctionalTestCase
 }
 
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
-class GH6217User
+class GH6217LazyEntity
 {
     /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
@@ -67,7 +67,7 @@ class GH6217User
 }
 
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
-class GH6217Category
+class GH6217EagerEntity
 {
     /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
@@ -79,15 +79,15 @@ class GH6217Category
 }
 
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
-class GH6217UserProfile
+class GH6217FetchedEntity
 {
-    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217User::class) */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217LazyEntity::class) */
     public $user;
 
-    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Category::class, fetch="EAGER") */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217EagerEntity::class, fetch="EAGER") */
     public $category;
 
-    public function __construct(GH6217User $user, GH6217Category $category)
+    public function __construct(GH6217LazyEntity $user, GH6217EagerEntity $category)
     {
         $this->user = $user;
         $this->category = $category;

From 3f09e2095585b28d2fb9207f68a826a3a878d5ae Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:31:01 +0200
Subject: [PATCH 11/17] #6284 correcting alignment, removing stuff that isn't
 strictly needed

---
 .../Tests/ORM/Functional/Ticket/GH6217Test.php     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 675024844..504e01389 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -11,19 +11,17 @@ final class GH6217Test extends OrmFunctionalTestCase
 
         parent::setUp();
 
-        $this->_schemaTool->createSchema(
-            [
-                $this->_em->getClassMetadata(GH6217LazyEntity::class),
-                $this->_em->getClassMetadata(GH6217EagerEntity::class),
-                $this->_em->getClassMetadata(GH6217FetchedEntity::class),
-            ]
-        );
+        $this->_schemaTool->createSchema([
+            $this->_em->getClassMetadata(GH6217LazyEntity::class),
+            $this->_em->getClassMetadata(GH6217EagerEntity::class),
+            $this->_em->getClassMetadata(GH6217FetchedEntity::class),
+        ]);
     }
 
     /**
      * @group 6217
      */
-    public function testRetrievingCacheShouldNotThrowUndefinedIndexException()
+    public function testLoadingOfSecondLevelCacheOnEagerAssociations()
     {
         $user = new GH6217LazyEntity();
         $category = new GH6217EagerEntity();

From a2f4053a8121bcddf2dc78fec143a86ac34df07d Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:38:44 +0200
Subject: [PATCH 12/17] #6284 renaming variables, classes and properties to fit
 tested behavior

---
 .../ORM/Functional/Ticket/GH6217Test.php      | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 504e01389..81f455ca4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -3,9 +3,12 @@ namespace Doctrine\Tests\Functional\Ticket;
 
 use Doctrine\Tests\OrmFunctionalTestCase;
 
+/**
+ * @group #6217
+ */
 final class GH6217Test extends OrmFunctionalTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         $this->enableSecondLevelCache();
 
@@ -18,37 +21,32 @@ final class GH6217Test extends OrmFunctionalTestCase
         ]);
     }
 
-    /**
-     * @group 6217
-     */
-    public function testLoadingOfSecondLevelCacheOnEagerAssociations()
+    public function testLoadingOfSecondLevelCacheOnEagerAssociations() : void
     {
-        $user = new GH6217LazyEntity();
-        $category = new GH6217EagerEntity();
-        $userProfile = new GH6217FetchedEntity($user, $category);
+        $lazy = new GH6217LazyEntity();
+        $eager = new GH6217EagerEntity();
+        $fetched = new GH6217FetchedEntity($lazy, $eager);
 
-        $this->_em->persist($category);
-        $this->_em->persist($user);
-        $this->_em->persist($userProfile);
+        $this->_em->persist($eager);
+        $this->_em->persist($lazy);
+        $this->_em->persist($fetched);
         $this->_em->flush();
         $this->_em->clear();
 
         $repository = $this->_em->getRepository(GH6217FetchedEntity::class);
-        $filters    = ['category' => $category->id];
+        $filters    = ['eager' => $eager->id];
 
         $this->assertCount(1, $repository->findBy($filters));
         $queryCount = $this->getCurrentQueryCount();
 
-        $this->_em->clear();
-
         /* @var $found GH6217FetchedEntity[] */
         $found = $repository->findBy($filters);
 
         $this->assertCount(1, $found);
         $this->assertInstanceOf(GH6217FetchedEntity::class, $found[0]);
-        $this->assertSame($user->id, $found[0]->user->id);
-        $this->assertSame($category->id, $found[0]->category->id);
-        $this->assertEquals($queryCount, $this->getCurrentQueryCount());
+        $this->assertSame($lazy->id, $found[0]->lazy->id);
+        $this->assertSame($eager->id, $found[0]->eager->id);
+        $this->assertEquals($queryCount, $this->getCurrentQueryCount(), 'No queries were executed in `findBy`');
     }
 }
 
@@ -80,14 +78,14 @@ class GH6217EagerEntity
 class GH6217FetchedEntity
 {
     /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217LazyEntity::class) */
-    public $user;
+    public $lazy;
 
     /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217EagerEntity::class, fetch="EAGER") */
-    public $category;
+    public $eager;
 
-    public function __construct(GH6217LazyEntity $user, GH6217EagerEntity $category)
+    public function __construct(GH6217LazyEntity $lazy, GH6217EagerEntity $eager)
     {
-        $this->user = $user;
-        $this->category = $category;
+        $this->lazy  = $lazy;
+        $this->eager = $eager;
     }
 }

From c29a1e96b7f3e5a7874ff2bad477bb792f6d879d Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:40:42 +0200
Subject: [PATCH 13/17] #6284 removing unused separate class

---
 .../Tests/ORM/Functional/Ticket/GH6217Test.php    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 81f455ca4..3ac810fb6 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -15,16 +15,15 @@ final class GH6217Test extends OrmFunctionalTestCase
         parent::setUp();
 
         $this->_schemaTool->createSchema([
-            $this->_em->getClassMetadata(GH6217LazyEntity::class),
-            $this->_em->getClassMetadata(GH6217EagerEntity::class),
+            $this->_em->getClassMetadata(GH6217AssociatedEntity::class),
             $this->_em->getClassMetadata(GH6217FetchedEntity::class),
         ]);
     }
 
     public function testLoadingOfSecondLevelCacheOnEagerAssociations() : void
     {
-        $lazy = new GH6217LazyEntity();
-        $eager = new GH6217EagerEntity();
+        $lazy = new GH6217AssociatedEntity();
+        $eager = new GH6217AssociatedEntity();
         $fetched = new GH6217FetchedEntity($lazy, $eager);
 
         $this->_em->persist($eager);
@@ -63,7 +62,7 @@ class GH6217LazyEntity
 }
 
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
-class GH6217EagerEntity
+class GH6217AssociatedEntity
 {
     /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
@@ -77,13 +76,13 @@ class GH6217EagerEntity
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217FetchedEntity
 {
-    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217LazyEntity::class) */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217AssociatedEntity::class) */
     public $lazy;
 
-    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217EagerEntity::class, fetch="EAGER") */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217AssociatedEntity::class, fetch="EAGER") */
     public $eager;
 
-    public function __construct(GH6217LazyEntity $lazy, GH6217EagerEntity $eager)
+    public function __construct(GH6217AssociatedEntity $lazy, GH6217AssociatedEntity $eager)
     {
         $this->lazy  = $lazy;
         $this->eager = $eager;

From c9d1f852de15581f276abb80e6b712a20cd2ce9e Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 22 Aug 2017 21:41:04 +0200
Subject: [PATCH 14/17] #6284 removing unused lazy entity

---
 .../Tests/ORM/Functional/Ticket/GH6217Test.php       | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 3ac810fb6..861925f08 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -49,18 +49,6 @@ final class GH6217Test extends OrmFunctionalTestCase
     }
 }
 
-/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
-class GH6217LazyEntity
-{
-    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
-    public $id;
-
-    public function __construct()
-    {
-        $this->id = uniqid(self::class, true);
-    }
-}
-
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217AssociatedEntity
 {

From 07b397f3419e37f4ac0bf1d0a55572af7cb9d575 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Wed, 23 Aug 2017 00:19:49 +0200
Subject: [PATCH 15/17] #6284 fixing actual issue, which comes from an
 extremely tricky L2 caching issue.

We are not hydrating some of the cached association data into entities due to keys missing in the cache association definition.
Since this is an extreme edge case that is just a mismatch between db and cache, a detailed explanation was provided in the fix snippet as well
---
 lib/Doctrine/ORM/Cache/DefaultQueryCache.php | 37 ++++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php
index 3ac206547..d431313ef 100644
--- a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php
+++ b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php
@@ -92,13 +92,13 @@ class DefaultQueryCache implements QueryCache
             return null;
         }
 
-        $entry = $this->region->get($key);
+        $cacheEntry = $this->region->get($key);
 
-        if ( ! $entry instanceof QueryCacheEntry) {
+        if ( ! $cacheEntry instanceof QueryCacheEntry) {
             return null;
         }
 
-        if ( ! $this->validator->isValid($key, $entry)) {
+        if ( ! $this->validator->isValid($key, $cacheEntry)) {
             $this->region->evict($key);
 
             return null;
@@ -117,11 +117,11 @@ class DefaultQueryCache implements QueryCache
             return new EntityCacheKey($cm->rootEntityName, $entry['identifier']);
         };
 
-        $cacheKeys = new CollectionCacheEntry(array_map($generateKeys, $entry->result));
+        $cacheKeys = new CollectionCacheEntry(array_map($generateKeys, $cacheEntry->result));
         $entries   = $region->getMultiple($cacheKeys);
 
         // @TODO - move to cache hydration component
-        foreach ($entry->result as $index => $entry) {
+        foreach ($cacheEntry->result as $index => $entry) {
             $entityEntry = is_array($entries) && array_key_exists($index, $entries) ? $entries[$index] : null;
 
             if ($entityEntry === null) {
@@ -210,6 +210,25 @@ class DefaultQueryCache implements QueryCache
                 $collection->setInitialized(true);
             }
 
+            foreach ($data as $fieldName => $unCachedAssociationData) {
+                // In some scenarios, such as EAGER+ASSOCIATION+ID+CACHE, the
+                // cache key information in `$cacheEntry` will not contain details
+                // for fields that are associations.
+                //
+                // This means that `$data` keys for some associations that may
+                // actually not be cached will not be converted to actual association
+                // data, yet they contain L2 cache AssociationCacheEntry objects.
+                //
+                // We need to unwrap those associations into proxy references,
+                // since we don't have actual data for them except for identifiers.
+                if ($unCachedAssociationData instanceof AssociationCacheEntry) {
+                    $data[$fieldName] = $this->em->getReference(
+                        $unCachedAssociationData->class,
+                        $unCachedAssociationData->identifier
+                    );
+                }
+            }
+
             $result[$index] = $this->uow->createEntity($entityEntry->class, $data, self::$hints);
         }
 
@@ -246,7 +265,6 @@ class DefaultQueryCache implements QueryCache
         $data        = [];
         $entityName  = reset($rsm->aliasMap);
         $rootAlias   = key($rsm->aliasMap);
-        $hasRelation = ( ! empty($rsm->relationMap));
         $persister   = $this->uow->getEntityPersister($entityName);
 
         if ( ! ($persister instanceof CachedPersister)) {
@@ -258,8 +276,6 @@ class DefaultQueryCache implements QueryCache
         foreach ($result as $index => $entity) {
             $identifier                     = $this->uow->getEntityIdentifier($entity);
             $entityKey                      = new EntityCacheKey($entityName, $identifier);
-            $data[$index]['identifier']     = $identifier;
-            $data[$index]['associations']   = [];
 
             if (($key->cacheMode & Cache::MODE_REFRESH) || ! $region->contains($entityKey)) {
                 // Cancel put result if entity put fail
@@ -268,9 +284,8 @@ class DefaultQueryCache implements QueryCache
                 }
             }
 
-            if ( ! $hasRelation) {
-                continue;
-            }
+            $data[$index]['identifier']   = $identifier;
+            $data[$index]['associations'] = [];
 
             // @TODO - move to cache hydration components
             foreach ($rsm->relationMap as $alias => $name) {

From caa008b61d25840057698442a8a63e8c8e997d19 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Wed, 23 Aug 2017 00:25:29 +0200
Subject: [PATCH 16/17] #6284 #6217 removing hacks around the `ClassMetadata`
 details - invalid fix that was actually fixing the symptom

---
 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 4057455b3..b5eebcdde 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -29,7 +29,6 @@ use ReflectionClass;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\Common\ClassLoader;
 use Doctrine\ORM\Cache\CacheException;
-use Doctrine\ORM\Cache\AssociationCacheEntry;
 
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@@ -715,14 +714,11 @@ class ClassMetadataInfo implements ClassMetadata
      */
     public function getIdentifierValues($entity)
     {
-        if ($entity instanceof AssociationCacheEntry) {
-            throw new \InvalidArgumentException('WTF DUDE: ' . $entity->class . ' - ' . \serialize($entity->identifier));
-        }
         if ($this->isIdentifierComposite) {
             $id = [];
 
             foreach ($this->identifier as $idField) {
-                $value = $this->getIndentifierValue($entity, $idField);
+                $value = $this->reflFields[$idField]->getValue($entity);
 
                 if (null !== $value) {
                     $id[$idField] = $value;
@@ -733,7 +729,7 @@ class ClassMetadataInfo implements ClassMetadata
         }
 
         $id = $this->identifier[0];
-        $value = $this->getIndentifierValue($entity, $id);
+        $value = $this->reflFields[$id]->getValue($entity);
 
         if (null === $value) {
             return [];
@@ -742,15 +738,6 @@ class ClassMetadataInfo implements ClassMetadata
         return [$id => $value];
     }
 
-    private function getIndentifierValue($entity, $id)
-    {
-        if ($entity instanceof AssociationCacheEntry) {
-             return $entity->identifier[$id];
-        }
-
-        return $this->reflFields[$id]->getValue($entity);
-    }
-
     /**
      * Populates the entity identifier of an entity.
      *

From 660f164568aec5a9c893b041fb1630a2074f6fcb Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Fri, 25 Aug 2017 09:21:12 +0200
Subject: [PATCH 17/17] #6284 #6217 s/$this->assert/self::assert as per
 @lcobucci's review

---
 .../Tests/ORM/Functional/Ticket/GH6217Test.php       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 861925f08..d781d0c81 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -35,17 +35,17 @@ final class GH6217Test extends OrmFunctionalTestCase
         $repository = $this->_em->getRepository(GH6217FetchedEntity::class);
         $filters    = ['eager' => $eager->id];
 
-        $this->assertCount(1, $repository->findBy($filters));
+        self::assertCount(1, $repository->findBy($filters));
         $queryCount = $this->getCurrentQueryCount();
 
         /* @var $found GH6217FetchedEntity[] */
         $found = $repository->findBy($filters);
 
-        $this->assertCount(1, $found);
-        $this->assertInstanceOf(GH6217FetchedEntity::class, $found[0]);
-        $this->assertSame($lazy->id, $found[0]->lazy->id);
-        $this->assertSame($eager->id, $found[0]->eager->id);
-        $this->assertEquals($queryCount, $this->getCurrentQueryCount(), 'No queries were executed in `findBy`');
+        self::assertCount(1, $found);
+        self::assertInstanceOf(GH6217FetchedEntity::class, $found[0]);
+        self::assertSame($lazy->id, $found[0]->lazy->id);
+        self::assertSame($eager->id, $found[0]->eager->id);
+        self::assertEquals($queryCount, $this->getCurrentQueryCount(), 'No queries were executed in `findBy`');
     }
 }