Modifed method accessCheck for a more logical order of arguments.

mrdatamapper · Jun 16, 2017 · da44584 · da44584
1 parent e283051
commit da44584
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     }
   },
   "require": {
-    "akademiano/user": "^1.0.0-beta.1",
+    "akademiano/user": "^1.0.0-beta.2",
     "akademiano/utils": "^1.0.0-beta.6",
     "akademiano/entity": "^1.0.0-beta.1",
     "akademiano/config": "^1.0.0-beta.9"

diff --git a/src/AccessCheckIncludeInterface.php b/src/AccessCheckIncludeInterface.php
@@ -10,5 +10,5 @@ interface AccessCheckIncludeInterface
 {
     public function setAclManager(AccessCheckInterface $aclManager);
 
-    public function accessCheck($resource = null, GroupInterface $group = null, UserInterface $user = null, UserInterface $owner = null);
+    public function accessCheck($resource = null, UserInterface $owner = null, GroupInterface $group = null, UserInterface $user = null);
 }
diff --git a/src/AccessCheckIncludeTrait.php b/src/AccessCheckIncludeTrait.php
@@ -26,8 +26,8 @@ public function setAclManager(AccessCheckInterface $aclManager)
         $this->aclManager = $aclManager;
     }
 
-    public function accessCheck($resource = null, GroupInterface $group = null, UserInterface $user = null, UserInterface $owner = null)
+    public function accessCheck($resource = null, UserInterface $owner = null, GroupInterface $group = null, UserInterface $user = null)
     {
-        return $this->getAclManager()->accessCheck($resource, $group, $user, $owner);
+        return $this->getAclManager()->accessCheck($resource, $owner, $group, $user);
     }
 }
diff --git a/src/AccessCheckInterface.php b/src/AccessCheckInterface.php
@@ -8,5 +8,5 @@
 
 interface AccessCheckInterface
 {
-    public function accessCheck($resource, GroupInterface $group, UserInterface $user = null, UserInterface $owner = null);
+    public function accessCheck($resource, UserInterface $owner = null, GroupInterface $group, UserInterface $user = null);
 }
diff --git a/src/AclManager.php b/src/AclManager.php
@@ -78,7 +78,7 @@ public function getResource()
         return $resource;
     }
 
-    public function accessCheck($resource = null, GroupInterface $group, UserInterface $user = null, UserInterface $owner = null)
+    public function accessCheck($resource = null, UserInterface $owner = null, GroupInterface $group, UserInterface $user = null)
     {
         if (null === $resource) {
             $resource = $this->getResource();
@@ -87,6 +87,6 @@ public function accessCheck($resource = null, GroupInterface $group, UserInterfa
             $user = $this->getCustodian()->getCurrentUser();
         }
         $group = $user->getGroup();
-        return $this->getAclAdapter()->accessCheck($resource, $group, $user, $owner);
+        return $this->getAclAdapter()->accessCheck($resource, $owner, $group, $user);
     }
 }
diff --git a/src/Adapter/AllowAdapter.php b/src/Adapter/AllowAdapter.php
@@ -8,7 +8,7 @@
 
 class AllowAdapter implements AdapterInterface
 {
-    public function accessCheck($resource, GroupInterface $group, UserInterface $user = null, UserInterface $owner = null)
+    public function accessCheck($resource, UserInterface $owner = null, GroupInterface $group, UserInterface $user = null)
     {
         return true;
     }

diff --git a/src/Adapter/DenyAdapter.php b/src/Adapter/DenyAdapter.php
@@ -8,7 +8,7 @@
 
 class DenyAdapter implements AdapterInterface
 {
-    public function accessCheck($resource, GroupInterface $group, UserInterface $user = null, UserInterface $owner = null)
+    public function accessCheck($resource, UserInterface $owner = null, GroupInterface $group, UserInterface $user = null)
     {
         return false;
     }

diff --git a/src/Adapter/RegisteredAdapter.php b/src/Adapter/RegisteredAdapter.php
@@ -31,7 +31,7 @@ public function getPatches()
         return $this->patches;
     }
 
-    public function accessCheck($resource, GroupInterface $group, UserInterface $user = null, UserInterface $owner = null)
+    public function accessCheck($resource, UserInterface $owner = null, GroupInterface $group, UserInterface $user = null)
     {
         $resource = $this->prepareResource($resource);
         $char = mb_strcut($resource, 0, 1);

diff --git a/src/Adapter/XAclAdapterInterface.php b/src/Adapter/XAclAdapterInterface.php
@@ -140,7 +140,7 @@ public function prepareResource($resource)
         return $resource;
     }
 
-    public function accessCheck($resource, GroupInterface $group, UserInterface $user = null, UserInterface $owner = null)
+    public function accessCheck($resource, UserInterface $owner = null, GroupInterface $group, UserInterface $user = null)
     {
         $resource = $this->prepareResource($resource);
         $params = [