From a3ece3b419fa7bfe50ccf2a48d83545aa007fbe8 Mon Sep 17 00:00:00 2001
From: neoglez <neoglez@users.noreply.github.com>
Date: Mon, 21 Sep 2015 08:52:46 +0200
Subject: [PATCH 1/3] UnitTest backport of "Failing test case for broken
 paginator case"

UnitTest backport of "Failing test case for broken paginator case" ( https://github.com/doctrine/doctrine2/commit/192da148428e62cea53fa2b918daf14f85cd7286 ).
The branch 2.x is very important because it's related to ZF2 doctrine module (see https://github.com/doctrine/DoctrineORMModule/blob/master/composer.json ) and specially this issue affects the use case of extending the ZF2 user entity defined in ZfcUser ( https://github.com/ZF-Commons/ZfcUser ).
This test is meant to show the need of the backport of https://github.com/doctrine/doctrine2/commit/e501137d1afff2c08963828b61b0b8b6668edd83
---
 .../LimitSubqueryOutputWalkerTest.php         | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
index 40fe1575a..95b9793f6 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
@@ -350,7 +350,26 @@ ORDER BY b.id DESC'
             $query->getSQL()
         );
     }
+    
+    /**
+     * This tests ordering by property that has the 'declared' field.
+     */
+    public function testLimitSubqueryOrderByFieldFromMappedSuperclass()
+    {
+        $this->entityManager->getConnection()->setDatabasePlatform(new MySqlPlatform());
 
+        // now use the third one in query
+        $query = $this->entityManager->createQuery(
+            'SELECT b FROM Doctrine\Tests\ORM\Tools\Pagination\Banner b ORDER BY b.id DESC'
+        );
+        $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker');
+
+        $this->assertEquals(
+            'SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, b0_.name AS name_1 FROM Banner b0_) dctrn_result ORDER BY id_0 DESC',
+            $query->getSQL()
+        );
+    }
+    
     /**
      * Tests order by on a subselect expression (mysql).
      */

From ed637e51b9657114e34dc54a999d2278be6ef572 Mon Sep 17 00:00:00 2001
From: neoglez <neoglez@users.noreply.github.com>
Date: Mon, 21 Sep 2015 08:58:30 +0200
Subject: [PATCH 2/3] Backport of "fix aliasing of property in OrderBy from
 MappedSuperclass"

Backport of "LimitSubqueryOutputWalker: fix aliasing of property in OrderBy from MappedSuperclass" ( https://github.com/doctrine/doctrine2/commit/e501137d1afff2c08963828b61b0b8b6668edd83 )
See my comment on https://github.com/neoglez/doctrine2/commit/a3ece3b419fa7bfe50ccf2a48d83545aa007fbe8
---
 .../ORM/Tools/Pagination/LimitSubqueryOutputWalker.php       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
index 22d0628ba..b1d7bd9eb 100644
--- a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
+++ b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
@@ -438,7 +438,10 @@ class LimitSubqueryOutputWalker extends SqlWalker
                 // Field was declared in a parent class, so we need to get the proper SQL table alias
                 // for the joined parent table.
                 $otherClassMetadata = $this->em->getClassMetadata($fieldMapping['declared']);
-                $sqlTableAliasForFieldAlias = $this->getSQLTableAlias($otherClassMetadata->getTableName(), $dqlAliasForFieldAlias);
+                if (!$otherClassMetadata->isMappedSuperclass) {
+                    $sqlTableAliasForFieldAlias = $this->getSQLTableAlias($otherClassMetadata->getTableName(), $dqlAliasForFieldAlias);
+                    
+                }
             }
 
             // Compose search/replace patterns

From ef73249bc7a3cc1ebbb03621225b83237d33a2ea Mon Sep 17 00:00:00 2001
From: neoglez <neoglez@users.noreply.github.com>
Date: Mon, 21 Sep 2015 09:32:54 +0200
Subject: [PATCH 3/3] Entity to test a mapped superclass

Backport of https://github.com/doctrine/doctrine2/pull/1377/files to branch 2.5
---
 .../Tools/Pagination/PaginationTestCase.php   | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php
index f1553c13c..f1e56ff0c 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php
@@ -168,4 +168,22 @@ class Avatar
     public $image_width;
     /** @Column(type="string", length=255) */
     public $image_alt_desc;
-}
\ No newline at end of file
+}
+
+/** @MappedSuperclass */
+abstract class Identified
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    private $id;
+    public function getId()
+    {
+        return $this->id;
+    }
+}
+
+/** @Entity */
+class Banner extends Identified
+{
+    /** @Column(type="string") */
+    public $name;
+}