[Core] Fixes Permissions entity: Get assignment specification returns…

… "double depth"-array.
cross-solution · Apr 10, 2015 · 9468239 · 9468239
1 parent 221565a
commit 9468239
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/module/Core/src/Core/Entity/Permissions.php b/module/Core/src/Core/Entity/Permissions.php
@@ -104,9 +104,7 @@ class Permissions implements PermissionsInterface
      */
     public function __construct($type = null)
     {
-        if (!$type) {
-            $this->type = get_class($this);
-        }
+        $this->type = $type ?: get_class($this);
     }
 
     /**
@@ -204,10 +202,12 @@ public function grant ($resource, $permission = null, $build = true)
             unset($this->assigned[$resourceId]);
         } else {
             if ($resource instanceOf PermissionsResourceInterface) {
-                $spec = null === $permission
-                      ? $resource->getPermissionsUserIds($this->type)
-                      : array($permission => $resource->getPermissionsUserIds());
-
+                $spec = $resource->getPermissionsUserIds($this->type);
+                if (!is_array($spec) || !count($spec)) {
+                    $spec = array();
+                } else if (is_numeric(key($spec))) {
+                    $spec = array($permission => $spec);
+                }
             } else {
                 $spec = array($permission => $resource instanceOf UserInterface ? array($resource->getId()) : array($resource));
             }