From 886a2d6bc3f15ff683342ecf95082afd37c734fa Mon Sep 17 00:00:00 2001 From: David Grudl Date: Fri, 23 May 2014 22:08:43 +0200 Subject: [PATCH 1/9] tests: removed @author --- tests/Security/Passwords.hash().phpt | 2 -- tests/Security/Passwords.needsRehash().phpt | 2 -- tests/Security/Passwords.verify().phpt | 2 -- tests/Security/Permission.CMSExample.phpt | 2 -- tests/Security/Permission.DefaultAssert.phpt | 2 -- tests/Security/Permission.DefaultDeny.phpt | 2 -- tests/Security/Permission.DefaultRuleSet.phpt | 2 -- tests/Security/Permission.IsAllowedNonExistent.phpt | 2 -- tests/Security/Permission.PrivilegeAllow.phpt | 2 -- tests/Security/Permission.PrivilegeAssert.phpt | 2 -- tests/Security/Permission.PrivilegeDeny.phpt | 2 -- tests/Security/Permission.Privileges.phpt | 2 -- tests/Security/Permission.RemoveDefaultAllow.phpt | 2 -- tests/Security/Permission.RemoveDefaultAllowNonExistent.phpt | 2 -- tests/Security/Permission.RemoveDefaultDeny.phpt | 2 -- tests/Security/Permission.RemoveDefaultDenyAssert.phpt | 2 -- tests/Security/Permission.RemoveDefaultDenyNonExistent.phpt | 2 -- ...ssion.RemovingRoleAfterItWasAllowedAccessToAllResources.phpt | 2 -- tests/Security/Permission.ResourceAddAndGetOne.phpt | 2 -- tests/Security/Permission.ResourceAddInheritsNonExistent.phpt | 2 -- tests/Security/Permission.ResourceDuplicate.phpt | 2 -- tests/Security/Permission.ResourceInherits.phpt | 2 -- tests/Security/Permission.ResourceInheritsNonExistent.phpt | 2 -- tests/Security/Permission.ResourceRemoveAll.phpt | 2 -- tests/Security/Permission.ResourceRemoveOneNonExistent.phpt | 2 -- .../Permission.RoleDefaultAllowRuleWithPrivilegeDenyRule.phpt | 2 -- .../Permission.RoleDefaultAllowRuleWithResourceDenyRule.phpt | 2 -- tests/Security/Permission.RoleDefaultRuleSet.phpt | 2 -- tests/Security/Permission.RoleDefaultRuleSetPrivilege.phpt | 2 -- tests/Security/Permission.RolePrivilegeAllow.phpt | 2 -- tests/Security/Permission.RolePrivilegeAssert.phpt | 2 -- tests/Security/Permission.RolePrivilegeDeny.phpt | 2 -- tests/Security/Permission.RolePrivileges.phpt | 2 -- tests/Security/Permission.RoleRegistryAddAndGetOne.phpt | 2 -- .../Security/Permission.RoleRegistryAddInheritsNonExistent.phpt | 2 -- tests/Security/Permission.RoleRegistryDuplicate.phpt | 2 -- tests/Security/Permission.RoleRegistryInherits.phpt | 2 -- tests/Security/Permission.RoleRegistryInheritsMultiple.phpt | 2 -- tests/Security/Permission.RoleRegistryInheritsNonExistent.phpt | 2 -- tests/Security/Permission.RoleRegistryRemoveAll.phpt | 2 -- tests/Security/Permission.RoleRegistryRemoveOneNonExistent.phpt | 2 -- tests/Security/Permission.RuleRoleRemove.phpt | 2 -- tests/Security/Permission.RuleRoleRemoveAll.phpt | 2 -- tests/Security/Permission.RulesRemove.phpt | 2 -- tests/Security/Permission.RulesResourceRemove.phpt | 2 -- tests/Security/Permission.RulesResourceRemoveAll.phpt | 2 -- tests/Security/SimpleAuthenticator.Roles.phpt | 2 -- tests/Security/SimpleAuthenticator.phpt | 2 -- tests/Security/User.authentication.phpt | 2 -- tests/Security/User.authorization.phpt | 2 -- 50 files changed, 100 deletions(-) diff --git a/tests/Security/Passwords.hash().phpt b/tests/Security/Passwords.hash().phpt index d1bbc361..af1e511c 100644 --- a/tests/Security/Passwords.hash().phpt +++ b/tests/Security/Passwords.hash().phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Passwords::hash() - * - * @author David Grudl * @phpversion 5.3.7 */ diff --git a/tests/Security/Passwords.needsRehash().phpt b/tests/Security/Passwords.needsRehash().phpt index 371b1d2e..d86a4ce5 100644 --- a/tests/Security/Passwords.needsRehash().phpt +++ b/tests/Security/Passwords.needsRehash().phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Passwords::needsRehash() - * - * @author David Grudl * @phpversion 5.3.7 */ diff --git a/tests/Security/Passwords.verify().phpt b/tests/Security/Passwords.verify().phpt index c08d8125..e2ad0ddf 100644 --- a/tests/Security/Passwords.verify().phpt +++ b/tests/Security/Passwords.verify().phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Passwords::verify() - * - * @author David Grudl * @phpversion 5.3.7 */ diff --git a/tests/Security/Permission.CMSExample.phpt b/tests/Security/Permission.CMSExample.phpt index 8de460e7..b99598f4 100644 --- a/tests/Security/Permission.CMSExample.phpt +++ b/tests/Security/Permission.CMSExample.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that an example for a content management system is operable. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.DefaultAssert.phpt b/tests/Security/Permission.DefaultAssert.phpt index 358edb24..97646b69 100644 --- a/tests/Security/Permission.DefaultAssert.phpt +++ b/tests/Security/Permission.DefaultAssert.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that the default rule obeys its assertion. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.DefaultDeny.phpt b/tests/Security/Permission.DefaultDeny.phpt index 7141b56b..31003737 100644 --- a/tests/Security/Permission.DefaultDeny.phpt +++ b/tests/Security/Permission.DefaultDeny.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that by default denies access to everything by all. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.DefaultRuleSet.phpt b/tests/Security/Permission.DefaultRuleSet.phpt index 0fa88ca7..6a2e612b 100644 --- a/tests/Security/Permission.DefaultRuleSet.phpt +++ b/tests/Security/Permission.DefaultRuleSet.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that ACL-wide rules (all Roles, Resources, and privileges) work properly. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.IsAllowedNonExistent.phpt b/tests/Security/Permission.IsAllowedNonExistent.phpt index 59498604..fd2b129f 100644 --- a/tests/Security/Permission.IsAllowedNonExistent.phpt +++ b/tests/Security/Permission.IsAllowedNonExistent.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that an exception is thrown when a non-existent Role and Resource parameters are specified to isAllowed(). - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.PrivilegeAllow.phpt b/tests/Security/Permission.PrivilegeAllow.phpt index daa5feb0..f93bd1ca 100644 --- a/tests/Security/Permission.PrivilegeAllow.phpt +++ b/tests/Security/Permission.PrivilegeAllow.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that a privilege allowed for all Roles upon all Resources works properly. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.PrivilegeAssert.phpt b/tests/Security/Permission.PrivilegeAssert.phpt index 21e899df..5a157bd6 100644 --- a/tests/Security/Permission.PrivilegeAssert.phpt +++ b/tests/Security/Permission.PrivilegeAssert.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that assertions on privileges work properly. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.PrivilegeDeny.phpt b/tests/Security/Permission.PrivilegeDeny.phpt index 58b30f67..9d82d8cc 100644 --- a/tests/Security/Permission.PrivilegeDeny.phpt +++ b/tests/Security/Permission.PrivilegeDeny.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that a privilege denied for all Roles upon all Resources works properly. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.Privileges.phpt b/tests/Security/Permission.Privileges.phpt index c7c94e14..172990f7 100644 --- a/tests/Security/Permission.Privileges.phpt +++ b/tests/Security/Permission.Privileges.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that multiple privileges work properly. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RemoveDefaultAllow.phpt b/tests/Security/Permission.RemoveDefaultAllow.phpt index 02c7df12..5745c4dc 100644 --- a/tests/Security/Permission.RemoveDefaultAllow.phpt +++ b/tests/Security/Permission.RemoveDefaultAllow.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removing the default allow rule results in default deny rule being assigned. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RemoveDefaultAllowNonExistent.phpt b/tests/Security/Permission.RemoveDefaultAllowNonExistent.phpt index 83c4c66d..21d0617d 100644 --- a/tests/Security/Permission.RemoveDefaultAllowNonExistent.phpt +++ b/tests/Security/Permission.RemoveDefaultAllowNonExistent.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removing non-existent default allow rule does nothing. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RemoveDefaultDeny.phpt b/tests/Security/Permission.RemoveDefaultDeny.phpt index a125e83c..4a031214 100644 --- a/tests/Security/Permission.RemoveDefaultDeny.phpt +++ b/tests/Security/Permission.RemoveDefaultDeny.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removing the default deny rule results in default deny rule. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RemoveDefaultDenyAssert.phpt b/tests/Security/Permission.RemoveDefaultDenyAssert.phpt index c53e1464..b8ecd180 100644 --- a/tests/Security/Permission.RemoveDefaultDenyAssert.phpt +++ b/tests/Security/Permission.RemoveDefaultDenyAssert.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removing the default deny rule results in assertion method being removed. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RemoveDefaultDenyNonExistent.phpt b/tests/Security/Permission.RemoveDefaultDenyNonExistent.phpt index 4d1a072c..713d464a 100644 --- a/tests/Security/Permission.RemoveDefaultDenyNonExistent.phpt +++ b/tests/Security/Permission.RemoveDefaultDenyNonExistent.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removing non-existent default deny rule does nothing. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RemovingRoleAfterItWasAllowedAccessToAllResources.phpt b/tests/Security/Permission.RemovingRoleAfterItWasAllowedAccessToAllResources.phpt index 14565b21..d3ce326a 100644 --- a/tests/Security/Permission.RemovingRoleAfterItWasAllowedAccessToAllResources.phpt +++ b/tests/Security/Permission.RemovingRoleAfterItWasAllowedAccessToAllResources.phpt @@ -3,8 +3,6 @@ /** * Test: Nette\Security\Permission Confirm that deleting a role after allowing access to all roles * raise undefined index error. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.ResourceAddAndGetOne.phpt b/tests/Security/Permission.ResourceAddAndGetOne.phpt index 81c75fce..c34b6d93 100644 --- a/tests/Security/Permission.ResourceAddAndGetOne.phpt +++ b/tests/Security/Permission.ResourceAddAndGetOne.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that basic addition and retrieval of a single Resource works. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.ResourceAddInheritsNonExistent.phpt b/tests/Security/Permission.ResourceAddInheritsNonExistent.phpt index 6558c247..1d599129 100644 --- a/tests/Security/Permission.ResourceAddInheritsNonExistent.phpt +++ b/tests/Security/Permission.ResourceAddInheritsNonExistent.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that an exception is thrown when a non-existent Resource is specified as a parent upon Resource addition. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.ResourceDuplicate.phpt b/tests/Security/Permission.ResourceDuplicate.phpt index 9af28cfb..ea92f2e1 100644 --- a/tests/Security/Permission.ResourceDuplicate.phpt +++ b/tests/Security/Permission.ResourceDuplicate.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that the same Resource cannot be added more than once. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.ResourceInherits.phpt b/tests/Security/Permission.ResourceInherits.phpt index cccefe10..46f12a8c 100644 --- a/tests/Security/Permission.ResourceInherits.phpt +++ b/tests/Security/Permission.ResourceInherits.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Tests basic Resource inheritance. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.ResourceInheritsNonExistent.phpt b/tests/Security/Permission.ResourceInheritsNonExistent.phpt index e25e10ee..1ae3545b 100644 --- a/tests/Security/Permission.ResourceInheritsNonExistent.phpt +++ b/tests/Security/Permission.ResourceInheritsNonExistent.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that an exception is thrown when a non-existent Resource is specified to each parameter of inherits(). - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.ResourceRemoveAll.phpt b/tests/Security/Permission.ResourceRemoveAll.phpt index 00fe4df1..16401b61 100644 --- a/tests/Security/Permission.ResourceRemoveAll.phpt +++ b/tests/Security/Permission.ResourceRemoveAll.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removal of all Resources works. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.ResourceRemoveOneNonExistent.phpt b/tests/Security/Permission.ResourceRemoveOneNonExistent.phpt index 4ebc04a6..2819116a 100644 --- a/tests/Security/Permission.ResourceRemoveOneNonExistent.phpt +++ b/tests/Security/Permission.ResourceRemoveOneNonExistent.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that an exception is thrown when a non-existent Resource is specified for removal. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleDefaultAllowRuleWithPrivilegeDenyRule.phpt b/tests/Security/Permission.RoleDefaultAllowRuleWithPrivilegeDenyRule.phpt index 33001c92..c655c63d 100644 --- a/tests/Security/Permission.RoleDefaultAllowRuleWithPrivilegeDenyRule.phpt +++ b/tests/Security/Permission.RoleDefaultAllowRuleWithPrivilegeDenyRule.phpt @@ -3,8 +3,6 @@ /** * Test: Nette\Security\Permission Ensures that for a particular Role, a deny rule on a specific privilege is honored before an allow * rule on the entire ACL. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleDefaultAllowRuleWithResourceDenyRule.phpt b/tests/Security/Permission.RoleDefaultAllowRuleWithResourceDenyRule.phpt index a14cbaf1..ccfa447f 100644 --- a/tests/Security/Permission.RoleDefaultAllowRuleWithResourceDenyRule.phpt +++ b/tests/Security/Permission.RoleDefaultAllowRuleWithResourceDenyRule.phpt @@ -3,8 +3,6 @@ /** * Test: Nette\Security\Permission Ensures that for a particular Role, a deny rule on a specific Resource is honored before an allow rule * on the entire ACL. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleDefaultRuleSet.phpt b/tests/Security/Permission.RoleDefaultRuleSet.phpt index 3bc821f2..bc84c751 100644 --- a/tests/Security/Permission.RoleDefaultRuleSet.phpt +++ b/tests/Security/Permission.RoleDefaultRuleSet.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that ACL-wide rules (all Resources and privileges) work properly for a particular Role. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleDefaultRuleSetPrivilege.phpt b/tests/Security/Permission.RoleDefaultRuleSetPrivilege.phpt index 4e22223c..fc1c39e5 100644 --- a/tests/Security/Permission.RoleDefaultRuleSetPrivilege.phpt +++ b/tests/Security/Permission.RoleDefaultRuleSetPrivilege.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that ACL-wide rules apply to privileges for a particular Role. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RolePrivilegeAllow.phpt b/tests/Security/Permission.RolePrivilegeAllow.phpt index 58385dda..a1602693 100644 --- a/tests/Security/Permission.RolePrivilegeAllow.phpt +++ b/tests/Security/Permission.RolePrivilegeAllow.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that a privilege allowed for a particular Role upon all Resources works properly. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RolePrivilegeAssert.phpt b/tests/Security/Permission.RolePrivilegeAssert.phpt index 5aeb3278..0751f135 100644 --- a/tests/Security/Permission.RolePrivilegeAssert.phpt +++ b/tests/Security/Permission.RolePrivilegeAssert.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that assertions on privileges work properly for a particular Role. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RolePrivilegeDeny.phpt b/tests/Security/Permission.RolePrivilegeDeny.phpt index b23e51c5..06a91395 100644 --- a/tests/Security/Permission.RolePrivilegeDeny.phpt +++ b/tests/Security/Permission.RolePrivilegeDeny.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that a privilege denied for a particular Role upon all Resources works properly. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RolePrivileges.phpt b/tests/Security/Permission.RolePrivileges.phpt index 7c83aff9..04538715 100644 --- a/tests/Security/Permission.RolePrivileges.phpt +++ b/tests/Security/Permission.RolePrivileges.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that multiple privileges work properly for a particular Role. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleRegistryAddAndGetOne.phpt b/tests/Security/Permission.RoleRegistryAddAndGetOne.phpt index ea1dfd76..c7617fc5 100644 --- a/tests/Security/Permission.RoleRegistryAddAndGetOne.phpt +++ b/tests/Security/Permission.RoleRegistryAddAndGetOne.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that basic addition and retrieval of a single Role works. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleRegistryAddInheritsNonExistent.phpt b/tests/Security/Permission.RoleRegistryAddInheritsNonExistent.phpt index 1113fbaf..928a54e0 100644 --- a/tests/Security/Permission.RoleRegistryAddInheritsNonExistent.phpt +++ b/tests/Security/Permission.RoleRegistryAddInheritsNonExistent.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that an exception is thrown when a non-existent Role is specified as a parent upon Role addition. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleRegistryDuplicate.phpt b/tests/Security/Permission.RoleRegistryDuplicate.phpt index b58a8120..97adde8c 100644 --- a/tests/Security/Permission.RoleRegistryDuplicate.phpt +++ b/tests/Security/Permission.RoleRegistryDuplicate.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that the same Role cannot be registered more than once to the registry. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleRegistryInherits.phpt b/tests/Security/Permission.RoleRegistryInherits.phpt index 9fcc3338..bd2866d3 100644 --- a/tests/Security/Permission.RoleRegistryInherits.phpt +++ b/tests/Security/Permission.RoleRegistryInherits.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Tests basic Role inheritance. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleRegistryInheritsMultiple.phpt b/tests/Security/Permission.RoleRegistryInheritsMultiple.phpt index 1f9b0e56..2d64ffc1 100644 --- a/tests/Security/Permission.RoleRegistryInheritsMultiple.phpt +++ b/tests/Security/Permission.RoleRegistryInheritsMultiple.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Tests basic Role multiple inheritance. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleRegistryInheritsNonExistent.phpt b/tests/Security/Permission.RoleRegistryInheritsNonExistent.phpt index 62f29528..462f980c 100644 --- a/tests/Security/Permission.RoleRegistryInheritsNonExistent.phpt +++ b/tests/Security/Permission.RoleRegistryInheritsNonExistent.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that an exception is thrown when a non-existent Role is specified to each parameter of inherits(). - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleRegistryRemoveAll.phpt b/tests/Security/Permission.RoleRegistryRemoveAll.phpt index b8595b98..9fbc25af 100644 --- a/tests/Security/Permission.RoleRegistryRemoveAll.phpt +++ b/tests/Security/Permission.RoleRegistryRemoveAll.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removal of all Roles works. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RoleRegistryRemoveOneNonExistent.phpt b/tests/Security/Permission.RoleRegistryRemoveOneNonExistent.phpt index 9036c517..a232ba27 100644 --- a/tests/Security/Permission.RoleRegistryRemoveOneNonExistent.phpt +++ b/tests/Security/Permission.RoleRegistryRemoveOneNonExistent.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that an exception is thrown when a non-existent Role is specified for removal. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RuleRoleRemove.phpt b/tests/Security/Permission.RuleRoleRemove.phpt index 9010ab9b..26ecb1cd 100644 --- a/tests/Security/Permission.RuleRoleRemove.phpt +++ b/tests/Security/Permission.RuleRoleRemove.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removal of a Role results in its rules being removed. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RuleRoleRemoveAll.phpt b/tests/Security/Permission.RuleRoleRemoveAll.phpt index a9035890..00719d58 100644 --- a/tests/Security/Permission.RuleRoleRemoveAll.phpt +++ b/tests/Security/Permission.RuleRoleRemoveAll.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removal of all Roles results in Role-specific rules being removed. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RulesRemove.phpt b/tests/Security/Permission.RulesRemove.phpt index bb096a7c..91910a01 100644 --- a/tests/Security/Permission.RulesRemove.phpt +++ b/tests/Security/Permission.RulesRemove.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensure that basic rule removal works. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RulesResourceRemove.phpt b/tests/Security/Permission.RulesResourceRemove.phpt index b83dde99..078ded22 100644 --- a/tests/Security/Permission.RulesResourceRemove.phpt +++ b/tests/Security/Permission.RulesResourceRemove.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removal of a Resource results in its rules being removed. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/Permission.RulesResourceRemoveAll.phpt b/tests/Security/Permission.RulesResourceRemoveAll.phpt index b59b1d05..c11b4c6b 100644 --- a/tests/Security/Permission.RulesResourceRemoveAll.phpt +++ b/tests/Security/Permission.RulesResourceRemoveAll.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\Permission Ensures that removal of all Resources results in Resource-specific rules being removed. - * - * @author David Grudl */ use Nette\Security\Permission, diff --git a/tests/Security/SimpleAuthenticator.Roles.phpt b/tests/Security/SimpleAuthenticator.Roles.phpt index f6da1b20..4ce3174a 100644 --- a/tests/Security/SimpleAuthenticator.Roles.phpt +++ b/tests/Security/SimpleAuthenticator.Roles.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\SimpleAuthenticator and roles - * - * @author David Matejka */ use Nette\Security\SimpleAuthenticator, diff --git a/tests/Security/SimpleAuthenticator.phpt b/tests/Security/SimpleAuthenticator.phpt index 65041c25..94c7e86a 100644 --- a/tests/Security/SimpleAuthenticator.phpt +++ b/tests/Security/SimpleAuthenticator.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\SimpleAuthenticator - * - * @author Matěj Koubík */ use Nette\Security\SimpleAuthenticator, diff --git a/tests/Security/User.authentication.phpt b/tests/Security/User.authentication.phpt index e315640e..2e53b840 100644 --- a/tests/Security/User.authentication.phpt +++ b/tests/Security/User.authentication.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\User authentication. - * - * @author David Grudl */ use Nette\Security\IAuthenticator, diff --git a/tests/Security/User.authorization.phpt b/tests/Security/User.authorization.phpt index b18fb2b1..ecc91371 100644 --- a/tests/Security/User.authorization.phpt +++ b/tests/Security/User.authorization.phpt @@ -2,8 +2,6 @@ /** * Test: Nette\Security\User authorization. - * - * @author David Grudl */ use Nette\Security\IAuthenticator, From 86de51f4ad25c2e88910a28f91ac61f4cc1ca3be Mon Sep 17 00:00:00 2001 From: David Grudl Date: Mon, 18 Aug 2014 00:24:06 +0200 Subject: [PATCH 2/9] .travis: added code checker --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 605785e7..8d35f321 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,15 @@ matrix: allow_failures: - php: hhvm -script: vendor/bin/tester tests -s -c tests/php-unix.ini +script: + - vendor/bin/tester tests -s -c tests/php-unix.ini + - php code-checker/src/code-checker.php -d src after_failure: # Print *.actual content - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done before_script: - # Install Nette Tester + # Install Nette Tester & Code Checker - composer install --no-interaction --dev --prefer-source + - composer create-project nette/code-checker code-checker ~2.2 --no-interaction --prefer-source From 687cd0020ac158f4198e64dd2c27c83b01b561eb Mon Sep 17 00:00:00 2001 From: David Grudl Date: Sun, 20 Jul 2014 13:24:52 +0200 Subject: [PATCH 3/9] Passwords: removed useless PASSWORD_MAX_LENGTH [Closes #1] --- src/Security/Passwords.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Security/Passwords.php b/src/Security/Passwords.php index d68ad79c..6118c4e9 100644 --- a/src/Security/Passwords.php +++ b/src/Security/Passwords.php @@ -40,7 +40,6 @@ public static function hash($password, array $options = NULL) throw new Nette\InvalidArgumentException("Cost must be in range 4-31, $cost given."); } - $password = substr($password, 0, self::PASSWORD_MAX_LENGTH); $hash = crypt($password, '$2y$' . ($cost < 10 ? 0 : '') . $cost . '$' . $salt); if (strlen($hash) < 60) { throw new Nette\InvalidStateException('Hash returned by crypt is invalid.'); From ffacb80cd85b4d686ca5bab54bdec9e6c6b0a6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=A1bl?= Date: Wed, 23 Jul 2014 17:47:44 +0200 Subject: [PATCH 4/9] Passwords: Fix for validation of cost 31 [Closes #2][Closes #4] --- src/Security/Passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Security/Passwords.php b/src/Security/Passwords.php index 6118c4e9..cf09c0df 100644 --- a/src/Security/Passwords.php +++ b/src/Security/Passwords.php @@ -55,7 +55,7 @@ public static function hash($password, array $options = NULL) public static function verify($password, $hash) { return preg_match('#^\$2y\$(?P\d\d)\$(?P.{22})#', $hash, $m) - && $m['cost'] > 3 && $m['cost'] < 31 + && $m['cost'] >= 4 && $m['cost'] <= 31 && self::hash($password, $m) === $hash; } From 505252ee7d4187ea74ba7cc9c1a237cb4d6f3c1b Mon Sep 17 00:00:00 2001 From: David Grudl Date: Fri, 22 Aug 2014 21:45:06 +0200 Subject: [PATCH 5/9] tests: removed useless php.ini files --- .travis.yml | 2 +- tests/php-unix.ini | 4 ---- tests/php-win.ini | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 tests/php-unix.ini delete mode 100644 tests/php-win.ini diff --git a/.travis.yml b/.travis.yml index 8d35f321..d93f0eea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ matrix: - php: hhvm script: - - vendor/bin/tester tests -s -c tests/php-unix.ini + - vendor/bin/tester tests -s - php code-checker/src/code-checker.php -d src after_failure: diff --git a/tests/php-unix.ini b/tests/php-unix.ini deleted file mode 100644 index 27f8a415..00000000 --- a/tests/php-unix.ini +++ /dev/null @@ -1,4 +0,0 @@ -[PHP] - -[Zend] -;zend_extension="./ext/zend_extension" diff --git a/tests/php-win.ini b/tests/php-win.ini deleted file mode 100644 index 5839751f..00000000 --- a/tests/php-win.ini +++ /dev/null @@ -1,5 +0,0 @@ -[PHP] -extension_dir = "./ext" - -[Zend] -;zend_extension="./ext/php_xdebug-2.0.5-5.3-vc6.dll" From 7899429bbaefe30ee7f5f1f729051328800d55b0 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Sun, 24 Aug 2014 20:06:58 +0200 Subject: [PATCH 6/9] UserPanel: removed $this from template --- src/Bridges/SecurityTracy/UserPanel.php | 2 ++ src/Bridges/SecurityTracy/templates/UserPanel.panel.phtml | 4 ++-- src/Bridges/SecurityTracy/templates/UserPanel.tab.phtml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Bridges/SecurityTracy/UserPanel.php b/src/Bridges/SecurityTracy/UserPanel.php index 3a5489b1..16512504 100644 --- a/src/Bridges/SecurityTracy/UserPanel.php +++ b/src/Bridges/SecurityTracy/UserPanel.php @@ -35,6 +35,7 @@ public function __construct(Nette\Security\User $user) public function getTab() { ob_start(); + $user = $this->user; require __DIR__ . '/templates/UserPanel.tab.phtml'; return ob_get_clean(); } @@ -47,6 +48,7 @@ public function getTab() public function getPanel() { ob_start(); + $user = $this->user; require __DIR__ . '/templates/UserPanel.panel.phtml'; return ob_get_clean(); } diff --git a/src/Bridges/SecurityTracy/templates/UserPanel.panel.phtml b/src/Bridges/SecurityTracy/templates/UserPanel.panel.phtml index 758c17ce..daf804f9 100644 --- a/src/Bridges/SecurityTracy/templates/UserPanel.panel.phtml +++ b/src/Bridges/SecurityTracy/templates/UserPanel.panel.phtml @@ -7,7 +7,7 @@ use Nette, ?>
-

