diff --git a/composer.lock b/composer.lock
index 31e159361a..849da0068e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -454,12 +454,12 @@
"source": {
"type": "git",
"url": "https://github.com/phpmyadmin/sql-parser.git",
- "reference": "30452c0900f8ec1c64f24825d435543b3b8dd23a"
+ "reference": "25a07136392ee766bc1c5a6ca62563d4d8d84e90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/30452c0900f8ec1c64f24825d435543b3b8dd23a",
- "reference": "30452c0900f8ec1c64f24825d435543b3b8dd23a",
+ "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/25a07136392ee766bc1c5a6ca62563d4d8d84e90",
+ "reference": "25a07136392ee766bc1c5a6ca62563d4d8d84e90",
"shasum": ""
},
"require": {
@@ -537,7 +537,7 @@
"type": "other"
}
],
- "time": "2024-01-03T22:08:17+00:00"
+ "time": "2024-01-12T14:10:03+00:00"
},
{
"name": "phpmyadmin/twig-i18n-extension",
@@ -4464,16 +4464,16 @@
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.7.3",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419"
+ "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419",
- "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc",
+ "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc",
"shasum": ""
},
"require": {
@@ -4516,9 +4516,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
- "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3"
+ "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0"
},
- "time": "2023-08-12T11:01:26+00:00"
+ "time": "2024-01-11T11:49:22+00:00"
},
{
"name": "phpmyadmin/coding-standard",
@@ -5191,16 +5191,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "10.5.5",
+ "version": "10.5.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856"
+ "reference": "ab9a20b623b235165d24faa9d1da925cb54939c0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ed21115d505b4b4f7dc7b5651464e19a2c7f7856",
- "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ab9a20b623b235165d24faa9d1da925cb54939c0",
+ "reference": "ab9a20b623b235165d24faa9d1da925cb54939c0",
"shasum": ""
},
"require": {
@@ -5272,7 +5272,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.5"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.6"
},
"funding": [
{
@@ -5288,7 +5288,7 @@
"type": "tidelift"
}
],
- "time": "2023-12-27T15:13:52+00:00"
+ "time": "2024-01-13T12:49:56+00:00"
},
{
"name": "pragmarx/google2fa",
@@ -5708,12 +5708,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
- "reference": "b3fcb6d7942e8ad987f8cccc11bb2ba496789ce4"
+ "reference": "c892bcc085a40eaa63e195cabdab5a7558c1b1c0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/b3fcb6d7942e8ad987f8cccc11bb2ba496789ce4",
- "reference": "b3fcb6d7942e8ad987f8cccc11bb2ba496789ce4",
+ "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/c892bcc085a40eaa63e195cabdab5a7558c1b1c0",
+ "reference": "c892bcc085a40eaa63e195cabdab5a7558c1b1c0",
"shasum": ""
},
"conflict": {
@@ -5970,7 +5970,7 @@
"kelvinmo/simplexrd": "<3.1.1",
"kevinpapst/kimai2": "<1.16.7",
"khodakhah/nodcms": "<=3",
- "kimai/kimai": "<=2.1",
+ "kimai/kimai": "<2.1",
"kitodo/presentation": "<3.2.3|>=3.3,<3.3.4",
"klaviyo/magento2-extension": ">=1,<3",
"knplabs/knp-snappy": "<=1.4.2",
@@ -5999,10 +5999,12 @@
"lms/routes": "<2.1.1",
"localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
"luyadev/yii-helpers": "<1.2.1",
- "magento/community-edition": "<=2.4",
+ "magento/community-edition": "<2.4.3.0-patch3|>=2.4.4,<2.4.5",
+ "magento/core": "<=1.9.4.5",
"magento/magento1ce": "<1.9.4.3-dev",
"magento/magento1ee": ">=1,<1.14.4.3-dev",
"magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2.0-patch2",
+ "magneto/core": "<1.9.4.4-dev",
"maikuolan/phpmussel": ">=1,<1.6",
"mainwp/mainwp": "<=4.4.3.3",
"mantisbt/mantisbt": "<=2.25.7",
@@ -6092,6 +6094,7 @@
"phenx/php-svg-lib": "<0.5.1",
"php-mod/curl": "<2.3.2",
"phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1",
+ "phpems/phpems": ">=6,<=6.1.3",
"phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7",
"phpmailer/phpmailer": "<6.5",
"phpmussel/phpmussel": ">=1,<1.6",
@@ -6108,9 +6111,10 @@
"phpxmlrpc/phpxmlrpc": "<4.9.2",
"pi/pi": "<=2.5",
"pimcore/admin-ui-classic-bundle": "<1.2.2",
- "pimcore/customer-management-framework-bundle": "<3.4.2",
+ "pimcore/customer-management-framework-bundle": "<4.0.6",
"pimcore/data-hub": "<1.2.4",
"pimcore/demo": "<10.3",
+ "pimcore/ecommerce-framework-bundle": "<1.0.10",
"pimcore/perspective-editor": "<1.5.1",
"pimcore/pimcore": "<11.1.1",
"pixelfed/pixelfed": "<=0.11.4",
@@ -6425,7 +6429,7 @@
"type": "tidelift"
}
],
- "time": "2024-01-09T18:04:23+00:00"
+ "time": "2024-01-12T17:04:19+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -7617,16 +7621,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.8.0",
+ "version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
- "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7"
+ "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
- "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
+ "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
"shasum": ""
},
"require": {
@@ -7636,11 +7640,11 @@
"php": ">=5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
},
"bin": [
- "bin/phpcs",
- "bin/phpcbf"
+ "bin/phpcbf",
+ "bin/phpcs"
],
"type": "library",
"extra": {
@@ -7693,7 +7697,7 @@
"type": "open_collective"
}
],
- "time": "2023-12-08T12:32:31+00:00"
+ "time": "2024-01-11T20:47:48+00:00"
},
{
"name": "symfony/console",
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index e5344f3ea0..2232f598ba 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -11695,8 +11695,6 @@
asString
name
status