From 8844ae9e1ae4420166ab492c867101b1c7c68cd0 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Thu, 19 Jun 2014 10:11:30 +0200 Subject: [PATCH] Fixes a regression introduced in 1.1.1 --- src/ACL.php | 2 +- tests/Integration/RebuildAuthorizationsTest.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ACL.php b/src/ACL.php index 1157903..06fe943 100755 --- a/src/ACL.php +++ b/src/ACL.php @@ -164,7 +164,7 @@ public function rebuildAuthorizations() $roleRepository = $this->entityManager->getRepository('MyCLabs\ACL\Model\Role'); // Clear - $this->entityManager->createQuery('DELETE MyCLabs\ACL\Model\Authorization'); + $this->entityManager->createQuery('DELETE MyCLabs\ACL\Model\Authorization')->execute(); $this->entityManager->clear('MyCLabs\ACL\Model\Authorization'); // Regenerate diff --git a/tests/Integration/RebuildAuthorizationsTest.php b/tests/Integration/RebuildAuthorizationsTest.php index 8c9e044..c6f5ce2 100644 --- a/tests/Integration/RebuildAuthorizationsTest.php +++ b/tests/Integration/RebuildAuthorizationsTest.php @@ -27,11 +27,20 @@ public function testRebuildAuthorizations() $this->em->clear(); + $qb = $this->em->createQueryBuilder(); + $qb->select('count(authorization.id)'); + $qb->from('MyCLabs\ACL\Model\Authorization', 'authorization'); + $query = $qb->getQuery(); + + $initialCount = $query->getSingleScalarResult(); + $this->acl->rebuildAuthorizations(); $this->assertFalse($this->acl->isAllowed($user, Actions::VIEW, $article1)); $this->assertFalse($this->acl->isAllowed($user, Actions::EDIT, $article1)); $this->assertTrue($this->acl->isAllowed($user, Actions::VIEW, $article2)); $this->assertTrue($this->acl->isAllowed($user, Actions::EDIT, $article2)); + + $this->assertEquals($initialCount, $query->getSingleScalarResult()); } }