Merge pull request #567 from greg0ire/postHawk-565-fix

Post hawk 565 fix
sonata-project · May 26, 2016 · 7adaffd · 7adaffd
2 parents 4990b74 + 4da0785
commit 7adaffd
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/Datagrid/ProxyQuery.php b/Datagrid/ProxyQuery.php
@@ -11,6 +11,7 @@
 
 namespace Sonata\DoctrineORMAdminBundle\Datagrid;
 
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
@@ -113,11 +114,22 @@ public function execute(array $params = array(), $hydrationMode = null)
             ->getMetadataFor(current($queryBuilder->getRootEntities()))
             ->getIdentifierFieldNames();
 
+        $existingOrders = array();
+        /** @var Query\Expr\OrderBy $order */
+        foreach ($queryBuilder->getDQLPart('orderBy') as $order) {
+            foreach ($order->getParts() as $part) {
+                $existingOrders[] = trim(str_replace(array(Criteria::DESC, Criteria::ASC), '', $part));
+            }
+        }
+
         foreach ($identifierFields as $identifierField) {
-            $queryBuilder->addOrderBy(
-                $rootAlias.'.'.$identifierField,
-                $this->getSortOrder() // reusing the sort order is the most natural way to go
-            );
+            $order = $rootAlias.'.'.$identifierField;
+            if (!in_array($order, $existingOrders)) {
+                $queryBuilder->addOrderBy(
+                    $order,
+                    $this->getSortOrder() // reusing the sort order is the most natural way to go
+                );
+            }
         }
 
         return $this->getFixedQueryBuilder($queryBuilder)->getQuery()->execute($params, $hydrationMode);

diff --git a/Tests/Datagrid/ProxyQueryTest.php b/Tests/Datagrid/ProxyQueryTest.php
@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Query\Expr\From;
+use Doctrine\ORM\Query\Expr\OrderBy;
 use Sonata\DoctrineORMAdminBundle\Tests\Fixtures\DoctrineType\UuidType;
 use Sonata\DoctrineORMAdminBundle\Tests\Fixtures\Util\NonIntegerIdentifierTestClass;
 
@@ -99,10 +100,19 @@ public function testGetFixedQueryBuilder($class, $alias, $id, $expectedId, $valu
         $qb->expects($this->once())
             ->method('setParameter')
             ->with($this->equalTo($expectedId), $this->equalTo(array($value)));
-        $qb->expects($this->once())
+        $qb->expects($this->any())
             ->method('getDQLPart')
-            ->with($this->equalTo('from'))
-            ->willReturn(array(new From($class, $alias)));
+            ->will($this->returnCallBack(function ($part) use ($class, $alias) {
+                $parts = array(
+                    'from' => array(new From($class, $alias)),
+                    'orderBy' => array(new OrderBy('whatever', 'DESC')),
+                );
+
+                return $parts[$part];
+            }));
+        $qb->expects($this->once())
+            ->method('addOrderBy')
+            ->with("$alias.$id", null);
         $qb->expects($this->once())
             ->method('getRootEntities')
             ->willReturn(array($class));

diff --git a/composer.json b/composer.json
@@ -32,6 +32,7 @@
     "require-dev": {
         "knplabs/knp-menu-bundle": "^2.1.1",
         "simplethings/entity-audit-bundle": "~0.1",
+        "sllh/php-cs-fixer-styleci-bridge": "^2.0",
         "symfony/phpunit-bridge": "^2.7 || ^3.0"
     },
     "suggest": {