Merge pull request #87 from Nitecon/master

Validate has identity exists and try to use it before attempting to pull...
ZF-Commons · Oct 8, 2013 · b25d8fa · b25d8fa
2 parents 0ed6c2f + 3b99ff2
commit b25d8fa
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/ZfcRbac/Collector/RbacCollector.php b/src/ZfcRbac/Collector/RbacCollector.php
@@ -65,9 +65,11 @@ public function collect(MvcEvent $mvcEvent)
         $this->collectedOptions = $rbacConfig;
         $identityProvider = $sm->get($rbacConfig['identity_provider']);
         $rbacService = $sm->get('ZfcRbac\Service\Rbac');
-        if (method_exists($identityProvider, 'getIdentity')) {
-            $identity = $identityProvider->getIdentity();
-            $this->collectedRoles = $identity->getRoles();
+        if (method_exists($identityProvider, 'getIdentity') && method_exists($identityProvider, 'hasIdentity')) {
+            if ($identityProvider->hasIdentity()) {
+                $identity = $identityProvider->getIdentity();
+                $this->collectedRoles = $identity->getRoles();
+            }
         } else {
             $rbac = $rbacService->getRbac();
             $roles = array();