coding style

Author: dg

src/Bridges/SecurityDI/SecurityExtension.php

@@ -40,8 +40,8 @@ public function getConfigSchema(): Nette\Schema\Schema
 						'password' => Expect::string(),
 						'roles' => Expect::anyOf(Expect::string(), Expect::listOf('string')),
 						'data' => Expect::array(),
-					])->castTo('array')
-				)
+					])->castTo('array'),
+				),
 			),
 			'roles' => Expect::arrayOf('string|array|null'), // role => parent(s)
 			'resources' => Expect::arrayOf('string|null'), // resource => parent

src/Bridges/SecurityHttp/CookieStorage.php

@@ -64,11 +64,8 @@ public function saveAuthentication(IIdentity $identity): void
 			$this->cookieName,
 			$uid,
 			$this->cookieExpiration,
-			null,
-			$this->cookieDomain,
-			null,
-			true,
-			$this->cookieSameSite
+			domain: $this->cookieDomain,
+			sameSite: $this->cookieSameSite,
 		);
 	}
 
@@ -78,8 +75,7 @@ public function clearAuthentication(bool $clearIdentity): void
 		$this->uid = '';
 		$this->response->deleteCookie(
 			$this->cookieName,
-			null,
-			$this->cookieDomain
+			domain: $this->cookieDomain,
 		);
 	}
 
@@ -106,7 +102,7 @@ public function setExpiration(?string $expire, bool $clearIdentity): void
 	public function setCookieParameters(
 		?string $name = null,
 		?string $domain = null,
-		?string $sameSite = null
+		?string $sameSite = null,
 	) {
 		$this->cookieName = $name ?? $this->cookieName;
 		$this->cookieDomain = $domain ?? $this->cookieDomain;

src/Security/Permission.php

@@ -391,7 +391,7 @@ public function allow(
 		$roles = self::ALL,
 		$resources = self::ALL,
 		$privileges = self::ALL,
-		?callable $assertion = null
+		?callable $assertion = null,
 	) {
 		$this->setRule(true, self::ALLOW, $roles, $resources, $privileges, $assertion);
 		return $this;
@@ -411,7 +411,7 @@ public function deny(
 		$roles = self::ALL,
 		$resources = self::ALL,
 		$privileges = self::ALL,
-		?callable $assertion = null
+		?callable $assertion = null,
 	) {
 		$this->setRule(true, self::DENY, $roles, $resources, $privileges, $assertion);
 		return $this;

src/Security/User.php

@@ -73,7 +73,7 @@ public function __construct(
 		?IUserStorage $legacyStorage = null,
 		?IAuthenticator $authenticator = null,
 		?Authorizator $authorizator = null,
-		?UserStorage $storage = null
+		?UserStorage $storage = null,
 	) {
 		$this->storage = $storage ?? $legacyStorage; // back compatibility
 		if (!$this->storage) {

tests/Security.Http/CookieStorage.getState.phpt

@@ -15,18 +15,18 @@ $storage = new CookieStorage($request, $response);
 Assert::same([false, null, null], $storage->getState());
 
 // short id
-$request = new Nette\Http\Request(new Nette\Http\UrlScript, [], [], ['userid' => 'short']);
+$request = new Nette\Http\Request(new Nette\Http\UrlScript, cookies: ['userid' => 'short']);
 $storage = new CookieStorage($request, $response);
 Assert::same([false, null, null], $storage->getState());
 
 // correct id
 $id = '123456789123456';
-$request = new Nette\Http\Request(new Nette\Http\UrlScript, [], [], ['userid' => $id]);
+$request = new Nette\Http\Request(new Nette\Http\UrlScript, cookies: ['userid' => $id]);
 $storage = new CookieStorage($request, $response);
 Assert::equal([true, new SimpleIdentity($id), null], $storage->getState());
 
 // custom cookie
-$request = new Nette\Http\Request(new Nette\Http\UrlScript, [], [], ['foo' => $id]);
+$request = new Nette\Http\Request(new Nette\Http\UrlScript, cookies: ['foo' => $id]);
 $storage = new CookieStorage($request, $response);
 $storage->setCookieParameters('foo');
 Assert::equal([true, new SimpleIdentity($id), null], $storage->getState());

tests/Security/Passwords.hash().phpt

@@ -14,11 +14,11 @@ require __DIR__ . '/../bootstrap.php';
 
 
 Assert::truthy(
-	preg_match('#^\$.{50,}\z#', (new Passwords)->hash('my-password'))
+	preg_match('#^\$.{50,}\z#', (new Passwords)->hash('my-password')),
 );
 
 Assert::truthy(
-	preg_match('#^\$2y\$05\$.{53}\z#', (new Passwords(PASSWORD_BCRYPT, ['cost' => 5]))->hash('dg'))
+	preg_match('#^\$2y\$05\$.{53}\z#', (new Passwords(PASSWORD_BCRYPT, ['cost' => 5]))->hash('dg')),
 );
 
 $hash = (new Passwords(PASSWORD_BCRYPT))->hash('dg');

tests/Security/User.authorization.phpt

@@ -42,7 +42,7 @@ class Authorizator implements Nette\Security\Authorizator
 {
 	public function isAllowed($role = self::ALL, $resource = self::ALL, $privilege = self::ALL): bool
 	{
-		return $role === 'admin' && strpos($resource, 'jany') === false;
+		return $role === 'admin' && !str_contains($resource, 'jany');
 	}
 }