diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index ba85aec8468..01df019ddcf 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -51,7 +51,7 @@ jobs: - run: devenv shell info-setup - run: sudo mount -t tmpfs tmpfs $(pwd)/.devenv/profile/lib/mysql -o size=4G - run: devenv up & - - run: devenv shell composer update laminas/laminas-code cocur/slugify + - run: devenv shell composer update 'laminas/*' cocur/slugify - run: devenv shell test-phpunit mysql: diff --git a/Makefile b/Makefile index 4610d966fa3..b9e28561d5d 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ debug-config-test: .make.config.build.debug touch $@ .make.install.composer-dependencies: - composer update laminas/laminas-code cocur/slugify + composer update 'laminas/*' cocur/slugify composer install composer install -d recovery/common composer bin all install diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index e97f3241132..725b223bdd2 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -19,6 +19,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Updated `monolog/monolog` to version 2.9.2 * Updated `mpdf/mpdf` to version 8.2.0 * Updated `laminas/laminas-code` to version 4.13.0 for PHP 8.1 and newer +* Updated `laminas/laminas-escaper` to version 2.13.0 for PHP 8.1 and newer * Updated `phpunit/phpuit` to version 9.6.11 * Updated `setasign/fpdf` to version 1.8.6 * Updated `setasign/fpdi` to version 2.5.0 diff --git a/build/build.xml b/build/build.xml index d7015aaea82..97a4b0fdc5d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -99,7 +99,7 @@ - + diff --git a/composer.json b/composer.json index 9f265ae4d9d..52a70ac0fec 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "guzzlehttp/guzzle": "~7.8.0", "guzzlehttp/psr7": "~2.6.1", "laminas/laminas-code": "4.7.1 || 4.13.0", - "laminas/laminas-escaper": "2.12.0", + "laminas/laminas-escaper": "2.12.0 || 2.13.0", "league/flysystem": "~1.1.4", "league/flysystem-aws-s3-v3": "1.0.30", "monolog/monolog": "2.9.2", diff --git a/composer.lock b/composer.lock index 11fd710c353..c08868eb13c 100644 --- a/composer.lock +++ b/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": "4eadb407fa6a8bd1a0a2477d9455dca6", + "content-hash": "684f2df29dc52cbfeeb671ca0c9a6e18", "packages": [ { "name": "aws/aws-crt-php",