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

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into reflection
Browse files Browse the repository at this point in the history
  • Loading branch information
@pierredup
pierredup committed Jan 11, 2013
46 parents 56091aa + 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 + b7556e5 + 05539b9 + 480b4d7 commit 35ab5f0
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 36 deletions.
30 changes: 15 additions & 15 deletions src/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down Expand Up @@ -139,7 +139,7 @@ public function getRole($role)
* The $role parameter can either be a Role or a Role identifier.
*
* @param Role\RoleInterface|string $role
* @return boolean
* @return bool
*/
public function hasRole($role)
{
Expand All @@ -157,8 +157,8 @@ public function hasRole($role)
*
* @param Role\RoleInterface|string $role
* @param Role\RoleInterface|string $inherit
* @param boolean $onlyParents
* @return boolean
* @param bool $onlyParents
* @return bool
*/
public function inheritsRole($role, $inherit, $onlyParents = false)
{
Expand Down Expand Up @@ -307,7 +307,7 @@ public function getResource($resource)
* The $resource parameter can either be a Resource or a Resource identifier.
*
* @param Resource\ResourceInterface|string $resource
* @return boolean
* @return bool
*/
public function hasResource($resource)
{
Expand All @@ -331,9 +331,9 @@ public function hasResource($resource)
*
* @param Resource\ResourceInterface|string $resource
* @param Resource\ResourceInterface|string inherit
* @param boolean $onlyParent
* @param bool $onlyParent
* @throws Exception\InvalidArgumentException
* @return boolean
* @return bool
*/
public function inheritsResource($resource, $inherit, $onlyParent = false)
{
Expand Down Expand Up @@ -683,7 +683,7 @@ public function setRule($operation, $type, $roles = null, $resources = null,
* @param Role\RoleInterface|string $role
* @param Resource\ResourceInterface|string $resource
* @param string $privilege
* @return boolean
* @return bool
*/
public function isAllowed($role = null, $resource = null, $privilege = null)
{
Expand Down Expand Up @@ -782,7 +782,7 @@ protected function getRoleRegistry()
*
* @param Role\RoleInterface $role
* @param Resource\ResourceInterface $resource
* @return boolean|null
* @return bool|null
*/
protected function roleDFSAllPrivileges(Role\RoleInterface $role, Resource\ResourceInterface $resource = null)
{
Expand Down Expand Up @@ -818,7 +818,7 @@ protected function roleDFSAllPrivileges(Role\RoleInterface $role, Resource\Resou
* @param Role\RoleInterface $role
* @param Resource\ResourceInterface $resource
* @param array $dfs
* @return boolean|null
* @return bool|null
* @throws Exception\RuntimeException
*/
protected function roleDFSVisitAllPrivileges(Role\RoleInterface $role, Resource\ResourceInterface $resource = null, &$dfs = null)
Expand Down Expand Up @@ -856,7 +856,7 @@ protected function roleDFSVisitAllPrivileges(Role\RoleInterface $role, Resource\
* @param Role\RoleInterface $role
* @param Resource\ResourceInterface $resource
* @param string $privilege
* @return boolean|null
* @return bool|null
* @throws Exception\RuntimeException
*/
protected function roleDFSOnePrivilege(Role\RoleInterface $role, Resource\ResourceInterface $resource = null, $privilege = null)
Expand Down Expand Up @@ -898,7 +898,7 @@ protected function roleDFSOnePrivilege(Role\RoleInterface $role, Resource\Resour
* @param Resource\ResourceInterface $resource
* @param string $privilege
* @param array $dfs
* @return boolean|null
* @return bool|null
* @throws Exception\RuntimeException
*/
protected function roleDFSVisitOnePrivilege(Role\RoleInterface $role, Resource\ResourceInterface $resource = null,
Expand Down Expand Up @@ -990,9 +990,9 @@ protected function getRuleType(Resource\ResourceInterface $resource = null, Role
return null;
} elseif (self::TYPE_ALLOW === $rule['type']) {
return self::TYPE_DENY;
} else {
return self::TYPE_ALLOW;
}

return self::TYPE_ALLOW;
}

/**
Expand All @@ -1005,7 +1005,7 @@ protected function getRuleType(Resource\ResourceInterface $resource = null, Role
*
* @param Resource\ResourceInterface $resource
* @param Role\RoleInterface $role
* @param boolean $create
* @param bool $create
* @return array|null
*/
protected function &getRules(Resource\ResourceInterface $resource = null, Role\RoleInterface $role = null, $create = false)
Expand Down
4 changes: 2 additions & 2 deletions src/Assertion/AssertionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down Expand Up @@ -32,7 +32,7 @@ interface AssertionInterface
* @param RoleInterface $role
* @param ResourceInterface $resource
* @param string $privilege
* @return boolean
* @return bool
*/
public function assert(Acl $acl, RoleInterface $role = null, ResourceInterface $resource = null, $privilege = null);
}
2 changes: 1 addition & 1 deletion src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Resource/GenericResource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Resource/ResourceInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Role/GenericRole.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
8 changes: 4 additions & 4 deletions src/Role/Registry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down Expand Up @@ -120,7 +120,7 @@ public function get($role)
* The $role parameter can either be a Role or a Role identifier.
*
* @param RoleInterface|string $role
* @return boolean
* @return bool
*/
public function has($role)
{
Expand Down Expand Up @@ -164,9 +164,9 @@ public function getParents($role)
*
* @param RoleInterface|string $role
* @param RoleInterface|string $inherit
* @param boolean $onlyParents
* @param bool $onlyParents
* @throws Exception\InvalidArgumentException
* @return boolean
* @return bool
*/
public function inherits($role, $inherit, $onlyParents = false)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Role/RoleInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/AclTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/AssertionZF7973.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/ExtendedAclZF2234.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/MockAssertion.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/UseCase1/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/UseCase1/BlogPost.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/UseCase1/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down
2 changes: 1 addition & 1 deletion test/TestAsset/UseCase1/UserIsBlogPostOwnerAssertion.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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)
* @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
*/
Expand Down

0 comments on commit 35ab5f0

Please sign in to comment.