Merge branch 'master' of git://github.com/zendframework/zf2 into hotf…

…ix/uri-path-not-being-set-when-empty
zendframework · Aug 3, 2012 · 202d5af · 202d5af
commit 202d5af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Acl.php b/src/Acl.php
@@ -718,7 +718,7 @@ public function isAllowed($role = null, $resource = null, $privilege = null)
                     return $result;
                 }
 
-                // look for rule on 'allRoles' psuedo-parent
+                // look for rule on 'allRoles' pseudo-parent
                 if (null !== ($rules = $this->getRules($resource, null))) {
                     foreach ($rules['byPrivilegeId'] as $privilege => $rule) {
                         if (self::TYPE_DENY === ($ruleTypeOnePrivilege = $this->getRuleType($resource, null, $privilege))) {

diff --git a/test/AclTest.php b/test/AclTest.php
@@ -1136,8 +1136,8 @@ public function testAclAssertionsGetOriginalIsAllowedObjects()
         $this->assertFalse($acl->isAllowed($user, $blogPost, 'modify'), 'Assertion should return false');
 
         // check to see if the last assertion has the proper objets
-        $this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\User', $assertion->lastAssertRole, 'Assertion did not recieve proper role object');
-        $this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\BlogPost', $assertion->lastAssertResource, 'Assertion did not recieve proper resource object');
+        $this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\User', $assertion->lastAssertRole, 'Assertion did not receive proper role object');
+        $this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\BlogPost', $assertion->lastAssertResource, 'Assertion did not receive proper resource object');
 
     }