clear an improve

mrdatamapper · Jun 12, 2017 · cac1a55 · cac1a55
1 parent a56aea6
commit cac1a55
Show file tree

Hide file tree

Showing 16 changed files with 108 additions and 32 deletions.
diff --git a/src/AccessCheckIncludeInterface.php b/src/AccessCheckIncludeInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Akademiano\Acl;
+
+
+use Akademiano\Entity\GroupInterface;
+use Akademiano\Entity\UserInterface;
+
+interface AccessCheckIncludeInterface
+{
+    public function setAclManager(AccessCheckInterface $aclManager);
+
+    public function accessCheck($resource = null, GroupInterface $group = null, UserInterface $user = null, UserInterface $owner = null);
+}
diff --git a/src/AccessCheckIncludeTrait.php b/src/AccessCheckIncludeTrait.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Akademiano\Acl;
+
+use Akademiano\Entity\GroupInterface;
+use Akademiano\Entity\UserInterface;
+
+trait AccessCheckIncludeTrait
+{
+    /** @var  AccessCheckInterface */
+    protected $aclManager;
+
+    /**
+     * @return AccessCheckInterface
+     */
+    public function getAclManager()
+    {
+        return $this->aclManager;
+    }
+
+    /**
+     * @param AccessCheckInterface $aclManager
+     */
+    public function setAclManager(AccessCheckInterface $aclManager)
+    {
+        $this->aclManager = $aclManager;
+    }
+
+    public function accessCheck($resource = null, GroupInterface $group = null, UserInterface $user = null, UserInterface $owner = null)
+    {
+        return $this->getAclManager()->accessCheck($resource, $group, $user, $owner);
+    }
+}
diff --git a/src/Model/AccessCheckInterface.php → src/AccessCheckInterface.php b/src/Model/AccessCheckInterface.php → src/AccessCheckInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Akademiano\Acl\Model;
+namespace Akademiano\Acl;
 
 
 use Akademiano\Entity\GroupInterface;

diff --git a/src/Model/AclManager.php → src/AclManager.php b/src/Model/AclManager.php → src/AclManager.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Akademiano\Acl\Model;
+namespace Akademiano\Acl;
 
-use Akademiano\Acl\Model\Adapter\AdapterInterface;
-use Akademiano\Acl\Model\Adapter\DenyAdapter;
+use Akademiano\Acl\Adapter\AdapterInterface;
+use Akademiano\Acl\Adapter\DenyAdapter;
+use Akademiano\HttpWarp\Request;
 use Akademiano\User\AuthInterface;
 use Akademiano\Entity\UserInterface;
 use Akademiano\Entity\GroupInterface;
@@ -17,6 +18,9 @@ class AclManager implements AccessCheckInterface
     /** @var  AdapterInterface */
     protected $aclAdapter;
 
+    /** @var  Request */
+    protected $request;
+
     /**
      * @param AuthInterface $custodian
      */
@@ -52,9 +56,33 @@ public function setAclAdapter($aclAdapter)
         $this->aclAdapter = $aclAdapter;
     }
 