user->isLoggedIn()): ?>Logged inUnlogged

+

isLoggedIn()): ?>Logged inUnlogged

- user->getIdentity()): echo Tracy\Dumper::toHtml($this->user->getIdentity()); else: ?>

no identity

+ getIdentity()): echo Tracy\Dumper::toHtml($user->getIdentity()); else: ?>

no identity

diff --git a/src/Bridges/SecurityTracy/templates/UserPanel.tab.phtml b/src/Bridges/SecurityTracy/templates/UserPanel.tab.phtml index 01e00cc5..38a461a1 100644 --- a/src/Bridges/SecurityTracy/templates/UserPanel.tab.phtml +++ b/src/Bridges/SecurityTracy/templates/UserPanel.tab.phtml @@ -5,7 +5,7 @@ namespace Nette\Bridges\SecurityTracy; use Nette; ?> -user->isLoggedIn()): ?> +isLoggedIn()): ?>     From 5b9eac62d672f165ceabd0d48384f38d65dcf8ab Mon Sep 17 00:00:00 2001 From: Petr Kessler Date: Sun, 27 Jul 2014 13:07:30 +0200 Subject: [PATCH 7/9] tests: onLoggedIn & onLoggedOut tests added --- tests/Security/User.authentication.phpt | 27 ++++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/tests/Security/User.authentication.phpt b/tests/Security/User.authentication.phpt index 2e53b840..d945a0d9 100644 --- a/tests/Security/User.authentication.phpt +++ b/tests/Security/User.authentication.phpt @@ -41,19 +41,20 @@ class Authenticator implements IAuthenticator } -function onLoggedIn($user) { - // TODO: add test -} +$user = new Nette\Security\User(new MockUserStorage); +$counter = (object) array( + 'login' => 0, + 'logout' => 0, +); -function onLoggedOut($user) { - // TODO: add test -} +$user->onLoggedIn[] = function () use ($counter) { + $counter->login++; +}; - -$user = new Nette\Security\User(new MockUserStorage); -$user->onLoggedIn[] = 'onLoggedIn'; -$user->onLoggedOut[] = 'onLoggedOut'; +$user->onLoggedOut[] = function () use ($counter) { + $counter->logout++; +}; Assert::false( $user->isLoggedIn() ); @@ -82,13 +83,16 @@ Assert::exception(function() use ($user) { // login as john#2 $user->login('john', 'xxx'); +Assert::same( 1, $counter->login ); Assert::true( $user->isLoggedIn() ); Assert::equal( new Identity('John Doe', 'admin'), $user->getIdentity() ); Assert::same( 'John Doe', $user->getId() ); // login as john#3 $user->logout(TRUE); +Assert::same( 1, $counter->logout ); $user->login( new Identity('John Doe', 'admin') ); +Assert::same( 2, $counter->login ); Assert::true( $user->isLoggedIn() ); Assert::equal( new Identity('John Doe', 'admin'), $user->getIdentity() ); @@ -96,6 +100,7 @@ Assert::equal( new Identity('John Doe', 'admin'), $user->getIdentity() ); // log out // logging out... $user->logout(FALSE); +Assert::same( 2, $counter->logout ); Assert::false( $user->isLoggedIn() ); Assert::equal( new Identity('John Doe', 'admin'), $user->getIdentity() ); @@ -103,6 +108,7 @@ Assert::equal( new Identity('John Doe', 'admin'), $user->getIdentity() ); // logging out and clearing identity... $user->logout(TRUE); +Assert::same( 2, $counter->logout ); // not logged in -> logout event not triggered Assert::false( $user->isLoggedIn() ); Assert::null( $user->getIdentity() ); @@ -111,4 +117,5 @@ Assert::null( $user->getIdentity() ); // namespace // login as john#2? $user->login('john', 'xxx'); +Assert::same( 3, $counter->login ); Assert::true( $user->isLoggedIn() ); From 77a2d9273b29aa404ac00eeca15d5353a0c474d8 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Mon, 27 Oct 2014 01:10:07 +0100 Subject: [PATCH 8/9] UserPanel: is rendered only when headers are not sent [Closes #7] --- src/Bridges/SecurityTracy/UserPanel.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Bridges/SecurityTracy/UserPanel.php b/src/Bridges/SecurityTracy/UserPanel.php index 16512504..2396235c 100644 --- a/src/Bridges/SecurityTracy/UserPanel.php +++ b/src/Bridges/SecurityTracy/UserPanel.php @@ -34,6 +34,10 @@ public function __construct(Nette\Security\User $user) */ public function getTab() { + if (headers_sent()) { + return; + } + ob_start(); $user = $this->user; require __DIR__ . '/templates/UserPanel.tab.phtml'; From 72a0f78fee1a1ff54d233e8a4e8fb2236d68875f Mon Sep 17 00:00:00 2001 From: Smuuf Date: Tue, 28 Oct 2014 14:11:27 +0100 Subject: [PATCH 9/9] Updated/fixed readme.md docs --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index e5ae12fb..a7379c5c 100644 --- a/readme.md +++ b/readme.md @@ -263,11 +263,11 @@ $acl->addRole('administrator', 'registered'); // and administrator inherits from Trivial, isn't it? This ensures all the properties of the parents will be inheritted by their children. -Do note the method `getRoleParents()`, which returns an array of all parent roles, and the method `roleIntheritsFrom()`, which checks whether a role extends another. Their usage: +Do note the method `getRoleParents()`, which returns an array of all direct parent roles, and the method `roleIntheritsFrom()`, which checks whether a role extends another. Their usage: ```php $acl->roleInheritsFrom('administrator', 'guest'); // TRUE -$acl->getRoleParents('administrator'); // array('guest', 'registered') +$acl->getRoleParents('administrator'); // array('registered') - only direct parents ``` Now is the right time to define the set of resources that the users may acccess: