Skip to content

Commit

Permalink
Update packages (#425)
Browse files Browse the repository at this point in the history
 - nette/robot-loader updated from v4.0.2 to v4.0.3 patch
   See changes: nette/robot-loader@v4.0.2...v4.0.3
   Release notes: https://github.com/nette/robot-loader/releases/tag/v4.0.3

 - nette/routing updated from v3.1.0 to v3.1.1 patch
   See changes: nette/routing@v3.1.0...v3.1.1
   Release notes: https://github.com/nette/routing/releases/tag/v3.1.1

 - nette/security updated from v3.2.0 to v3.2.1 patch
   See changes: nette/security@v3.2.0...v3.2.1
   Release notes: https://github.com/nette/security/releases/tag/v3.2.1

 - roave/security-advisories updated from dev-latest@bae581c to dev-latest@e3b44e3
   See changes: Roave/SecurityAdvisories@bae581c...e3b44e3

 - spaze/encryption updated from v2.0.0 to v2.0.1 patch
   See changes: spaze/encryption@v2.0.0...v2.0.1
   Release notes: https://github.com/spaze/encryption/releases/tag/v2.0.1

 - spaze/phpinfo updated from v1.3.0 to v1.3.1 patch
   See changes: spaze/phpinfo@v1.3.0...v1.3.1
   Release notes: https://github.com/spaze/phpinfo/releases/tag/v1.3.1

 - spaze/phpstan-disallowed-calls updated from v3.5.0 to v3.5.1 patch
   See changes: spaze/phpstan-disallowed-calls@v3.5.0...v3.5.1
   Release notes: https://github.com/spaze/phpstan-disallowed-calls/releases/tag/v3.5.1

 - symfony/cache updated from v7.1.5 to v7.1.6 patch
   See changes: symfony/cache@v7.1.5...v7.1.6
   Release notes: https://github.com/symfony/cache/releases/tag/v7.1.6

 - symfony/config updated from v7.1.1 to v7.1.6 patch
   See changes: symfony/config@v7.1.1...v7.1.6
   Release notes: https://github.com/symfony/config/releases/tag/v7.1.6

 - symfony/filesystem updated from v7.1.5 to v7.1.6 patch
   See changes: symfony/filesystem@v7.1.5...v7.1.6
   Release notes: https://github.com/symfony/filesystem/releases/tag/v7.1.6

 - symfony/translation updated from v7.1.5 to v7.1.6 patch
   See changes: symfony/translation@v7.1.5...v7.1.6
   Release notes: https://github.com/symfony/translation/releases/tag/v7.1.6

 - symfony/var-exporter updated from v7.1.2 to v7.1.6 patch
   See changes: symfony/var-exporter@v7.1.2...v7.1.6
   Release notes: https://github.com/symfony/var-exporter/releases/tag/v7.1.6
  • Loading branch information
spaze authored Nov 4, 2024
2 parents e3cb0e5 + f8b06ee commit 86ff72d
Show file tree
Hide file tree
Showing 20 changed files with 239 additions and 228 deletions.
158 changes: 80 additions & 78 deletions app/composer.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions app/src/User/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@ public function __construct(
/**
* Performs an authentication.
*
* @param string $user
* @param string $username
* @param string $password
* @return IIdentity
* @throws AuthenticationException
*/
#[Override]
public function authenticate(string $user, string $password): IIdentity
public function authenticate(string $username, string $password): IIdentity
{
$userId = $this->verifyPassword($user, $password);
return $this->getIdentity($userId, $user);
$userId = $this->verifyPassword($username, $password);
return $this->getIdentity($userId, $username);
}


Expand Down
180 changes: 91 additions & 89 deletions app/vendor/composer/installed.json

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions app/vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,18 +215,18 @@
'dev_requirement' => false,
),
'nette/robot-loader' => array(
'pretty_version' => 'v4.0.2',
'version' => '4.0.2.0',
'reference' => '6a921e88345fc7263b89ed878c927efc7c5e6092',
'pretty_version' => 'v4.0.3',
'version' => '4.0.3.0',
'reference' => '45d67753fb4865bb718e9a6c9be69cc9470137b7',
'type' => 'library',
'install_path' => __DIR__ . '/../nette/robot-loader',
'aliases' => array(),
'dev_requirement' => false,
),
'nette/routing' => array(
'pretty_version' => 'v3.1.0',
'version' => '3.1.0.0',
'reference' => 'f7419bc147164106cb03b3d331c85aff6cb81fc3',
'pretty_version' => 'v3.1.1',
'version' => '3.1.1.0',
'reference' => '5b0782d3b50af68614253a373fa663ed03206a3f',
'type' => 'library',
'install_path' => __DIR__ . '/../nette/routing',
'aliases' => array(),
Expand All @@ -242,9 +242,9 @@
'dev_requirement' => false,
),
'nette/security' => array(
'pretty_version' => 'v3.2.0',
'version' => '3.2.0.0',
'reference' => 'fe89d52697036fb2e14835dfb46b696d28a9ebf6',
'pretty_version' => 'v3.2.1',
'version' => '3.2.1.0',
'reference' => '6e19bf604934aec0cd3343a307e28fd997e40e96',
'type' => 'library',
'install_path' => __DIR__ . '/../nette/security',
'aliases' => array(),
Expand Down Expand Up @@ -421,7 +421,7 @@
'roave/security-advisories' => array(
'pretty_version' => 'dev-latest',
'version' => 'dev-latest',
'reference' => 'bae581ca4125f92b1ad4d316ac691fa2d5231649',
'reference' => 'e3b44e38648ef5386687032582759f9c616c8d19',
'type' => 'metapackage',
'install_path' => null,
'aliases' => array(
Expand Down Expand Up @@ -466,9 +466,9 @@
'dev_requirement' => false,
),
'spaze/encryption' => array(
'pretty_version' => 'v2.0.0',
'version' => '2.0.0.0',
'reference' => 'ad1dceb2e059cb78d3c3c2c93ec051ca3aa1854a',
'pretty_version' => 'v2.0.1',
'version' => '2.0.1.0',
'reference' => '095408b042ba902eca3ba5e20da6cc9167e239e7',
'type' => 'library',
'install_path' => __DIR__ . '/../spaze/encryption',
'aliases' => array(),
Expand Down Expand Up @@ -520,18 +520,18 @@
'dev_requirement' => true,
),
'spaze/phpinfo' => array(
'pretty_version' => 'v1.3.0',
'version' => '1.3.0.0',
'reference' => 'f8e76c39a01b15128c010541d16fb9972f0f26f9',
'pretty_version' => 'v1.3.1',
'version' => '1.3.1.0',
'reference' => 'e09eb50e1b36968efe083c445cb6ef64093de061',
'type' => 'library',
'install_path' => __DIR__ . '/../spaze/phpinfo',
'aliases' => array(),
'dev_requirement' => false,
),
'spaze/phpstan-disallowed-calls' => array(
'pretty_version' => 'v3.5.0',
'version' => '3.5.0.0',
'reference' => 'ad538e67295d21e42b74e8cae0a5b2630fa17356',
'pretty_version' => 'v3.5.1',
'version' => '3.5.1.0',
'reference' => 'ed12b333bacdff9fdde19957e135ba93e7d252ec',
'type' => 'phpstan-extension',
'install_path' => __DIR__ . '/../spaze/phpstan-disallowed-calls',
'aliases' => array(),
Expand Down Expand Up @@ -571,9 +571,9 @@
),
),
'symfony/cache' => array(
'pretty_version' => 'v7.1.5',
'version' => '7.1.5.0',
'reference' => '86e5296b10e4dec8c8441056ca606aedb8a3be0a',
'pretty_version' => 'v7.1.6',
'version' => '7.1.6.0',
'reference' => '567ef6de47fdcba56eb6c0b344b857d1fce1cce0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/cache',
'aliases' => array(),
Expand All @@ -595,9 +595,9 @@
),
),
'symfony/config' => array(
'pretty_version' => 'v7.1.1',
'version' => '7.1.1.0',
'reference' => '2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2',
'pretty_version' => 'v7.1.6',
'version' => '7.1.6.0',
'reference' => '5c6152766251ff45a44b76affadd5287e253fb27',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/config',
'aliases' => array(),
Expand All @@ -613,9 +613,9 @@
'dev_requirement' => false,
),
'symfony/filesystem' => array(
'pretty_version' => 'v7.1.5',
'version' => '7.1.5.0',
'reference' => '61fe0566189bf32e8cfee78335d8776f64a66f5a',
'pretty_version' => 'v7.1.6',
'version' => '7.1.6.0',
'reference' => 'c835867b3c62bb05c7fe3d637c871c7ae52024d4',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/filesystem',
'aliases' => array(),
Expand Down Expand Up @@ -643,9 +643,9 @@
'dev_requirement' => false,
),
'symfony/translation' => array(
'pretty_version' => 'v7.1.5',
'version' => '7.1.5.0',
'reference' => '235535e3f84f3dfbdbde0208ede6ca75c3a489ea',
'pretty_version' => 'v7.1.6',
'version' => '7.1.6.0',
'reference' => 'b9f72ab14efdb6b772f85041fa12f820dee8d55f',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/translation',
'aliases' => array(),
Expand All @@ -667,9 +667,9 @@
),
),
'symfony/var-exporter' => array(
'pretty_version' => 'v7.1.2',
'version' => '7.1.2.0',
'reference' => 'b80a669a2264609f07f1667f891dbfca25eba44c',
'pretty_version' => 'v7.1.6',
'version' => '7.1.6.0',
'reference' => '90173ef89c40e7c8c616653241048705f84130ef',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/var-exporter',
'aliases' => array(),
Expand Down
2 changes: 1 addition & 1 deletion app/vendor/nette/robot-loader/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "8.0 - 8.3",
"php": "8.0 - 8.4",
"ext-tokenizer": "*",
"nette/utils": "^4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion app/vendor/nette/robot-loader/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ If you're building an application using [Composer](https://doc.nette.org/en/best
composer require nette/robot-loader
```

It requires PHP version 8.0 and supports PHP up to 8.3.
It requires PHP version 8.0 and supports PHP up to 8.4.

 <!---->

Expand Down
2 changes: 1 addition & 1 deletion app/vendor/nette/routing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "8.1 - 8.3",
"php": "8.1 - 8.4",
"nette/http": "^3.2 || ~4.0.0",
"nette/utils": "^4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion app/vendor/nette/routing/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The router is responsible for everything about URLs so that you no longer have t
- a few notes about SEO redirection
- and we'll show you how to write your own router

It requires PHP version 8.1 and supports PHP up to 8.3.
It requires PHP version 8.1 and supports PHP up to 8.4.

Documentation can be found on the [website](https://doc.nette.org/routing).

Expand Down
7 changes: 6 additions & 1 deletion app/vendor/nette/routing/src/Routing/Route.php
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,11 @@ private static function renameKeys(array $arr, array $xlat): array
*/
public static function param2path(string $s): string
{
return str_replace('%2F', '/', rawurlencode($s));
// segment + "/", see https://datatracker.ietf.org/doc/html/rfc3986#appendix-A
return preg_replace_callback(
'#[^\w.~!$&\'()*+,;=:@"/-]#',
fn($m) => rawurlencode($m[0]),
$s,
);
}
}
2 changes: 1 addition & 1 deletion app/vendor/nette/security/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "8.1 - 8.3",
"php": "8.1 - 8.4",
"nette/utils": "^4.0"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion app/vendor/nette/security/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Authentication & Authorization library for Nette.

Documentation can be found on the [website](https://doc.nette.org/access-control).

It requires PHP version 8.1 and supports PHP up to 8.3.
It requires PHP version 8.1 and supports PHP up to 8.4.


[Support Me](https://github.com/sponsors/dg)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ public function getConfigSchema(): Nette\Schema\Schema
'debugger' => Expect::bool(),
'users' => Expect::arrayOf(
Expect::anyOf(
Expect::string(), // user => password
Expect::string()->dynamic(), // user => password
Expect::structure([ // user => password + roles + data
'password' => Expect::string(),
'password' => Expect::string()->dynamic(),
'roles' => Expect::anyOf(Expect::string(), Expect::listOf('string')),
'data' => Expect::array(),
])->castTo('array'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ protected function getSessionSection(): ?SessionSection
}
}

$section->set('expireTime', time() + $section->expireDelta); // sliding expiration
$section->set('expireTime', time() + $section->get('expireDelta')); // sliding expiration
}

if (!$section->get('authenticated')) {
Expand Down
2 changes: 1 addition & 1 deletion app/vendor/nette/security/src/Security/Authenticator.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ interface Authenticator extends IAuthenticator
* Performs an authentication.
* @throws AuthenticationException
*/
function authenticate(string $user, string $password): IIdentity;
function authenticate(string $username, string $password): IIdentity;
}
2 changes: 1 addition & 1 deletion app/vendor/nette/security/src/Security/Permission.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Permission implements Authorizator
* @throws Nette\InvalidArgumentException
* @throws Nette\InvalidStateException
*/
public function addRole(string $role, string|array $parents = null): static
public function addRole(string $role, string|array|null $parents = null): static
{
$this->checkRole($role, exists: false);
if (isset($this->roles[$role])) {
Expand Down
12 changes: 6 additions & 6 deletions app/vendor/nette/security/src/Security/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ class User
/** default role for authenticated user without own identity */
public string $authenticatedRole = 'authenticated';

/** @var callable[] function (User $sender): void; Occurs when the user is successfully logged in */
/** @var array<callable(self): void> Occurs when the user is successfully logged in */
public array $onLoggedIn = [];

/** @var callable[] function (User $sender): void; Occurs when the user is logged out */
/** @var array<callable(self): void> Occurs when the user is logged out */
public array $onLoggedOut = [];

private ?IIdentity $identity = null;
Expand All @@ -81,18 +81,18 @@ final public function getStorage(): UserStorage

/**
* Conducts the authentication process. Parameters are optional.
* @param string|IIdentity $user name or Identity
* @param string|IIdentity $username name or Identity
* @throws AuthenticationException if authentication was not successful
*/
public function login(
string|IIdentity $user,
string|IIdentity $username,
#[\SensitiveParameter]
?string $password = null,
): void
{
$this->logout(true);
if ($user instanceof IIdentity) {
$this->identity = $user;
if ($username instanceof IIdentity) {
$this->identity = $username;
} else {
$authenticator = $this->getAuthenticator();
$this->identity = $authenticator instanceof Authenticator
Expand Down
4 changes: 2 additions & 2 deletions app/vendor/symfony/cache/Traits/RedisTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,10 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
} else {
$extra = $passAuth ? [$params['auth']] : [];

$sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
$sentinel = @new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
}

if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
if ($address = @$sentinel->getMasterAddrByName($params['redis_sentinel'])) {
[$host, $port] = $address;
}
} catch (\RedisException|\Relay\Exception $redisException) {
Expand Down
2 changes: 1 addition & 1 deletion app/vendor/symfony/config/FileLocator.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private function isAbsolutePath(string $file): bool
&& ':' === $file[1]
&& ('\\' === $file[2] || '/' === $file[2])
)
|| null !== parse_url($file, \PHP_URL_SCHEME)
|| parse_url($file, \PHP_URL_SCHEME)
) {
return true;
}
Expand Down
4 changes: 3 additions & 1 deletion app/vendor/symfony/filesystem/Filesystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function copy(string $originFile, string $targetFile, bool $overwriteNewe
$this->mkdir(\dirname($targetFile));

$doCopy = true;
if (!$overwriteNewerFiles && null === parse_url($originFile, \PHP_URL_HOST) && is_file($targetFile)) {
if (!$overwriteNewerFiles && !parse_url($originFile, \PHP_URL_HOST) && is_file($targetFile)) {
$doCopy = filemtime($originFile) > filemtime($targetFile);
}

Expand Down Expand Up @@ -224,6 +224,7 @@ public function chmod(string|iterable $files, int $mode, int $umask = 0000, bool
* Change the owner of an array of files or directories.
*
* This method always throws on Windows, as the underlying PHP function is not supported.
*
* @see https://www.php.net/chown
*
* @param string|int $user A user name or number
Expand Down Expand Up @@ -253,6 +254,7 @@ public function chown(string|iterable $files, string|int $user, bool $recursive
* Change the group of an array of files or directories.
*
* This method always throws on Windows, as the underlying PHP function is not supported.
*
* @see https://www.php.net/chgrp
*
* @param string|int $group A group name or number
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function leaveNode(Node $node): ?Node
if ('trans' === $name || 't' === $name) {
$firstNamedArgumentIndex = $this->nodeFirstNamedArgumentIndex($node);

if (!$messages = $this->getStringArguments($node, 0 < $firstNamedArgumentIndex ? 0 : 'message')) {
if (!$messages = $this->getStringArguments($node, 0 < $firstNamedArgumentIndex ? 0 : 'id')) {
return null;
}

Expand Down

0 comments on commit 86ff72d

Please sign in to comment.