Skip to content

Commit

Permalink
chore: Change requirements of cocur/slugify to prevent problems in di…
Browse files Browse the repository at this point in the history
…fferent PHP versions
  • Loading branch information
mitelg committed Sep 20, 2023
1 parent 7b492be commit 587009f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion UPGRADE-5.7.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<exec executable="${script.php}" failonerror="true">
<arg value="composer.phar"/>
<arg value="update"/>
<arg value="laminas/laminas-code"/>
<arg value="laminas/laminas-code cocur/slugify"/>
</exec>

<exec executable="${script.php}" failonerror="true">
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 587009f

Please sign in to comment.