Fix a collector issue with standard identity provider.

ZF-Commons · Oct 7, 2013 · 852cbe6 · 852cbe6
2 parents 2061975 + df3a639
commit 852cbe6
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/src/ZfcRbac/Collector/RbacCollector.php b/src/ZfcRbac/Collector/RbacCollector.php
@@ -6,7 +6,8 @@
 use Zend\Mvc\MvcEvent;
 use ZendDeveloperTools\Collector\CollectorInterface;
 
-class RbacCollector implements CollectorInterface, Serializable {
+class RbacCollector implements CollectorInterface, Serializable
+{
     /**
      * Collector priority
      */
@@ -17,10 +18,12 @@ class RbacCollector implements CollectorInterface, Serializable {
      * @var array|null
      */
     protected $collectedRoles = array();
+
     /**
      * @var array|null
      */
     protected $collectedFirewalls = array();
+
     /**
      * @var array|null
      */
@@ -31,7 +34,8 @@ class RbacCollector implements CollectorInterface, Serializable {
      *
      * @return string
      */
-    public function getName() {
+    public function getName()
+    {
         return 'zfcrbac';
     }
 
@@ -40,7 +44,8 @@ public function getName() {
      *
      * @return integer
      */
-    public function getPriority() {
+    public function getPriority()
+    {
         return self::PRIORITY;
     }
 
@@ -49,7 +54,8 @@ public function getPriority() {
      *
      * @param MvcEvent $mvcEvent
      */
-    public function collect(MvcEvent $mvcEvent) {
+    public function collect(MvcEvent $mvcEvent)
+    {
         if (!$application = $mvcEvent->getApplication()) {
             return;
         }
@@ -59,13 +65,13 @@ 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')) {
+        if (method_exists($identityProvider, 'getIdentity')) {
             $identity = $identityProvider->getIdentity();
             $this->collectedRoles = $identity->getRoles();
-        }else{
+        } else {
             $rbac = $rbacService->getRbac();
             $roles = array();
-            foreach ($rbac as $role){
+            foreach ($rbac as $role) {
                 $roles[] = $role->getName();
             }
             $this->collectedRoles = $roles;
@@ -77,16 +83,20 @@ public function collect(MvcEvent $mvcEvent) {
     /**
      * @return array|string[]
      */
-    public function getCollection() {
+    public function getCollection()
+    {
         return $this->collection;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function serialize() {
-        return serialize(
-                array(
+    public function serialize()
+    {
+        return serialize
+                (
+                array
+                    (
                     'roles' => $this->collectedRoles,
                     'firewalls' => $this->collectedFirewalls,
                     'options' => $this->collectedOptions
@@ -97,8 +107,8 @@ public function serialize() {
     /**
      * {@inheritDoc}
      */
-    public function unserialize($serialized) {
+    public function unserialize($serialized)
+    {
         $this->collection = unserialize($serialized);
     }
-
 }