Fix Lexer query error

sonata-project · Mar 20, 2020 · 3e91e1f · 3e91e1f
1 parent 6e39b19
commit 3e91e1f
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 5 deletions.
diff --git a/src/Entity/CategoryManager.php b/src/Entity/CategoryManager.php
@@ -230,7 +230,8 @@ public function getPager(array $criteria, $page, $limit = 10, array $sort = [])
 
     public function getBySlug(string $slug, $context = null, ?bool $enabled = true): ?CategoryInterface
     {
-        $queryBuilder = $this->getObjectManager()->createQueryBuilder()
+        $queryBuilder = $this->getRepository()
+            ->createQueryBuilder('c')
             ->select('c')
             ->andWhere('c.slug = :slug')->setParameter('slug', $slug);
 

diff --git a/src/Entity/CollectionManager.php b/src/Entity/CollectionManager.php
@@ -47,7 +47,8 @@ public function getPager(array $criteria, $page, $limit = 10, array $sort = [])
 
     public function getBySlug(string $slug, $context = null, ?bool $enabled = true): ?CollectionInterface
     {
-        $queryBuilder = $this->getObjectManager()->createQueryBuilder()
+        $queryBuilder = $this->getRepository()
+            ->createQueryBuilder('c')
             ->select('c')
             ->andWhere('c.slug = :slug')->setParameter('slug', $slug);
 
@@ -63,7 +64,8 @@ public function getBySlug(string $slug, $context = null, ?bool $enabled = true):
 
     public function getByContext($context, ?bool $enabled = true): array
     {
-        $queryBuilder = $this->getObjectManager()->createQueryBuilder()
+        $queryBuilder = $this->getRepository()
+            ->createQueryBuilder('c')
             ->select('c')
             ->andWhere('c.context = :context')->setParameter('context', $context);
 

diff --git a/src/Entity/TagManager.php b/src/Entity/TagManager.php
@@ -47,7 +47,8 @@ public function getPager(array $criteria, $page, $limit = 10, array $sort = [])
 
     public function getBySlug(string $slug, $context = null, ?bool $enabled = true): ?TagInterface
     {
-        $queryBuilder = $this->getObjectManager()->createQueryBuilder()
+        $queryBuilder = $this->getRepository()
+            ->createQueryBuilder('t')
             ->select('t')
             ->andWhere('t.slug = :slug')->setParameter('slug', $slug);
 
@@ -63,7 +64,8 @@ public function getBySlug(string $slug, $context = null, ?bool $enabled = true):
 
     public function getByContext($context, ?bool $enabled = true): array
     {
-        $queryBuilder = $this->getObjectManager()->createQueryBuilder()
+        $queryBuilder = $this->getRepository()
+            ->createQueryBuilder('t')
             ->select('t')
             ->andWhere('t.context = :context')->setParameter('context', $context);
 

diff --git a/tests/Entity/CategoryManagerTest.php b/tests/Entity/CategoryManagerTest.php
@@ -273,6 +273,25 @@ public function testGetRootCategoriesSplitByContexts(): void
         $this->assertContains($categoryBar, $categories[$contextBar->getId()]);
     }
 
+    public function testGetBySlug(): void
+    {
+        $self = $this;
+        $this
+            ->getCategoryManager(static function ($qb) use ($self): void {
+                $qb->expects($self->once())->method('getRootAliases')->will($self->returnValue([]));
+                $qb->expects($self->exactly(3))->method('andWhere')->withConsecutive(
+                    [$self->equalTo('c.slug = :slug')],
+                    [$self->equalTo('c.context = :context')][$self->equalTo('c.enabled = :enabled')]
+                );
+                $qb->expects($self->exactly(3))->method('setParameter')->withConsecutive(
+                    [$self->equalTo('slug'), $self->equalTo('theslug')],
+                    [$self->equalTo('context'), $self->equalTo('contextA')],
+                    [$self->equalTo('enabled'), $self->equalTo(false)],
+                );
+            })
+            ->getBySlug('theslug', 'contextA', false);
+    }
+
     protected function getCategoryManager($qbCallback, $createQueryResult = null)
     {
         $em = $this->createEntityManagerMock($qbCallback, []);

diff --git a/tests/Entity/CollectionManagerTest.php b/tests/Entity/CollectionManagerTest.php
@@ -63,6 +63,42 @@ public function testGetPagerWithDisabledCollections(): void
             ], 1);
     }
 
+    public function testGetBySlug(): void
+    {
+        $self = $this;
+        $this
+            ->getCollectionManager(static function ($qb) use ($self): void {
+                $qb->expects($self->once())->method('getRootAliases')->will($self->returnValue([]));
+                $qb->expects($self->exactly(3))->method('andWhere')->withConsecutive(
+                    [$self->equalTo('c.slug = :slug')],
+                    [$self->equalTo('c.context = :context')][$self->equalTo('c.enabled = :enabled')]
+                );
+                $qb->expects($self->exactly(3))->method('setParameter')->withConsecutive(
+                    [$self->equalTo('slug'), $self->equalTo('theslug')],
+                    [$self->equalTo('context'), $self->equalTo('contextA')],
+                    [$self->equalTo('enabled'), $self->equalTo(false)],
+                );
+            })
+            ->getBySlug('theslug', 'contextA', false);
+    }
+
+    public function testGetByContext(): void
+    {
+        $self = $this;
+        $this
+            ->getCollectionManager(static function ($qb) use ($self): void {
+                $qb->expects($self->once())->method('getRootAliases')->will($self->returnValue([]));
+                $qb->expects($self->exactly(2))->method('andWhere')->withConsecutive(
+                    [$self->equalTo('c.context = :context')][$self->equalTo('c.enabled = :enabled')]
+                );
+                $qb->expects($self->exactly(2))->method('setParameter')->withConsecutive(
+                    [$self->equalTo('context'), $self->equalTo('contextA')],
+                    [$self->equalTo('enabled'), $self->equalTo(false)],
+                );
+            })
+            ->getByContext('contextA', false);
+    }
+
     protected function getCollectionManager($qbCallback)
     {
         $em = $this->createEntityManagerMock($qbCallback, []);

diff --git a/tests/Entity/TagManagerTest.php b/tests/Entity/TagManagerTest.php
@@ -63,6 +63,42 @@ public function testGetPagerWithDisabledTags(): void
             ], 1);
     }
 
