Merge cbadd67 into ab45a8a

sonata-project · Jan 23, 2019 · b77db78 · b77db78
2 parents ab45a8a + cbadd67
commit b77db78
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Entity/MessageManager.php b/src/Entity/MessageManager.php
@@ -206,7 +206,7 @@ protected function prepareStateQuery($state, $types, $batchSize, &$parameters)
         $query = $this->getRepository()
             ->createQueryBuilder('m')
             ->where('m.state = :state')
-            ->orderBy('m.createdAt');
+            ->orderBy('m.createdAt', 'DESC');
 
         $parameters['state'] = $state;
 

diff --git a/tests/Entity/MessageManagerTest.php b/tests/Entity/MessageManagerTest.php
@@ -151,6 +151,22 @@ public function testGetPagerWithInProgressMessages(): void
             ->getPager(['state' => MessageInterface::STATE_IN_PROGRESS], 1);
     }
 
+    public function testFindByTypes(): void
+    {
+        $self = $this;
+        $this
+            ->getMessageManager(function ($qb) use ($self): void {
+                $qb->expects($self->never())->method('andWhere');
+                $qb->expects($self->once())->method('where')->willReturnSelf();
+                $qb->expects($self->once())->method('setParameters')->with(['state' => MessageInterface::STATE_OPEN]);
+                $qb->expects($self->once())->method('orderBy')->with(
+                    $self->equalTo('m.createdAt'),
+                    $self->equalTo('DESC')
+                )->willReturnSelf();
+            })
+            ->findByTypes([], MessageInterface::STATE_OPEN, 10);
+    }
+
     /**
      * @return MessageManagerMock
      */