Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

fixes issue #5 - assertion classes should type hint on AclInterface n… #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fixes issue #5 - assertion classes should type hint on AclInterface n… #6

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2848c3a
fixes issue #5 - assertion classes should type hint on AclInterface n…
steverhoades Oct 4, 2015
60999b0
fix unit tests
steverhoades Oct 4, 2015
612c016
remove commented line
steverhoades Oct 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Assertion/AssertionAggregate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
*/
namespace Zend\Permissions\Acl\Assertion;

use Zend\Permissions\Acl\Acl;
//use Zend\Permissions\Acl\Acl;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove comment

use Zend\Permissions\Acl\AclInterface;
use Zend\Permissions\Acl\Role\RoleInterface;
use Zend\Permissions\Acl\Resource\ResourceInterface;
use Zend\Permissions\Acl\Exception\InvalidArgumentException;
Expand Down Expand Up @@ -125,7 +126,7 @@ public function getMode()
* @throws RuntimeException
* @return bool
*/
public function assert(Acl $acl, RoleInterface $role = null, ResourceInterface $resource = null, $privilege = null)
public function assert(AclInterface $acl, RoleInterface $role = null, ResourceInterface $resource = null, $privilege = null)
{
// check if assertions are set
if (! $this->assertions) {
Expand Down
4 changes: 2 additions & 2 deletions src/Assertion/AssertionInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Zend\Permissions\Acl\Assertion;

use Zend\Permissions\Acl\Acl;
use Zend\Permissions\Acl\AclInterface;
use Zend\Permissions\Acl\Resource\ResourceInterface;
use Zend\Permissions\Acl\Role\RoleInterface;

Expand All @@ -28,5 +28,5 @@ interface AssertionInterface
* @param string $privilege
* @return bool
*/
public function assert(Acl $acl, RoleInterface $role = null, ResourceInterface $resource = null, $privilege = null);
public function assert(AclInterface $acl, RoleInterface $role = null, ResourceInterface $resource = null, $privilege = null);
}
4 changes: 2 additions & 2 deletions src/Assertion/CallbackAssertion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
namespace Zend\Permissions\Acl\Assertion;

use Zend\Permissions\Acl\Acl;
use Zend\Permissions\Acl\AclInterface;
use Zend\Permissions\Acl\Exception\InvalidArgumentException;
use Zend\Permissions\Acl\Resource\ResourceInterface;
use Zend\Permissions\Acl\Role\RoleInterface;
Expand Down Expand Up @@ -49,7 +49,7 @@ public function __construct($callback)
* @return bool
*/
public function assert(
Acl $acl,
AclInterface $acl,
RoleInterface $role = null,
ResourceInterface $resource = null,
$privilege = null
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/AssertionZF7973.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class AssertionZF7973 implements AssertionInterface
{
public function assert(Acl\Acl $acl, Acl\Role\RoleInterface $role = null, Acl\Resource\ResourceInterface $resource = null, $privilege = null)
public function assert(Acl\AclInterface $acl, Acl\Role\RoleInterface $role = null, Acl\Resource\ResourceInterface $resource = null, $privilege = null)
{
if ($privilege != 'privilege') {
return false;
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/MockAssertion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function __construct($returnValue)
$this->_returnValue = (bool) $returnValue;
}

public function assert(Acl\Acl $acl, Acl\Role\RoleInterface $role = null, Acl\Resource\ResourceInterface $resource = null,
public function assert(Acl\AclInterface $acl, Acl\Role\RoleInterface $role = null, Acl\Resource\ResourceInterface $resource = null,
$privilege = null)
{
return $this->_returnValue;
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/UseCase1/UserIsBlogPostOwnerAssertion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class UserIsBlogPostOwnerAssertion implements AssertionInterface
public $lastAssertPrivilege = null;
public $assertReturnValue = true;

public function assert(ZendAcl\Acl $acl, ZendAcl\Role\RoleInterface $user = null, ZendAcl\Resource\ResourceInterface $blogPost = null, $privilege = null)
public function assert(ZendAcl\AclInterface $acl, ZendAcl\Role\RoleInterface $user = null, ZendAcl\Resource\ResourceInterface $blogPost = null, $privilege = null)
{
$this->lastAssertRole = $user;
$this->lastAssertResource = $blogPost;
Expand Down