From fb878f228d11f945345b99bf82a7eef9dd4d1ae7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 21 Sep 2023 09:44:10 +0200 Subject: [PATCH] Update composer dependencies --- .../files/lib/system/api/composer.lock | 18 ++++++++--------- .../lib/system/api/composer/installed.json | 20 +++++++++---------- .../lib/system/api/composer/installed.php | 6 +++--- .../api/laminas/laminas-stdlib/composer.json | 8 ++++---- .../laminas-stdlib/src/AbstractOptions.php | 20 ++++++++++++------- .../laminas/laminas-stdlib/src/ArrayUtils.php | 4 ++++ .../src/ParameterObjectInterface.php | 15 +++++++++----- 7 files changed, 53 insertions(+), 38 deletions(-) diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock index 055b83e2a4..eb5fbfa863 100644 --- a/wcfsetup/install/files/lib/system/api/composer.lock +++ b/wcfsetup/install/files/lib/system/api/composer.lock @@ -791,30 +791,30 @@ }, { "name": "laminas/laminas-stdlib", - "version": "3.17.0", + "version": "3.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "dd35c868075bad80b6718959740913e178eb4274" + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/dd35c868075bad80b6718959740913e178eb4274", - "reference": "dd35c868075bad80b6718959740913e178eb4274", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-stdlib": "*" }, "require-dev": { "laminas/laminas-coding-standard": "^2.5", - "phpbench/phpbench": "^1.2.9", - "phpunit/phpunit": "^10.0.16", + "phpbench/phpbench": "^1.2.14", + "phpunit/phpunit": "^10.3.3", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.8" + "vimeo/psalm": "^5.15.0" }, "type": "library", "autoload": { @@ -846,7 +846,7 @@ "type": "community_bridge" } ], - "time": "2023-03-20T13:51:37+00:00" + "time": "2023-09-19T10:15:21+00:00" }, { "name": "paragonie/constant_time_encoding", diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json index 407f324681..a52b927a87 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.json +++ b/wcfsetup/install/files/lib/system/api/composer/installed.json @@ -815,33 +815,33 @@ }, { "name": "laminas/laminas-stdlib", - "version": "3.17.0", - "version_normalized": "3.17.0.0", + "version": "3.18.0", + "version_normalized": "3.18.0.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "dd35c868075bad80b6718959740913e178eb4274" + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/dd35c868075bad80b6718959740913e178eb4274", - "reference": "dd35c868075bad80b6718959740913e178eb4274", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-stdlib": "*" }, "require-dev": { "laminas/laminas-coding-standard": "^2.5", - "phpbench/phpbench": "^1.2.9", - "phpunit/phpunit": "^10.0.16", + "phpbench/phpbench": "^1.2.14", + "phpunit/phpunit": "^10.3.3", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.8" + "vimeo/psalm": "^5.15.0" }, - "time": "2023-03-20T13:51:37+00:00", + "time": "2023-09-19T10:15:21+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php index a1e2944f9f..95ab7dd1e5 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.php +++ b/wcfsetup/install/files/lib/system/api/composer/installed.php @@ -110,9 +110,9 @@ 'dev_requirement' => false, ), 'laminas/laminas-stdlib' => array( - 'pretty_version' => '3.17.0', - 'version' => '3.17.0.0', - 'reference' => 'dd35c868075bad80b6718959740913e178eb4274', + 'pretty_version' => '3.18.0', + 'version' => '3.18.0.0', + 'reference' => 'e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf', 'type' => 'library', 'install_path' => __DIR__ . '/../laminas/laminas-stdlib', 'aliases' => array(), diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/composer.json b/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/composer.json index 6b487a42c0..974e19d982 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/composer.json +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/composer.json @@ -27,14 +27,14 @@ "extra": { }, "require": { - "php": "~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { "laminas/laminas-coding-standard": "^2.5", - "phpbench/phpbench": "^1.2.9", - "phpunit/phpunit": "^10.0.16", + "phpbench/phpbench": "^1.2.14", + "phpunit/phpunit": "^10.3.3", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.8" + "vimeo/psalm": "^5.15.0" }, "autoload": { "psr-4": { diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/AbstractOptions.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/AbstractOptions.php index d02221ab16..5db2ea95bd 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/AbstractOptions.php +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/AbstractOptions.php @@ -7,6 +7,7 @@ namespace Laminas\Stdlib; use Traversable; use function array_shift; +use function get_object_vars; use function is_array; use function is_callable; use function method_exists; @@ -16,6 +17,10 @@ use function str_replace; use function strtolower; use function ucwords; +/** + * @template TValue + * @implements ParameterObjectInterface + */ abstract class AbstractOptions implements ParameterObjectInterface { // phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore,WebimpressCodingStandard.NamingConventions.ValidVariableName.NotCamelCapsProperty @@ -33,7 +38,7 @@ abstract class AbstractOptions implements ParameterObjectInterface /** * Constructor * - * @param array|Traversable|null $options + * @param iterable|AbstractOptions|null $options */ public function __construct($options = null) { @@ -45,7 +50,7 @@ abstract class AbstractOptions implements ParameterObjectInterface /** * Set one or more configuration properties * - * @param array|Traversable|AbstractOptions $options + * @param iterable|AbstractOptions $options * @throws Exception\InvalidArgumentException * @return AbstractOptions Provides fluent interface */ @@ -77,19 +82,20 @@ abstract class AbstractOptions implements ParameterObjectInterface /** * Cast to array * - * @return array + * @return array */ public function toArray() { $array = []; - /** @param string[] $letters */ $transform = static function (array $letters): string { + /** @var list $letters */ $letter = array_shift($letters); return '_' . strtolower($letter); }; - foreach ($this as $key => $value) { + /** @psalm-var TValue $value */ + foreach (get_object_vars($this) as $key => $value) { if ($key === '__strictMode__') { continue; } @@ -106,7 +112,7 @@ abstract class AbstractOptions implements ParameterObjectInterface * @see ParameterObject::__set() * * @param string $key - * @param mixed $value + * @param TValue|null $value * @throws Exception\BadMethodCallException * @return void */ @@ -137,7 +143,7 @@ abstract class AbstractOptions implements ParameterObjectInterface * * @param string $key * @throws Exception\BadMethodCallException - * @return mixed + * @return TValue */ public function __get($key) { diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/ArrayUtils.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/ArrayUtils.php index 75ddd529f0..935d98894f 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/ArrayUtils.php +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/ArrayUtils.php @@ -35,11 +35,15 @@ abstract class ArrayUtils { /** * Compatibility Flag for ArrayUtils::filter + * + * @deprecated */ public const ARRAY_FILTER_USE_BOTH = 1; /** * Compatibility Flag for ArrayUtils::filter + * + * @deprecated */ public const ARRAY_FILTER_USE_KEY = 2; diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/ParameterObjectInterface.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/ParameterObjectInterface.php index b091c107e2..39e5ffce36 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/ParameterObjectInterface.php +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-stdlib/src/ParameterObjectInterface.php @@ -4,28 +4,33 @@ declare(strict_types=1); namespace Laminas\Stdlib; +/** + * @template TKey of string + * @template TValue + */ interface ParameterObjectInterface { /** - * @param string $key + * @param TKey $key + * @param TValue|null $value * @return void */ public function __set($key, mixed $value); /** - * @param string $key - * @return mixed + * @param TKey $key + * @return TValue */ public function __get($key); /** - * @param string $key + * @param TKey $key * @return bool */ public function __isset($key); /** - * @param string $key + * @param TKey $key * @return void */ public function __unset($key); -- 2.20.1