Merge pull request ZF-Commons#256 from ZF-Commons/move-permission-int…

…erface [3.0] Move permission interface
zionsg · Jul 11, 2014 · 651176f · 651176f
2 parents ec3c8e7 + 0b3bf9a
commit 651176f
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/src/ZfcRbac/Guard/ControllerPermissionsGuard.php b/src/ZfcRbac/Guard/ControllerPermissionsGuard.php
@@ -81,8 +81,8 @@ public function setRules(array $rules)
 
         foreach ($rules as $rule) {
             $controller  = strtolower($rule['controller']);
-            $actions     = isset($rule['actions']) ? (array)$rule['actions'] : [];
-            $permissions = (array)$rule['permissions'];
+            $actions     = isset($rule['actions']) ? (array) $rule['actions'] : [];
+            $permissions = (array) $rule['permissions'];
 
             if (empty($actions)) {
                 $this->rules[$controller][0] = $permissions;

diff --git a/src/ZfcRbac/Permission/PermissionInterface.php b/src/ZfcRbac/Permission/PermissionInterface.php
@@ -18,17 +18,21 @@
 
 namespace ZfcRbac\Permission;
 
-use Rbac\Permission\PermissionInterface as BasePermissionInterface;
-
 /**
  * Interface that permissions must implement to be used with the AuthorizationService
  *
- * Please note that currently the interface extends the one from RBAC, but starting in ZF3, the
- * permission will be removed from RBAC component and moved here completely
- *
  * @author  Michaël Gallego <[email protected]>
  * @licence MIT
  */
-interface PermissionInterface extends BasePermissionInterface
+interface PermissionInterface
 {
+    /**
+     * Get the permission name
+     *
+     * You really must return the name of the permission as internally, the casting to string is used
+     * as an optimization to avoid type checkings
+     *
+     * @return string
+     */
+    public function __toString();
 }
diff --git a/src/ZfcRbac/Service/AuthorizationService.php b/src/ZfcRbac/Service/AuthorizationService.php
@@ -19,11 +19,11 @@
 namespace ZfcRbac\Service;
 
 use Rbac\Rbac;
-use Rbac\Permission\PermissionInterface;
 use ZfcRbac\Assertion\AssertionPluginManager;
 use ZfcRbac\Assertion\AssertionInterface;
 use ZfcRbac\Exception;
 use ZfcRbac\Identity\IdentityInterface;
+use ZfcRbac\Permission\PermissionInterface;
 
 /**
  * Authorization service is a simple service that internally uses Rbac to check if identity is

diff --git a/src/ZfcRbac/Service/AuthorizationServiceInterface.php b/src/ZfcRbac/Service/AuthorizationServiceInterface.php
@@ -18,7 +18,7 @@
 
 namespace ZfcRbac\Service;
 
-use Rbac\Permission\PermissionInterface;
+use ZfcRbac\Permission\PermissionInterface;
 
 /**
  * Minimal interface for an authorization service

diff --git a/tests/ZfcRbacTest/Asset/FlatRole.php b/tests/ZfcRbacTest/Asset/FlatRole.php
@@ -20,8 +20,8 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
-use Rbac\Permission\PermissionInterface;
 use Rbac\Role\Role;
+use ZfcRbac\Permission\PermissionInterface;
 
 /**
  * @ORM\Entity

diff --git a/tests/ZfcRbacTest/Asset/HierarchicalRole.php b/tests/ZfcRbacTest/Asset/HierarchicalRole.php
@@ -20,8 +20,8 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
-use Rbac\Permission\PermissionInterface;
 use Rbac\Role\HierarchicalRole as BaseHierarchicalRole;
+use ZfcRbac\Permission\PermissionInterface;
 
 /**
  * @ORM\Entity

diff --git a/tests/ZfcRbacTest/Asset/Permission.php b/tests/ZfcRbacTest/Asset/Permission.php
@@ -20,7 +20,7 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
-use Rbac\Permission\PermissionInterface;
+use ZfcRbac\Permission\PermissionInterface;
 
 /**
  * @ORM\Entity