From 2d9d45e348a0e1e4f451beec400c9da473434368 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Wed, 1 May 2024 01:12:17 +0200 Subject: [PATCH 1/4] Vendor-Updates --- composer.json | 24 +++---- redaxo/src/addons/debug/composer.json | 2 +- redaxo/src/addons/debug/composer.lock | 14 ++-- .../clockwork/Clockwork/Clockwork.php | 2 +- redaxo/src/core/composer.json | 8 +-- redaxo/src/core/composer.lock | 62 ++++++++-------- .../src/core/vendor/composer/installed.json | 70 +++++++++---------- redaxo/src/core/vendor/composer/installed.php | 34 ++++----- .../http-foundation/RedirectResponse.php | 1 + .../core/vendor/symfony/string/LazyString.php | 2 +- .../var-dumper/Caster/ReflectionCaster.php | 2 +- .../src/core/vendor/symfony/yaml/Parser.php | 4 +- 12 files changed, 113 insertions(+), 112 deletions(-) diff --git a/composer.json b/composer.json index 245370b3f4..be86e7fa20 100644 --- a/composer.json +++ b/composer.json @@ -12,13 +12,13 @@ }, "require-dev": { "friendsofredaxo/linter": "1.4.0", - "jetbrains/phpstorm-attributes": "^1.0", + "jetbrains/phpstorm-attributes": "^1.1", "phpstan/extension-installer": "1.3.1", - "phpstan/phpstan": "1.10.66", + "phpstan/phpstan": "1.10.67", "phpstan/phpstan-deprecation-rules": "1.1.4", "phpstan/phpstan-phpunit": "1.3.16", - "phpstan/phpstan-symfony": "1.3.9", - "phpunit/phpunit": "^10.5.17", + "phpstan/phpstan-symfony": "1.3.12", + "phpunit/phpunit": "^10.5.20", "psalm/plugin-phpunit": "0.19.0", "psalm/plugin-symfony": "v5.1.0", "rector/rector": "1.0.4", @@ -30,7 +30,7 @@ "erusev/parsedown": "1.7.4", "erusev/parsedown-extra": "0.8.1", "filp/whoops": "2.15.4", - "itsgoingd/clockwork": "v5.2.1", + "itsgoingd/clockwork": "v5.2.2", "lbuchs/webauthn": "v2.1.1", "phpmailer/phpmailer": "v6.9.1", "psr/container": "2.0.2", @@ -40,17 +40,17 @@ "ramsey/http-range": "1.1.0", "scssphp/scssphp": "v1.12.1", "splitbrain/php-archive": "1.3.1", - "symfony/console": "v6.4.6", + "symfony/console": "v6.4.7", "symfony/deprecation-contracts": "v3.4.0", - "symfony/http-foundation": "v6.4.4", + "symfony/http-foundation": "v6.4.7", "symfony/polyfill-ctype": "*", "symfony/polyfill-php80": "*", "symfony/polyfill-php81": "*", "symfony/polyfill-php83": "v1.29.0", "symfony/service-contracts": "v3.4.2", - "symfony/string": "v6.4.4", - "symfony/var-dumper": "v6.4.6", - "symfony/yaml": "v6.4.3", + "symfony/string": "v6.4.7", + "symfony/var-dumper": "v6.4.7", + "symfony/yaml": "v6.4.7", "voku/anti-xss": "4.1.42", "voku/portable-ascii": "2.0.1", "voku/portable-utf8": "6.0.13" @@ -153,8 +153,8 @@ ], "baseline": [ "@phpstan:baseline", - "@taint:baseline", - "@psalm:baseline" + "@psalm:baseline", + "@taint:baseline" ], "check": [ "@cs", diff --git a/redaxo/src/addons/debug/composer.json b/redaxo/src/addons/debug/composer.json index edb4d5f1db..0db91831bb 100644 --- a/redaxo/src/addons/debug/composer.json +++ b/redaxo/src/addons/debug/composer.json @@ -1,6 +1,6 @@ { "require": { - "itsgoingd/clockwork": "^5.2.1" + "itsgoingd/clockwork": "^5.2.2" }, "config": { diff --git a/redaxo/src/addons/debug/composer.lock b/redaxo/src/addons/debug/composer.lock index a60eb4d511..bda75f3180 100644 --- a/redaxo/src/addons/debug/composer.lock +++ b/redaxo/src/addons/debug/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "576f69278908c4848731242e8f54edaf", + "content-hash": "3fb7979f7d7259989af53cd3b536c6ce", "packages": [ { "name": "itsgoingd/clockwork", - "version": "v5.2.1", + "version": "v5.2.2", "source": { "type": "git", "url": "https://github.com/itsgoingd/clockwork.git", - "reference": "356b2017decc88d42fc08e903cb41277e3966da1" + "reference": "29bc4cedfbe742b419544c30b7b6e15cd9da08ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/356b2017decc88d42fc08e903cb41277e3966da1", - "reference": "356b2017decc88d42fc08e903cb41277e3966da1", + "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/29bc4cedfbe742b419544c30b7b6e15cd9da08ef", + "reference": "29bc4cedfbe742b419544c30b7b6e15cd9da08ef", "shasum": "" }, "require": { @@ -71,7 +71,7 @@ ], "support": { "issues": "https://github.com/itsgoingd/clockwork/issues", - "source": "https://github.com/itsgoingd/clockwork/tree/v5.2.1" + "source": "https://github.com/itsgoingd/clockwork/tree/v5.2.2" }, "funding": [ { @@ -79,7 +79,7 @@ "type": "github" } ], - "time": "2024-03-27T21:22:54+00:00" + "time": "2024-04-14T10:49:22+00:00" } ], "packages-dev": [], diff --git a/redaxo/src/addons/debug/vendor/itsgoingd/clockwork/Clockwork/Clockwork.php b/redaxo/src/addons/debug/vendor/itsgoingd/clockwork/Clockwork/Clockwork.php index 47805f2fb5..13f8506fbc 100644 --- a/redaxo/src/addons/debug/vendor/itsgoingd/clockwork/Clockwork/Clockwork.php +++ b/redaxo/src/addons/debug/vendor/itsgoingd/clockwork/Clockwork/Clockwork.php @@ -16,7 +16,7 @@ class Clockwork { // Clockwork library version - const VERSION = '5.2.1'; + const VERSION = '5.2.2'; // Array of data sources, these objects collect metadata for the current application run protected $dataSources = []; diff --git a/redaxo/src/core/composer.json b/redaxo/src/core/composer.json index b54c321848..2eef7c7e8a 100644 --- a/redaxo/src/core/composer.json +++ b/redaxo/src/core/composer.json @@ -6,10 +6,10 @@ "lbuchs/webauthn": "^2.1.1", "psr/log": "^3", "ramsey/http-range": "^1.1", - "symfony/console": "^6.4.6", - "symfony/http-foundation": "^6.4.4", - "symfony/var-dumper": "^6.4.6", - "symfony/yaml": "^6.4.3", + "symfony/console": "^6.4.7", + "symfony/http-foundation": "^6.4.7", + "symfony/var-dumper": "^6.4.7", + "symfony/yaml": "^6.4.7", "voku/anti-xss": "^4.1.42" }, diff --git a/redaxo/src/core/composer.lock b/redaxo/src/core/composer.lock index a8ed5fd32a..0c0e9d478b 100644 --- a/redaxo/src/core/composer.lock +++ b/redaxo/src/core/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f16dc321fa48bbf2983cce3fbeb6f194", + "content-hash": "1f91e231a81f76c37c46a6ccb0f24272", "packages": [ { "name": "erusev/parsedown", @@ -543,16 +543,16 @@ }, { "name": "symfony/console", - "version": "v6.4.6", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f" + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f", - "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f", + "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", "shasum": "" }, "require": { @@ -617,7 +617,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.6" + "source": "https://github.com/symfony/console/tree/v6.4.7" }, "funding": [ { @@ -633,7 +633,7 @@ "type": "tidelift" } ], - "time": "2024-03-29T19:07:53+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/deprecation-contracts", @@ -704,16 +704,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304" + "reference": "b4db6b833035477cb70e18d0ae33cb7c2b521759" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ebc713bc6e6f4b53f46539fc158be85dfcd77304", - "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b4db6b833035477cb70e18d0ae33cb7c2b521759", + "reference": "b4db6b833035477cb70e18d0ae33cb7c2b521759", "shasum": "" }, "require": { @@ -761,7 +761,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.4" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.7" }, "funding": [ { @@ -777,7 +777,7 @@ "type": "tidelift" } ], - "time": "2024-02-08T15:01:18+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/polyfill-php83", @@ -940,16 +940,16 @@ }, { "name": "symfony/string", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", - "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69", + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69", "shasum": "" }, "require": { @@ -1006,7 +1006,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.4" + "source": "https://github.com/symfony/string/tree/v6.4.7" }, "funding": [ { @@ -1022,20 +1022,20 @@ "type": "tidelift" } ], - "time": "2024-02-01T13:16:41+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.6", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4" + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7", + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7", "shasum": "" }, "require": { @@ -1091,7 +1091,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.6" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.7" }, "funding": [ { @@ -1107,20 +1107,20 @@ "type": "tidelift" } ], - "time": "2024-03-19T11:56:30+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/yaml", - "version": "v6.4.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "d75715985f0f94f978e3a8fa42533e10db921b90" + "reference": "53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90", - "reference": "d75715985f0f94f978e3a8fa42533e10db921b90", + "url": "https://api.github.com/repos/symfony/yaml/zipball/53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0", + "reference": "53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0", "shasum": "" }, "require": { @@ -1163,7 +1163,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.3" + "source": "https://github.com/symfony/yaml/tree/v6.4.7" }, "funding": [ { @@ -1179,7 +1179,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-04-28T10:28:08+00:00" }, { "name": "voku/anti-xss", diff --git a/redaxo/src/core/vendor/composer/installed.json b/redaxo/src/core/vendor/composer/installed.json index 983a30676d..350a5a28cf 100644 --- a/redaxo/src/core/vendor/composer/installed.json +++ b/redaxo/src/core/vendor/composer/installed.json @@ -564,17 +564,17 @@ }, { "name": "symfony/console", - "version": "v6.4.6", - "version_normalized": "6.4.6.0", + "version": "v6.4.7", + "version_normalized": "6.4.7.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f" + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f", - "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f", + "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", "shasum": "" }, "require": { @@ -607,7 +607,7 @@ "symfony/stopwatch": "^5.4|^6.0|^7.0", "symfony/var-dumper": "^5.4|^6.0|^7.0" }, - "time": "2024-03-29T19:07:53+00:00", + "time": "2024-04-18T09:22:46+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -641,7 +641,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.6" + "source": "https://github.com/symfony/console/tree/v6.4.7" }, "funding": [ { @@ -731,17 +731,17 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.4", - "version_normalized": "6.4.4.0", + "version": "v6.4.7", + "version_normalized": "6.4.7.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304" + "reference": "b4db6b833035477cb70e18d0ae33cb7c2b521759" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ebc713bc6e6f4b53f46539fc158be85dfcd77304", - "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b4db6b833035477cb70e18d0ae33cb7c2b521759", + "reference": "b4db6b833035477cb70e18d0ae33cb7c2b521759", "shasum": "" }, "require": { @@ -763,7 +763,7 @@ "symfony/mime": "^5.4|^6.0|^7.0", "symfony/rate-limiter": "^5.4|^6.0|^7.0" }, - "time": "2024-02-08T15:01:18+00:00", + "time": "2024-04-18T09:22:46+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -791,7 +791,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.4" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.7" }, "funding": [ { @@ -976,17 +976,17 @@ }, { "name": "symfony/string", - "version": "v6.4.4", - "version_normalized": "6.4.4.0", + "version": "v6.4.7", + "version_normalized": "6.4.7.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", - "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69", + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69", "shasum": "" }, "require": { @@ -1006,7 +1006,7 @@ "symfony/translation-contracts": "^2.5|^3.0", "symfony/var-exporter": "^5.4|^6.0|^7.0" }, - "time": "2024-02-01T13:16:41+00:00", + "time": "2024-04-18T09:22:46+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1045,7 +1045,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.4" + "source": "https://github.com/symfony/string/tree/v6.4.7" }, "funding": [ { @@ -1065,17 +1065,17 @@ }, { "name": "symfony/var-dumper", - "version": "v6.4.6", - "version_normalized": "6.4.6.0", + "version": "v6.4.7", + "version_normalized": "6.4.7.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4" + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7", + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7", "shasum": "" }, "require": { @@ -1095,7 +1095,7 @@ "symfony/uid": "^5.4|^6.0|^7.0", "twig/twig": "^2.13|^3.0.4" }, - "time": "2024-03-19T11:56:30+00:00", + "time": "2024-04-18T09:22:46+00:00", "bin": [ "Resources/bin/var-dump-server" ], @@ -1133,7 +1133,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.6" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.7" }, "funding": [ { @@ -1153,17 +1153,17 @@ }, { "name": "symfony/yaml", - "version": "v6.4.3", - "version_normalized": "6.4.3.0", + "version": "v6.4.7", + "version_normalized": "6.4.7.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "d75715985f0f94f978e3a8fa42533e10db921b90" + "reference": "53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90", - "reference": "d75715985f0f94f978e3a8fa42533e10db921b90", + "url": "https://api.github.com/repos/symfony/yaml/zipball/53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0", + "reference": "53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0", "shasum": "" }, "require": { @@ -1177,7 +1177,7 @@ "require-dev": { "symfony/console": "^5.4|^6.0|^7.0" }, - "time": "2024-01-23T14:51:35+00:00", + "time": "2024-04-28T10:28:08+00:00", "bin": [ "Resources/bin/yaml-lint" ], @@ -1208,7 +1208,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.3" + "source": "https://github.com/symfony/yaml/tree/v6.4.7" }, "funding": [ { diff --git a/redaxo/src/core/vendor/composer/installed.php b/redaxo/src/core/vendor/composer/installed.php index fbbbfc3ffc..c40d94f27f 100644 --- a/redaxo/src/core/vendor/composer/installed.php +++ b/redaxo/src/core/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '9c1c9ee5ea34e6ed562bc78dd39c5ee942ff7b69', + 'reference' => '193f2056d3fe3f6889a58a1a970e06e6608ec9f5', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '9c1c9ee5ea34e6ed562bc78dd39c5ee942ff7b69', + 'reference' => '193f2056d3fe3f6889a58a1a970e06e6608ec9f5', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -107,9 +107,9 @@ 'dev_requirement' => false, ), 'symfony/console' => array( - 'pretty_version' => 'v6.4.6', - 'version' => '6.4.6.0', - 'reference' => 'a2708a5da5c87d1d0d52937bdeac625df659e11f', + 'pretty_version' => 'v6.4.7', + 'version' => '6.4.7.0', + 'reference' => 'a170e64ae10d00ba89e2acbb590dc2e54da8ad8f', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/console', 'aliases' => array(), @@ -125,9 +125,9 @@ 'dev_requirement' => false, ), 'symfony/http-foundation' => array( - 'pretty_version' => 'v6.4.4', - 'version' => '6.4.4.0', - 'reference' => 'ebc713bc6e6f4b53f46539fc158be85dfcd77304', + 'pretty_version' => 'v6.4.7', + 'version' => '6.4.7.0', + 'reference' => 'b4db6b833035477cb70e18d0ae33cb7c2b521759', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/http-foundation', 'aliases' => array(), @@ -212,27 +212,27 @@ 'dev_requirement' => false, ), 'symfony/string' => array( - 'pretty_version' => 'v6.4.4', - 'version' => '6.4.4.0', - 'reference' => '4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9', + 'pretty_version' => 'v6.4.7', + 'version' => '6.4.7.0', + 'reference' => 'ffeb9591c61f65a68d47f77d12b83fa530227a69', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/string', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/var-dumper' => array( - 'pretty_version' => 'v6.4.6', - 'version' => '6.4.6.0', - 'reference' => '95bd2706a97fb875185b51ecaa6112ec184233d4', + 'pretty_version' => 'v6.4.7', + 'version' => '6.4.7.0', + 'reference' => '7a9cd977cd1c5fed3694bee52990866432af07d7', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/var-dumper', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/yaml' => array( - 'pretty_version' => 'v6.4.3', - 'version' => '6.4.3.0', - 'reference' => 'd75715985f0f94f978e3a8fa42533e10db921b90', + 'pretty_version' => 'v6.4.7', + 'version' => '6.4.7.0', + 'reference' => '53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/yaml', 'aliases' => array(), diff --git a/redaxo/src/core/vendor/symfony/http-foundation/RedirectResponse.php b/redaxo/src/core/vendor/symfony/http-foundation/RedirectResponse.php index a001df81da..408629e36f 100644 --- a/redaxo/src/core/vendor/symfony/http-foundation/RedirectResponse.php +++ b/redaxo/src/core/vendor/symfony/http-foundation/RedirectResponse.php @@ -85,6 +85,7 @@ public function setTargetUrl(string $url): static ', htmlspecialchars($url, \ENT_QUOTES, 'UTF-8'))); $this->headers->set('Location', $url); + $this->headers->set('Content-Type', 'text/html; charset=utf-8'); return $this; } diff --git a/redaxo/src/core/vendor/symfony/string/LazyString.php b/redaxo/src/core/vendor/symfony/string/LazyString.php index 1af376908a..3d893ef9e9 100644 --- a/redaxo/src/core/vendor/symfony/string/LazyString.php +++ b/redaxo/src/core/vendor/symfony/string/LazyString.php @@ -129,7 +129,7 @@ private static function getPrettyName(callable $callback): string } elseif ($callback instanceof \Closure) { $r = new \ReflectionFunction($callback); - if (str_contains($r->name, '{closure}') || !$class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) { + if (str_contains($r->name, '{closure') || !$class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) { return $r->name; } diff --git a/redaxo/src/core/vendor/symfony/var-dumper/Caster/ReflectionCaster.php b/redaxo/src/core/vendor/symfony/var-dumper/Caster/ReflectionCaster.php index f3da9f920a..45397e9652 100644 --- a/redaxo/src/core/vendor/symfony/var-dumper/Caster/ReflectionCaster.php +++ b/redaxo/src/core/vendor/symfony/var-dumper/Caster/ReflectionCaster.php @@ -45,7 +45,7 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, bool $isNe $a = static::castFunctionAbstract($c, $a, $stub, $isNested, $filter); - if (!str_contains($c->name, '{closure}')) { + if (!str_contains($c->name, '{closure')) { $stub->class = isset($a[$prefix.'class']) ? $a[$prefix.'class']->value.'::'.$c->name : $c->name; unset($a[$prefix.'class']); } diff --git a/redaxo/src/core/vendor/symfony/yaml/Parser.php b/redaxo/src/core/vendor/symfony/yaml/Parser.php index e4de9454b0..2a15bcae3d 100644 --- a/redaxo/src/core/vendor/symfony/yaml/Parser.php +++ b/redaxo/src/core/vendor/symfony/yaml/Parser.php @@ -638,12 +638,12 @@ private function getNextEmbedBlock(?int $indentation = null, bool $inSequence = } if ($this->isCurrentLineBlank()) { - $data[] = substr($this->currentLine, $newIndent); + $data[] = substr($this->currentLine, $newIndent ?? 0); continue; } if ($indent >= $newIndent) { - $data[] = substr($this->currentLine, $newIndent); + $data[] = substr($this->currentLine, $newIndent ?? 0); } elseif ($this->isCurrentLineComment()) { $data[] = $this->currentLine; } elseif (0 == $indent) { From 8b2e0626f64ae6c3ea7444dc2fcd01c4f84b2907 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Wed, 1 May 2024 01:24:10 +0200 Subject: [PATCH 2/4] update --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index be86e7fa20..0fdb264900 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "psalm/plugin-phpunit": "0.19.0", "psalm/plugin-symfony": "v5.1.0", "rector/rector": "1.0.4", - "redaxo/php-cs-fixer-config": "2.8.0", + "redaxo/php-cs-fixer-config": "2.9.0", "redaxo/psalm-plugin": "2.0.0", "vimeo/psalm": "5.23.1" }, From 4ffe9d9c33d1b74924ad20d15de86781337c9cd8 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Wed, 1 May 2024 01:27:58 +0200 Subject: [PATCH 3/4] node 22 --- .github/workflows/visual-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/visual-tests.yml b/.github/workflows/visual-tests.yml index 0b12914ea4..5044133fe6 100644 --- a/.github/workflows/visual-tests.yml +++ b/.github/workflows/visual-tests.yml @@ -88,7 +88,7 @@ jobs: - name: Setup nodejs uses: actions/setup-node@v4 with: - node-version: 21 + node-version: 22 cache: npm cache-dependency-path: .github/workflows/visual-tests.yml From aaed471bc6bc59c1887c041537a3f7ba3b13270a Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Wed, 1 May 2024 01:29:41 +0200 Subject: [PATCH 4/4] test --- .github/workflows/visual-tests.yml | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/visual-tests.yml b/.github/workflows/visual-tests.yml index 5044133fe6..07aef6b5e3 100644 --- a/.github/workflows/visual-tests.yml +++ b/.github/workflows/visual-tests.yml @@ -48,6 +48,29 @@ jobs: repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }} ref: ${{ github.event.client_payload.pull_request.head.ref }} + - name: Setup nodejs + uses: actions/setup-node@v4 + with: + node-version: 22 + cache: npm + cache-dependency-path: .github/workflows/visual-tests.yml + + - name: Install npm packages + run: npm install playwright pixelmatch pngjs fs mkdirp + + - name: Get installed Playwright version (used in cache key) + id: playwright-version + run: echo "PLAYWRIGHT_VERSION=$(node -e "process.stdout.write(require('playwright/package.json').version)")" >> $GITHUB_ENV + - name: Cache Playwright browser binaries + uses: actions/cache@v4 + id: playwright-cache + with: + path: ~/.cache/ms-playwright + key: playwright-${{ env.PLAYWRIGHT_VERSION }} + - name: Install Playwright browsers binaries if cache missed + run: npx playwright install chromium --with-deps + if: steps.playwright-cache.outputs.cache-hit != 'true' + - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -85,29 +108,6 @@ jobs: php redaxo/bin/console package:install structure/history --ansi -v php redaxo/bin/console package:install structure/version --ansi -v - - name: Setup nodejs - uses: actions/setup-node@v4 - with: - node-version: 22 - cache: npm - cache-dependency-path: .github/workflows/visual-tests.yml - - - name: Install npm packages - run: npm install playwright pixelmatch pngjs fs mkdirp - - - name: Get installed Playwright version (used in cache key) - id: playwright-version - run: echo "PLAYWRIGHT_VERSION=$(node -e "process.stdout.write(require('playwright/package.json').version)")" >> $GITHUB_ENV - - name: Cache Playwright browser binaries - uses: actions/cache@v4 - id: playwright-cache - with: - path: ~/.cache/ms-playwright - key: playwright-${{ env.PLAYWRIGHT_VERSION }} - - name: Install Playwright browsers binaries if cache missed - run: npx playwright install chromium --with-deps - if: steps.playwright-cache.outputs.cache-hit != 'true' - - name: Start php server run: | cat < router.php