-    public function accessCheck($resource, GroupInterface $group, UserInterface $user = null, UserInterface $owner = null)
+    /**
+     * @return Request
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
+    /**
+     * @param Request $request
+     */
+    public function setRequest($request)
     {
-        $resource = (string)$resource;
+        $this->request = $request;
+    }
+
+    public function getResource()
+    {
+        $resource = (string)$this->getRequest()->getUrl()->getPath();
+        return $resource;
+    }
+
+    public function accessCheck($resource = null, GroupInterface $group, UserInterface $user = null, UserInterface $owner = null)
+    {
+        if (null === $resource) {
+            $resource = $this->getResource();
+        }
         if (is_null($user)) {
             $user = $this->getCustodian()->getCurrentUser();
         }

diff --git a/src/Adapter/AdapterInterface.php b/src/Adapter/AdapterInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Akademiano\Acl\Adapter;
+
+
+use Akademiano\Acl\AccessCheckInterface;
+
+interface AdapterInterface extends AccessCheckInterface
+{
+
+}
diff --git a/src/Model/Adapter/AllowAdapter.php → src/Adapter/AllowAdapter.php b/src/Model/Adapter/AllowAdapter.php → src/Adapter/AllowAdapter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Akademiano\Acl\Model\Adapter;
+namespace Akademiano\Acl\Adapter;
 
 
 use Akademiano\Entity\GroupInterface;

diff --git a/src/Model/Adapter/DenyAdapter.php → src/Adapter/DenyAdapter.php b/src/Model/Adapter/DenyAdapter.php → src/Adapter/DenyAdapter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Akademiano\Acl\Model\Adapter;
+namespace Akademiano\Acl\Adapter;
 
 
 use Akademiano\Entity\GroupInterface;

diff --git a/...del/Adapter/FileBasedAdapterInterface.php → src/Adapter/FileBasedAdapterInterface.php b/...del/Adapter/FileBasedAdapterInterface.php → src/Adapter/FileBasedAdapterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Akademiano\Acl\Model\Adapter;
+namespace Akademiano\Acl\Adapter;
 
 
 interface FileBasedAdapterInterface

diff --git a/src/Model/Adapter/RegisteredAdapter.php → src/Adapter/RegisteredAdapter.php b/src/Model/Adapter/RegisteredAdapter.php → src/Adapter/RegisteredAdapter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Akademiano\Acl\Model\Adapter;
+namespace Akademiano\Acl\Adapter;
 
 
 use Akademiano\User\GuestGroupInterface;

diff --git a/src/Model/Adapter/XAclAdapterInterface.php → src/Adapter/XAclAdapterInterface.php b/src/Model/Adapter/XAclAdapterInterface.php → src/Adapter/XAclAdapterInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Akademiano\Acl\Model\Adapter;
+namespace Akademiano\Acl\Adapter;
 
 
-use Akademiano\Acl\Model\XAclConf\File;
+use Akademiano\Acl\XAclConf\File;
 use Akademiano\Utils\ArrayTools;
 use Akademiano\Entity\GroupInterface;
 use Akademiano\Entity\UserInterface;

diff --git a/src/Model/Adapter/AdapterInterface.php b/src/Model/Adapter/AdapterInterface.php
diff --git a/src/RestrictedInterface.php → src/RestrictedAccessInterface.php b/src/RestrictedInterface.php → src/RestrictedAccessInterface.php
@@ -4,7 +4,7 @@
 namespace Akademiano\Acl;
 
 
-interface RestrictedInterface
+interface RestrictedAccessInterface
 {
     public function accessCheck();
 }
diff --git a/src/Model/XAclConf/File.php → src/XAclConf/File.php b/src/Model/XAclConf/File.php → src/XAclConf/File.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Akademiano\Acl\Model\XAclConf;
+namespace Akademiano\Acl\XAclConf;
 
 
 use Akademiano\Utils\Object\Prototype\ArrayableInterface;

diff --git a/src/Model/XAclConf/Item.php → src/XAclConf/Item.php b/src/Model/XAclConf/Item.php → src/XAclConf/Item.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Akademiano\Acl\Model\XAclConf;
+namespace Akademiano\Acl\XAclConf;
 
 
 use Akademiano\Utils\Object\Prototype\ArrayableInterface;

diff --git a/src/Model/XAclConf/Section.php → src/XAclConf/Section.php b/src/Model/XAclConf/Section.php → src/XAclConf/Section.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Akademiano\Acl\Model\XAclConf;
+namespace Akademiano\Acl\XAclConf;
 
 
 use Akademiano\Utils\Object\Prototype\ArrayableInterface;

diff --git a/src/config/resources.php b/src/config/resources.php
@@ -1,21 +1,22 @@
 <?php
 
-use Akademiano\Acl\Model\Adapter\FileBasedAdapterInterface;
+use Akademiano\Acl\Adapter\FileBasedAdapterInterface;
 
 return [
     'aclManager' => function (\Pimple\Container $c) {
-        $aclManager = new \Akademiano\Acl\Model\AclManager();
+        $aclManager = new \Akademiano\Acl\AclManager();
         $aclManager->setCustodian($c['custodian']);
+        $aclManager->setRequest($c["request"]);
         /** @var \Akademiano\Config\Config $config */
         $config = $c["config"];
-        $adapterName = $config->get(["Acl", "adapter"], "Akademiano\\Acl\\Model\\Adapter\\AllowAdapter");
-        /** @var \Akademiano\Acl\Model\Adapter\AdapterInterface $adapter */
+        $adapterName = $config->get(["Acl", "adapter"], "Akademiano\\Acl\\Adapter\\AllowAdapter");
+        /** @var \Akademiano\Acl\Adapter\AdapterInterface $adapter */
         $adapter = new $adapterName;
         if ($adapter instanceof \Akademiano\Config\ConfigurableInterface) {
             $adapter->setConfig($config);
         }
 
-        if ($adapter instanceof \Akademiano\Acl\Model\Adapter\FileBasedAdapterInterface) {
+        if ($adapter instanceof \Akademiano\Acl\Adapter\FileBasedAdapterInterface) {
             /** @var \Akademiano\Config\ConfigLoader $configLoader */
             $configLoader = $c["configLoader"];
             $files = $configLoader->getFiles(FileBasedAdapterInterface::CONFIG_NAME, FileBasedAdapterInterface::FILE_EXT);