coding style: reformatted Assert::exception

dg · dg · commit e5abe4d83479 · 2023-10-18T19:05:57.000+02:00
diff --git a/tests/Security.Http/CookieStorage.authentication.phpt b/tests/Security.Http/CookieStorage.authentication.phpt
@@ -12,9 +12,10 @@ require __DIR__ . '/../bootstrap.php';
 $request = new Nette\Http\Request(new Nette\Http\UrlScript);
 $response = Mockery::mock(Nette\Http\IResponse::class);
 $storage = new CookieStorage($request, $response);
-Assert::exception(function () use ($storage) {
-	$storage->saveAuthentication(new SimpleIdentity('short'));
-}, LogicException::class);
+Assert::exception(
+	fn() => $storage->saveAuthentication(new SimpleIdentity('short')),
+	LogicException::class,
+);
 
 // correct id
 $id = '123456789123456';
diff --git a/tests/Security/Passwords.hash().phpt b/tests/Security/Passwords.hash().phpt
@@ -24,10 +24,13 @@ Assert::truthy(
 $hash = (new Passwords(PASSWORD_BCRYPT))->hash('dg');
 Assert::same($hash, crypt('dg', $hash));
 
-Assert::exception(function () {
-	(new Passwords(PASSWORD_BCRYPT, ['cost' => 3]))->hash('dg');
-}, PHP_VERSION_ID < 80000 ? Nette\InvalidStateException::class : ValueError::class);
+Assert::exception(
+	fn() => (new Passwords(PASSWORD_BCRYPT, ['cost' => 3]))->hash('dg'),
+	PHP_VERSION_ID < 80000 ? Nette\InvalidStateException::class : ValueError::class,
+);
 
-Assert::exception(function () {
-	(new Passwords)->hash('');
-}, Nette\InvalidArgumentException::class, 'Password can not be empty.');
+Assert::exception(
+	fn() => (new Passwords)->hash(''),
+	Nette\InvalidArgumentException::class,
+	'Password can not be empty.',
+);
diff --git a/tests/Security/Permission.IsAllowedNonExistent.phpt b/tests/Security/Permission.IsAllowedNonExistent.phpt
@@ -13,12 +13,16 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::exception(function () {
-	$acl = new Permission;
-	$acl->isAllowed('nonexistent');
-}, Nette\InvalidStateException::class, "Role 'nonexistent' does not exist.");
-
-Assert::exception(function () {
-	$acl = new Permission;
-	$acl->isAllowed(null, 'nonexistent');
-}, Nette\InvalidStateException::class, "Resource 'nonexistent' does not exist.");
+$acl = new Permission;
+Assert::exception(
+	fn() => $acl->isAllowed('nonexistent'),
+	Nette\InvalidStateException::class,
+	"Role 'nonexistent' does not exist.",
+);
+
+$acl = new Permission;
+Assert::exception(
+	fn() => $acl->isAllowed(null, 'nonexistent'),
+	Nette\InvalidStateException::class,
+	"Resource 'nonexistent' does not exist.",
+);
diff --git a/tests/Security/Permission.ResourceAddInheritsNonExistent.phpt b/tests/Security/Permission.ResourceAddInheritsNonExistent.phpt
@@ -14,6 +14,8 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $acl = new Permission;
-Assert::exception(function () use ($acl) {
-	$acl->addResource('area', 'nonexistent');
-}, Nette\InvalidStateException::class, "Resource 'nonexistent' does not exist.");
+Assert::exception(
+	fn() => $acl->addResource('area', 'nonexistent'),
+	Nette\InvalidStateException::class,
+	"Resource 'nonexistent' does not exist.",
+);
diff --git a/tests/Security/Permission.ResourceDuplicate.phpt b/tests/Security/Permission.ResourceDuplicate.phpt
@@ -13,8 +13,10 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::exception(function () {
-	$acl = new Permission;
-	$acl->addResource('area');
-	$acl->addResource('area');
-}, Nette\InvalidStateException::class, "Resource 'area' already exists in the list.");
+$acl = new Permission;
+$acl->addResource('area');
+Assert::exception(
+	fn() => $acl->addResource('area'),
+	Nette\InvalidStateException::class,
+	"Resource 'area' already exists in the list.",
+);
diff --git a/tests/Security/Permission.ResourceInheritsNonExistent.phpt b/tests/Security/Permission.ResourceInheritsNonExistent.phpt
@@ -15,10 +15,14 @@ require __DIR__ . '/../bootstrap.php';
 
 $acl = new Permission;
 $acl->addResource('area');
-Assert::exception(function () use ($acl) {
-	$acl->resourceInheritsFrom('nonexistent', 'area');
-}, Nette\InvalidStateException::class, "Resource 'nonexistent' does not exist.");
-
-Assert::exception(function () use ($acl) {
-	$acl->resourceInheritsFrom('area', 'nonexistent');
-}, Nette\InvalidStateException::class, "Resource 'nonexistent' does not exist.");
+Assert::exception(
+	fn() => $acl->resourceInheritsFrom('nonexistent', 'area'),
+	Nette\InvalidStateException::class,
+	"Resource 'nonexistent' does not exist.",
+);
+
+Assert::exception(
+	fn() => $acl->resourceInheritsFrom('area', 'nonexistent'),
+	Nette\InvalidStateException::class,
+	"Resource 'nonexistent' does not exist.",
+);
diff --git a/tests/Security/Permission.ResourceRemoveOneNonExistent.phpt b/tests/Security/Permission.ResourceRemoveOneNonExistent.phpt
@@ -14,6 +14,8 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $acl = new Permission;
-Assert::exception(function () use ($acl) {
-	$acl->removeResource('nonexistent');
-}, Nette\InvalidStateException::class, "Resource 'nonexistent' does not exist.");
+Assert::exception(
+	fn() => $acl->removeResource('nonexistent'),
+	Nette\InvalidStateException::class,
+	"Resource 'nonexistent' does not exist.",
+);
diff --git a/tests/Security/Permission.RoleRegistryAddInheritsNonExistent.phpt b/tests/Security/Permission.RoleRegistryAddInheritsNonExistent.phpt
@@ -14,6 +14,8 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $acl = new Permission;
-Assert::exception(function () use ($acl) {
-	$acl->addRole('guest', 'nonexistent');
-}, Nette\InvalidStateException::class, "Role 'nonexistent' does not exist.");
+Assert::exception(
+	fn() => $acl->addRole('guest', 'nonexistent'),
+	Nette\InvalidStateException::class,
+	"Role 'nonexistent' does not exist.",
+);
diff --git a/tests/Security/Permission.RoleRegistryDuplicate.phpt b/tests/Security/Permission.RoleRegistryDuplicate.phpt
@@ -14,7 +14,9 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $acl = new Permission;
-Assert::exception(function () use ($acl) {
-	$acl->addRole('guest');
-	$acl->addRole('guest');
-}, Nette\InvalidStateException::class, "Role 'guest' already exists in the list.");
+$acl->addRole('guest');
+Assert::exception(
+	fn() => $acl->addRole('guest'),
+	Nette\InvalidStateException::class,
+	"Role 'guest' already exists in the list.",
+);
diff --git a/tests/Security/Permission.RoleRegistryInheritsNonExistent.phpt b/tests/Security/Permission.RoleRegistryInheritsNonExistent.phpt
@@ -15,10 +15,14 @@ require __DIR__ . '/../bootstrap.php';
 
 $acl = new Permission;
 $acl->addRole('guest');
-Assert::exception(function () use ($acl) {
-	$acl->roleInheritsFrom('nonexistent', 'guest');
-}, Nette\InvalidStateException::class, "Role 'nonexistent' does not exist.");
-
-Assert::exception(function () use ($acl) {
-	$acl->roleInheritsFrom('guest', 'nonexistent');
-}, Nette\InvalidStateException::class, "Role 'nonexistent' does not exist.");
+Assert::exception(
+	fn() => $acl->roleInheritsFrom('nonexistent', 'guest'),
+	Nette\InvalidStateException::class,
+	"Role 'nonexistent' does not exist.",
+);
+
+Assert::exception(
+	fn() => $acl->roleInheritsFrom('guest', 'nonexistent'),
+	Nette\InvalidStateException::class,
+	"Role 'nonexistent' does not exist.",
+);
diff --git a/tests/Security/Permission.RoleRegistryRemoveOneNonExistent.phpt b/tests/Security/Permission.RoleRegistryRemoveOneNonExistent.phpt
@@ -14,6 +14,8 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $acl = new Permission;
-Assert::exception(function () use ($acl) {
-	$acl->removeRole('nonexistent');
-}, Nette\InvalidStateException::class, "Role 'nonexistent' does not exist.");
+Assert::exception(
+	fn() => $acl->removeRole('nonexistent'),
+	Nette\InvalidStateException::class,
+	"Role 'nonexistent' does not exist.",
+);
diff --git a/tests/Security/Permission.RuleRoleRemove.phpt b/tests/Security/Permission.RuleRoleRemove.phpt
@@ -18,9 +18,11 @@ $acl->addRole('guest');
 $acl->allow('guest');
 Assert::true($acl->isAllowed('guest'));
 $acl->removeRole('guest');
-Assert::exception(function () use ($acl) {
-	$acl->isAllowed('guest');
-}, Nette\InvalidStateException::class, "Role 'guest' does not exist.");
+Assert::exception(
+	fn() => $acl->isAllowed('guest'),
+	Nette\InvalidStateException::class,
+	"Role 'guest' does not exist.",
+);
 
 $acl->addRole('guest');
 Assert::false($acl->isAllowed('guest'));
diff --git a/tests/Security/Permission.RuleRoleRemoveAll.phpt b/tests/Security/Permission.RuleRoleRemoveAll.phpt
@@ -18,9 +18,11 @@ $acl->addRole('guest');
 $acl->allow('guest');
 Assert::true($acl->isAllowed('guest'));
 $acl->removeAllRoles();
-Assert::exception(function () use ($acl) {
-	$acl->isAllowed('guest');
-}, Nette\InvalidStateException::class, "Role 'guest' does not exist.");
+Assert::exception(
+	fn() => $acl->isAllowed('guest'),
+	Nette\InvalidStateException::class,
+	"Role 'guest' does not exist.",
+);
 
 $acl->addRole('guest');
 Assert::false($acl->isAllowed('guest'));
diff --git a/tests/Security/Permission.RulesResourceRemove.phpt b/tests/Security/Permission.RulesResourceRemove.phpt
@@ -18,9 +18,11 @@ $acl->addResource('area');
 $acl->allow(null, 'area');
 Assert::true($acl->isAllowed(null, 'area'));
 $acl->removeResource('area');
-Assert::exception(function () use ($acl) {
-	$acl->isAllowed(null, 'area');
-}, Nette\InvalidStateException::class, "Resource 'area' does not exist.");
+Assert::exception(
+	fn() => $acl->isAllowed(null, 'area'),
+	Nette\InvalidStateException::class,
+	"Resource 'area' does not exist.",
+);
 
 $acl->addResource('area');
 Assert::false($acl->isAllowed(null, 'area'));
diff --git a/tests/Security/Permission.RulesResourceRemoveAll.phpt b/tests/Security/Permission.RulesResourceRemoveAll.phpt
@@ -18,9 +18,11 @@ $acl->addResource('area');
 $acl->allow(null, 'area');
 Assert::true($acl->isAllowed(null, 'area'));
 $acl->removeAllResources();
-Assert::exception(function () use ($acl) {
-	$acl->isAllowed(null, 'area');
-}, Nette\InvalidStateException::class, "Resource 'area' does not exist.");
+Assert::exception(
+	fn() => $acl->isAllowed(null, 'area'),
+	Nette\InvalidStateException::class,
+	"Resource 'area' does not exist.",
+);
 
 $acl->addResource('area');
 Assert::false($acl->isAllowed(null, 'area'));
diff --git a/tests/Security/SimpleAuthenticator.phpt b/tests/Security/SimpleAuthenticator.phpt
@@ -28,10 +28,14 @@ $identity = $authenticator->authenticate('admin', 'admin');
 Assert::type(Nette\Security\IIdentity::class, $identity);
 Assert::equal('admin', $identity->getId());
 
-Assert::exception(function () use ($authenticator) {
-	$authenticator->authenticate('admin', 'wrong password');
-}, Nette\Security\AuthenticationException::class, 'Invalid password.');
-
-Assert::exception(function () use ($authenticator) {
-	$authenticator->authenticate('nobody', 'password');
-}, Nette\Security\AuthenticationException::class, "User 'nobody' not found.");
+Assert::exception(
+	fn() => $authenticator->authenticate('admin', 'wrong password'),
+	Nette\Security\AuthenticationException::class,
+	'Invalid password.',
+);
+
+Assert::exception(
+	fn() => $authenticator->authenticate('nobody', 'password'),
+	Nette\Security\AuthenticationException::class,
+	"User 'nobody' not found.",
+);
diff --git a/tests/Security/User.authentication.phpt b/tests/Security/User.authentication.phpt
@@ -58,23 +58,26 @@ Assert::null($user->getId());
 
 
 // authenticate
-Assert::exception(function () use ($user) {
-	// login without handler
-	$user->login('jane', '');
-}, Nette\InvalidStateException::class, 'Authenticator has not been set.');
+Assert::exception(
+	fn() => $user->login('jane', ''),
+	Nette\InvalidStateException::class,
+	'Authenticator has not been set.',
+);
 
 $handler = new Authenticator;
 $user->setAuthenticator($handler);
 
-Assert::exception(function () use ($user) {
-	// login as jane
-	$user->login('jane', '');
-}, Nette\Security\AuthenticationException::class, 'Unknown user');
-
-Assert::exception(function () use ($user) {
-	// login as john
-	$user->login('john', '');
-}, Nette\Security\AuthenticationException::class, 'Password not match');
+Assert::exception(
+	fn() => $user->login('jane', ''),
+	Nette\Security\AuthenticationException::class,
+	'Unknown user',
+);
+
+Assert::exception(
+	fn() => $user->login('john', ''),
+	Nette\Security\AuthenticationException::class,
+	'Password not match',
+);
 
 // login as john#2
 $user->login('john', 'xxx');
diff --git a/tests/Security/User.authorization.phpt b/tests/Security/User.authorization.phpt
@@ -81,9 +81,11 @@ Assert::false($user->isInRole('guest'));
 
 
 // authorization
-Assert::exception(function () use ($user) {
-	$user->isAllowed('delete_file');
-}, Nette\InvalidStateException::class, 'Authorizator has not been set.');
+Assert::exception(
+	fn() => $user->isAllowed('delete_file'),
+	Nette\InvalidStateException::class,
+	'Authorizator has not been set.',
+);
 
 $handler = new Authorizator;
 $user->setAuthorizator($handler);