+    public function testGetBySlug(): void
+    {
+        $self = $this;
+        $this
+            ->getTagManager(static function ($qb) use ($self): void {
+                $qb->expects($self->once())->method('getRootAliases')->will($self->returnValue([]));
+                $qb->expects($self->exactly(3))->method('andWhere')->withConsecutive(
+                    [$self->equalTo('t.slug = :slug')],
+                    [$self->equalTo('t.context = :context')][$self->equalTo('t.enabled = :enabled')]
+                );
+                $qb->expects($self->exactly(3))->method('setParameter')->withConsecutive(
+                    [$self->equalTo('slug'), $self->equalTo('theslug')],
+                    [$self->equalTo('context'), $self->equalTo('contextA')],
+                    [$self->equalTo('enabled'), $self->equalTo(false)],
+                );
+            })
+            ->getBySlug('theslug', 'contextA', false);
+    }
+
+    public function testGetByContext(): void
+    {
+        $self = $this;
+        $this
+            ->getTagManager(static function ($qb) use ($self): void {
+                $qb->expects($self->once())->method('getRootAliases')->will($self->returnValue([]));
+                $qb->expects($self->exactly(2))->method('andWhere')->withConsecutive(
+                    [$self->equalTo('t.context = :context')][$self->equalTo('t.enabled = :enabled')]
+                );
+                $qb->expects($self->exactly(2))->method('setParameter')->withConsecutive(
+                    [$self->equalTo('context'), $self->equalTo('contextA')],
+                    [$self->equalTo('enabled'), $self->equalTo(false)],
+                );
+            })
+            ->getByContext('contextA', false);
+    }
+
     protected function getTagManager($qbCallback)
     {
         $em = $this->createEntityManagerMock($qbCallback, []);