Added ability to set a default resource matcher

Author: Mathieu Decaffmeyer

composer.json

@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.1.x-dev"
         }
     }
 }

src/Acl.php

@@ -11,6 +11,8 @@
 
 namespace Mendo\Acl;
 
+use Matcher\MatcherInterface;
+
 /**
  * An ACL implementation.
  *
@@ -20,6 +22,7 @@ class Acl implements AclInterface
 {
     private $roles;
     private $rules = [];
+    private $defaultResourceMatcher;
 
     /**
      * @param Roles $roles
@@ -86,7 +89,7 @@ private function addRule($role, $resource, $privileges, $isAllowed)
         $role = $this->roles->get($role);
 
         if (is_scalar($resource)) {
-            $resource = new Resource($resource);
+            $resource = new Resource($resource, $this->defaultResourceMatcher);
         } elseif (!$resource instanceof ResourceInterface) {
             throw new \InvalidArgumentException('$resource is expected to be of type string or Mendo\Acl\ResourceInterface');
         }
@@ -165,4 +168,21 @@ private function getRule($role, $resource, $privilege)
 
         return null;
     }
+
+    /**
+     * @param MatcherInterface|string $defaultResourceMatcher
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setDefaultResourceMatcher($defaultResourceMatcher)
+    {
+        if (is_scalar($defaultResourceMatcher)) {
+            $defaultResourceMatcher = 'Mendo\\Acl\\Matcher\\'.ucfirst($defaultResourceMatcher).'Matcher';
+            $defaultResourceMatcher = new $defaultResourceMatcher();
+        } elseif (!$resource instanceof MatcherInterface) {
+            throw new \InvalidArgumentException('$defaultResourceMatcher is expected to be of type string or Mendo\Acl\Matcher\MatcherInterface');
+        }
+
+        $this->defaultResourceMatcher = $defaultResourceMatcher;
+    }
 }

src/Provider/Pimple/AclServiceProvider.php

@@ -35,7 +35,6 @@ public function register(Container $container)
             'roles' => [],
             'resources' => [],
         ];
-        $container[$this->reference.'.defaultResourceType'] = 'default';
 
         $container[$this->reference] = function ($c) {
             if (!empty($c[$this->reference.'.acl.roles'])) {
@@ -51,11 +50,11 @@ public function register(Container $container)
             }
 
             $acl = new Acl($roles);
+            if (!empty($c[$this->reference.'.defaultResourceMatcher'])) {
+                $acl->setDefaultResourceMatcher($c[$this->reference.'.defaultResourceMatcher']);
+            }
 
             foreach ($c[$this->reference.'.definitions']['resources'] as $resource => $data) {
-                $resourceType = !empty($data['type']) ? $data['type'] : $c[$this->reference.'.defaultResourceType'];
-                $resourceMatcher = 'Mendo\\Acl\\Matcher\\'.ucfirst($resourceType).'Matcher';
-                $resource = new Resource($resource, new $resourceMatcher());
                 $rules = !empty($data['rules']) ? $data['rules'] : [];
                 foreach ($rules as $rule) {
                     if (empty($rule['role'])) {

tests/AclTest.php

@@ -334,6 +334,20 @@ public function testMultipleAclOneSetOfRoles()
         $this->assertTrue($this->acl2->isAllowed('guest', 'bar', 'view'));
         $this->assertFalse($this->acl1->isAllowed('guest', 'bar', 'view'));
     }
+
+    public function testAclDefaultResourceMatcher()
+    {
+        $resource = new Resource('page/', new StartsWithMatcher());
+
+        $this->acl->addRole('guest');
+
+        $this->acl->setDefaultResourceMatcher('startsWith');
+
+        $this->acl->allow('guest', 'page/', '*');
+
+        $this->assertTrue($this->acl->isAllowed('guest', 'page/view/42'));
+        $this->assertFalse($this->acl->isAllowed('guest', 'user/view/42'));
+    }
 }
 
 class MyCustomResource implements ResourceInterface