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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
Preparing to tag 2.1.0 -- all new features from develop are now merged to master.
  • Loading branch information
@weierophinney
weierophinney committed Jan 29, 2013
69 parents 3ee9c5e + b7556e5 + c47d6e1 + dcee015 + 6c132b6 + 7065efb + e63c913 + b34a30f + f6898d8 + 9d8ce42 + e8926e5 + 5f59463 + 30b6149 + 843dd21 + 6d04042 + 98ed105 + ea632d6 + c2c0c90 + 4d8678c + b5fe867 + dd6dd90 + fe69d86 + 7e4c1bb + c718944 + 032f2c6 + e587c4a + afb2df9 + 4ea8d76 + 9dfff7d + c88317e + 2be5985 + 9490459 + 8e68e61 + b111673 + 18367f4 + f312673 + d7f78c7 + 82f434d + 9355d07 + 9cc8996 + 202d5af + 4dff9cb + 8834dfc + 81b48da + 05539b9 + 56091aa + 480b4d7 + 16f6088 + d32c68c + df5b9c3 + 9c8309f + 35ab5f0 + 1936d7e + c478319 + 9fafd09 + e102ab1 + a90bdee + 2f9fa9f + aad5075 + 4127f0d + eda7358 + 25538ec + ff2c116 + ee7f5d8 + 60fd2f8 + 33976d4 + 446a94e + fbb88bb + 78a9131 commit b0d3cc2
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 61 deletions.
8 changes: 1 addition & 7 deletions src/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
class Acl
class Acl implements AclInterface
{
/**
* Rule type: allow
Expand Down
51 changes: 51 additions & 0 deletions src/AclInterface.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\Permissions\Acl;

interface AclInterface
{
/**
* Returns true if and only if the Resource exists in the ACL
*
* The $resource parameter can either be a Resource or a Resource identifier.
*
* @param Resource\ResourceInterface|string $resource
* @return boolean
*/
public function hasResource($resource);

/**
* Returns true if and only if the Role has access to the Resource
*
* The $role and $resource parameters may be references to, or the string identifiers for,
* an existing Resource and Role combination.
*
* If either $role or $resource is null, then the query applies to all Roles or all Resources,
* respectively. Both may be null to query whether the ACL has a "blacklist" rule
* (allow everything to all). By default, Zend_Acl creates a "whitelist" rule (deny
* everything to all), and this method would return false unless this default has
* been overridden (i.e., by executing $acl->allow()).
*
* If a $privilege is not provided, then this method returns false if and only if the
* Role is denied access to at least one privilege upon the Resource. In other words, this
* method returns true if and only if the Role is allowed all privileges on the Resource.
*
* This method checks Role inheritance using a depth-first traversal of the Role registry.
* The highest priority parent (i.e., the parent most recently added) is checked first,
* and its respective parents are checked similarly before the lower-priority parents of
* the Role are checked.
*
* @param Role\RoleInterface|string $role
* @param Resource\ResourceInterface|string $resource
* @param string $privilege
* @return boolean
*/
public function isAllowed($role = null, $resource = null, $privilege = null);
}
6 changes: 0 additions & 6 deletions src/Assertion/AssertionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl\Assertion;
Expand All @@ -14,11 +13,6 @@
use Zend\Permissions\Acl\Resource\ResourceInterface;
use Zend\Permissions\Acl\Role\RoleInterface;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
interface AssertionInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,9 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl\Exception;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
interface ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl\Exception;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl\Exception;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
class RuntimeException extends \RuntimeException implements
ExceptionInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/Resource/GenericResource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl\Resource;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
class GenericResource implements ResourceInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Resource/ResourceInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl\Resource;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
interface ResourceInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Role/GenericRole.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl\Role;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
class GenericRole implements RoleInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Role/Registry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl\Role;

use Zend\Permissions\Acl\Exception;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
class Registry
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Role/RoleInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace Zend\Permissions\Acl\Role;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage Acl
*/
interface RoleInterface
{
/**
Expand Down

0 comments on commit b0d3cc2

Please sign in to comment.