diff --git a/src/Acl.php b/src/Acl.php index 7bf7ab9..ac99273 100644 --- a/src/Acl.php +++ b/src/Acl.php @@ -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 */ @@ -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) { @@ -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) { @@ -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) { @@ -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) { @@ -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) { @@ -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) { @@ -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) @@ -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) @@ -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, @@ -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; } /** @@ -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) diff --git a/src/Assertion/AssertionInterface.php b/src/Assertion/AssertionInterface.php index ce5441d..5cd392b 100644 --- a/src/Assertion/AssertionInterface.php +++ b/src/Assertion/AssertionInterface.php @@ -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 */ @@ -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); } diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php index 6739287..e087eac 100644 --- a/src/Exception/ExceptionInterface.php +++ b/src/Exception/ExceptionInterface.php @@ -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 */ diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php index 8e0eea7..1d08f04 100644 --- a/src/Exception/InvalidArgumentException.php +++ b/src/Exception/InvalidArgumentException.php @@ -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 */ diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php index fc15411..220e88c 100644 --- a/src/Exception/RuntimeException.php +++ b/src/Exception/RuntimeException.php @@ -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 */ diff --git a/src/Resource/GenericResource.php b/src/Resource/GenericResource.php index 195046c..16aa171 100644 --- a/src/Resource/GenericResource.php +++ b/src/Resource/GenericResource.php @@ -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 */ diff --git a/src/Resource/ResourceInterface.php b/src/Resource/ResourceInterface.php index 56a988f..6483789 100644 --- a/src/Resource/ResourceInterface.php +++ b/src/Resource/ResourceInterface.php @@ -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 */ diff --git a/src/Role/GenericRole.php b/src/Role/GenericRole.php index be7f690..c055f9c 100644 --- a/src/Role/GenericRole.php +++ b/src/Role/GenericRole.php @@ -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 */ diff --git a/src/Role/Registry.php b/src/Role/Registry.php index f32c31f..2bb2a04 100644 --- a/src/Role/Registry.php +++ b/src/Role/Registry.php @@ -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 */ @@ -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) { @@ -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) { diff --git a/src/Role/RoleInterface.php b/src/Role/RoleInterface.php index 862a718..f314a25 100644 --- a/src/Role/RoleInterface.php +++ b/src/Role/RoleInterface.php @@ -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 */ diff --git a/test/AclTest.php b/test/AclTest.php index 28cd16f..ebe62d1 100644 --- a/test/AclTest.php +++ b/test/AclTest.php @@ -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 */ diff --git a/test/TestAsset/AssertionZF7973.php b/test/TestAsset/AssertionZF7973.php index 23ac2ef..0a91afa 100644 --- a/test/TestAsset/AssertionZF7973.php +++ b/test/TestAsset/AssertionZF7973.php @@ -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 */ diff --git a/test/TestAsset/ExtendedAclZF2234.php b/test/TestAsset/ExtendedAclZF2234.php index 8950496..64764dd 100644 --- a/test/TestAsset/ExtendedAclZF2234.php +++ b/test/TestAsset/ExtendedAclZF2234.php @@ -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 */ diff --git a/test/TestAsset/MockAssertion.php b/test/TestAsset/MockAssertion.php index da879ff..adc39d1 100644 --- a/test/TestAsset/MockAssertion.php +++ b/test/TestAsset/MockAssertion.php @@ -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 */ diff --git a/test/TestAsset/UseCase1/Acl.php b/test/TestAsset/UseCase1/Acl.php index 1f4a685..a2402fd 100644 --- a/test/TestAsset/UseCase1/Acl.php +++ b/test/TestAsset/UseCase1/Acl.php @@ -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 */ diff --git a/test/TestAsset/UseCase1/BlogPost.php b/test/TestAsset/UseCase1/BlogPost.php index 4f62c49..1cc9cd6 100644 --- a/test/TestAsset/UseCase1/BlogPost.php +++ b/test/TestAsset/UseCase1/BlogPost.php @@ -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 */ diff --git a/test/TestAsset/UseCase1/User.php b/test/TestAsset/UseCase1/User.php index 032004b..eb6e42d 100644 --- a/test/TestAsset/UseCase1/User.php +++ b/test/TestAsset/UseCase1/User.php @@ -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 */ diff --git a/test/TestAsset/UseCase1/UserIsBlogPostOwnerAssertion.php b/test/TestAsset/UseCase1/UserIsBlogPostOwnerAssertion.php index 3d733a1..50499c8 100644 --- a/test/TestAsset/UseCase1/UserIsBlogPostOwnerAssertion.php +++ b/test/TestAsset/UseCase1/UserIsBlogPostOwnerAssertion.php @@ -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 */