From 587009f27bfc56d5c0c90ca0b2fe0df64a661cd7 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 20 Sep 2023 15:00:34 +0200 Subject: [PATCH] chore: Change requirements of cocur/slugify to prevent problems in different PHP versions --- .github/workflows/phpunit.yml | 2 +- Makefile | 2 +- UPGRADE-5.7.md | 2 +- build/build.xml | 2 +- composer.json | 2 +- composer.lock | 14 +++++++------- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 2bd576fb073..ba85aec8468 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 + - run: devenv shell composer update laminas/laminas-code cocur/slugify - run: devenv shell test-phpunit mysql: diff --git a/Makefile b/Makefile index 5ad555e4cc0..4610d966fa3 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 + composer update laminas/laminas-code 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 2ce86a4b948..0933bdc7a01 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -11,7 +11,7 @@ This changelog references changes done in Shopware 5.7 patch versions. * Changed behaviour of the translation transfer while setting a product variant as the main variant * Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead -* Updated `cocur/slugify` to version 4.4.0 +* Updated `cocur/slugify` to version 4.5.1 for PHP 8.0 and newer * Updated `doctrine/orm` to version 2.15.5 * Updated `google/cloud-storage` to version 1.33.2 * Updated `guzzlehttp/guzzle` to version 7.8.0 diff --git a/build/build.xml b/build/build.xml index d06f700dbf0..d7015aaea82 100644 --- a/build/build.xml +++ b/build/build.xml @@ -99,7 +99,7 @@ - + diff --git a/composer.json b/composer.json index dbaf9b09837..e007fd53114 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "bcremer/line-reader": "1.3.0", "beberlei/assert": "3.3.2", "beberlei/doctrineextensions": "1.3.0", - "cocur/slugify": "4.4.0", + "cocur/slugify": "4.3.0 || 4.5.1", "doctrine/annotations": "1.14.3", "doctrine/cache": "1.13.0", "doctrine/collections": "1.8.0", diff --git a/composer.lock b/composer.lock index ee63037b78c..0ad58e1eeb6 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": "50294badfd2e0cd32d90ecafd51fb467", + "content-hash": "a39fd5ba20eaa67be044cb23fe3255f1", "packages": [ { "name": "aws/aws-crt-php", @@ -388,16 +388,16 @@ }, { "name": "cocur/slugify", - "version": "v4.4.0", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/cocur/slugify.git", - "reference": "4c6ed14a087ca061b220ffda640c07644946e2a0" + "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cocur/slugify/zipball/4c6ed14a087ca061b220ffda640c07644946e2a0", - "reference": "4c6ed14a087ca061b220ffda640c07644946e2a0", + "url": "https://api.github.com/repos/cocur/slugify/zipball/652234ef5f1be844a2ae1c36ad1b4c88b05160f9", + "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9", "shasum": "" }, "require": { @@ -456,9 +456,9 @@ ], "support": { "issues": "https://github.com/cocur/slugify/issues", - "source": "https://github.com/cocur/slugify/tree/v4.4.0" + "source": "https://github.com/cocur/slugify/tree/v4.3.0" }, - "time": "2023-08-05T09:42:11+00:00" + "time": "2022-12-07T19:48:48+00:00" }, { "name": "doctrine/annotations",