Fix assigning more than 10 teasers when using elasticsearch (#4998)

* Fix assigning more than 10 teasers when using elasticsearch * Fix TestUserProvider Co-authored-by: Alexander Schranz <alexander@sulu.io>
sulu · Jan 22, 2020 · b26a3c4 · b26a3c4
1 parent c6a2fa1
commit b26a3c4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 CHANGELOG for Sulu
 ==================
 
+* dev-release/1.6
+    * BUGFIX      #4998  [ContentBundle]           Fix assigning more than 10 teasers when using elasticsearch
+
 * 1.6.30 (2020-01-13)
     * ENHANCEMENT #4968  [MediaBundle]             Improve performance for one layered images
 

diff --git a/src/Sulu/Bundle/ContentBundle/Teaser/ContentTeaserProvider.php b/src/Sulu/Bundle/ContentBundle/Teaser/ContentTeaserProvider.php
@@ -61,6 +61,7 @@ function($item) {
             ->createSearch(implode(' OR ', $statements))
             ->indexes($this->getPageIndexes())
             ->locale($locale)
+            ->setLimit(count($ids))
             ->execute();
 
         /** @var QueryHit $item */

diff --git a/src/Sulu/Bundle/ContentBundle/Tests/Unit/Teaser/ContentTeaserProviderTest.php b/src/Sulu/Bundle/ContentBundle/Tests/Unit/Teaser/ContentTeaserProviderTest.php
@@ -83,6 +83,7 @@ function($searchQuery) use ($ids) {
         )->willReturn($this->search->reveal())->shouldBeCalled();
         $this->search->indexes(['page_sulu_io_published'])->willReturn($this->search->reveal())->shouldBeCalled();
         $this->search->locale('de')->willReturn($this->search->reveal())->shouldBeCalled();
+        $this->search->setLimit(2)->willReturn($this->search->reveal())->shouldBeCalled();
         $this->search->execute()->willReturn(
             [$this->createQueryHit($ids[0], $data[$ids[0]]), $this->createQueryHit($ids[1], $data[$ids[1]])]
         );

diff --git a/src/Sulu/Bundle/TestBundle/Testing/TestUserProvider.php b/src/Sulu/Bundle/TestBundle/Testing/TestUserProvider.php
@@ -12,7 +12,6 @@
 namespace Sulu\Bundle\TestBundle\Testing;
 
 use Doctrine\ORM\EntityManager;
-use Sulu\Bundle\SecurityBundle\Entity\User;
 use Sulu\Component\Contact\Model\ContactRepositoryInterface;
 use Sulu\Component\Security\Authentication\UserRepositoryInterface;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
@@ -141,7 +140,7 @@ public function refreshUser(UserInterface $user)
      */
     public function supportsClass($class)
     {
-        return $class instanceof UserInterface;
+        return is_subclass_of($class, UserInterface::class);
     }
 
     /**