wip match any rule

library/SimpleAcl/Acl.php

@@ -187,14 +187,33 @@ protected function getNames($object)
      * @param string|RoleAggregateInterface $roleAggregate
      * @param string|ResourceAggregateInterface $resourceAggregate
      */
-    protected function isRuleAllow($roleName, $resourceName, $ruleName, RuleResultCollection $ruleResultCollection, $roleAggregate, $resourceAggregate)
+    protected function isRuleAllow($roleName, $resourceName, $ruleName, 
+      RuleResultCollection $ruleResultCollection, $roleAggregate, $resourceAggregate)
     {
         foreach ($this->rules as $rule) {
             $rule->resetAggregate($roleAggregate, $resourceAggregate);
 
             $result = $rule->isAllowed($ruleName, $roleName, $resourceName);
             $ruleResultCollection->add($result);
         }
+
+    }
+
+    protected function addAnyRuleResultToResultSet($roleName, $resourceName,
+      $ruleResultCollection)
+    {
+      $any_resultSet = $this->matchAnyRuleResult($roleName, $resourceName);
+      $ruleResultCollection->merge($any_resultSet);
+
+      return $ruleResultCollection;
+    }
+
+    protected function matchAnyRuleResult($roleName, $resourceName)
+    {
+      $result_set = $this->isAllowedReturnResult($roleName, 
+        $resourceName, "*");
+
+      return $result_set;
     }
 
     /**
@@ -222,18 +241,27 @@ public function isAllowed($roleName, $resourceName, $ruleName)
      */
     public function isAllowedReturnResult($roleAggregate, $resourceAggregate, $ruleName)
     {
-        $ruleResultCollection = $this->getRuleResultCollection($roleAggregate);
+      $ruleResultCollection = $this->getRuleResultCollection($roleAggregate);
 
-        $roles = $this->getNames($roleAggregate);
-        $resources = $this->getNames($resourceAggregate);
+      $roles = $this->getNames($roleAggregate);
+      $resources = $this->getNames($resourceAggregate);
+
+      var_dump($roles);
+      var_dump($resources);
+
+      foreach ($roles as $roleName) {
+        foreach ($resources as $resourceName) {
+          $this->isRuleAllow($roleName, $resourceName, $ruleName, $ruleResultCollection, $roleAggregate, $resourceAggregate);
+
+          if($ruleName != "*") {
+            $ruleResultCollection = $this->addAnyRuleResultToResultSet(
+              $roleName, $resourceName, $ruleResultCollection);
+          }
 
-        foreach ($roles as $roleName) {
-            foreach ($resources as $resourceName) {
-                $this->isRuleAllow($roleName, $resourceName, $ruleName, $ruleResultCollection, $roleAggregate, $resourceAggregate);
-            }
         }
+      }
 
-        return $ruleResultCollection;
+      return $ruleResultCollection;
     }
 
     private function getRuleResultCollection($roleAggregate)

library/SimpleAcl/Rule.php

@@ -288,4 +288,4 @@ public function getResource()
     {
         return $this->resource;
     }
-}
+}

library/SimpleAcl/RuleResultCollection.php

@@ -50,6 +50,13 @@ public function add(RuleResult $result = null)
         $this->collection->insert($result, $result->getPriority());
     }
 
+    public function merge($resultCollection)
+    {
+      foreach($resultCollection as $result) {
+        $this->add($result);
+      }
+    }
+
     /**
      * @return bool
      */

tests/SimpleAcl/Rule/MatchAnyTest.php

@@ -0,0 +1,25 @@
+<?php
+namespace SimpleAclTest;
+
+use PHPUnit_Framework_TestCase;
+
+use SimpleAcl\Acl;
+use SimpleAcl\Role;
+use SimpleAcl\Role\RoleAggregate;
+use SimpleAcl\Resource;
+use SimpleAcl\Strategy\AggregateStrategyDenyWins;
+use SimpleAcl\Object;
+use SimpleAcl\Object\RecursiveIterator;
+use RecursiveIteratorIterator;
+
+class MatchAnyTest extends PHPUnit_Framework_TestCase
+{
+  public function testAny()
+  {
+    $acl = new Acl();
+    $user = new Role('User');
+    $siteFrontend = new Resource('SiteFrontend');
+    $acl->addRule($user, $siteFrontend, '*', true);
+    $this->assertTrue($acl->isAllowed($user, 'SiteFrontend', 'Edit'));
+  }
+}

tests/SimpleAcl/Strategy/AggregateStrategyTest.php

@@ -12,7 +12,7 @@
 use SimpleAcl\Object\RecursiveIterator;
 use RecursiveIteratorIterator;
 
-class AggregateStrategyDenyWinsTest extends PHPUnit_Framework_TestCase
+class AggregateStrategyTest extends PHPUnit_Framework_TestCase
 {
   public function testDenyWins()
   {