Merge pull request #122 from arekkas/120-fix

Fixes #120
ZF-Commons · Dec 14, 2013 · 05f9bf7 · 05f9bf7
2 parents 4cdea96 + 8bb00e7
commit 05f9bf7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/ZfcRbac/Service/AuthorizationService.php b/src/ZfcRbac/Service/AuthorizationService.php
@@ -165,10 +165,14 @@ public function isGranted($permission, $assertion = null)
         if (null !== $assertion) {
             $identity = $this->identityProvider->getIdentity();
 
-            if (is_callable($assertion) && !$assertion($identity)) {
-                return false;
-            } elseif ($assertion instanceof AssertionInterface && !$assertion->assert($identity)) {
-                return false;
+           if (is_callable($assertion)) {
+                if (!$assertion($identity)) {
+                    return false;
+                }
+            } elseif ($assertion instanceof AssertionInterface) {
+                if (!$assertion->assert($identity)) {
+                    return false;
+                }
             } else {
                 throw new Exception\InvalidArgumentException(sprintf(
                     'Assertions must be callable or implement ZfcRbac\Assertion\AssertionInterface, "%s" given',

diff --git a/tests/ZfcRbacTest/Service/AuthorizationServiceTest.php b/tests/ZfcRbacTest/Service/AuthorizationServiceTest.php
@@ -83,6 +83,14 @@ function() { return false; },
                 false
             ],
 
+            // Simple is accepted from dynamic assertion
+            [
+                'member',
+                'read',
+                function() { return true; },
+                true
+            ],
+
             // Simple is refused from no role
             [
                 [],