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 84b9d237b0e..725b223bdd2 100644
--- a/UPGRADE-5.7.md
+++ b/UPGRADE-5.7.md
@@ -13,14 +13,16 @@ This changelog references changes done in Shopware 5.7 patch versions.
* 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 `google/cloud-storage` to version 1.34.0
* Updated `guzzlehttp/guzzle` to version 7.8.0
* Updated `guzzlehttp/psr7` to version 2.6.1
+* Updated `monolog/monolog` to version 2.9.2
* Updated `mpdf/mpdf` to version 8.2.0
-* Updated `laminas/laminas-code` to version 4.12.0 for PHP 8.1 and newer
+* 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.4.1
+* Updated `setasign/fpdi` to version 2.5.0
* Updated `symfony/polyfill-php80` to version 1.28.0
* Updated `symfony/polyfill-php81` to version 1.28.0
* Updated `symfony/polyfill-php82` to version 1.28.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 e007fd53114..52a70ac0fec 100644
--- a/composer.json
+++ b/composer.json
@@ -54,21 +54,21 @@
"elasticsearch/elasticsearch": "^7",
"fig/link-util": "1.1.2",
"friendsofphp/proxy-manager-lts": "1.0.16",
- "google/cloud-storage": "1.33.2",
+ "google/cloud-storage": "1.34.0",
"guzzlehttp/guzzle": "~7.8.0",
"guzzlehttp/psr7": "~2.6.1",
- "laminas/laminas-code": "4.7.1 || 4.12.0",
- "laminas/laminas-escaper": "2.12.0",
+ "laminas/laminas-code": "4.7.1 || 4.13.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.1",
+ "monolog/monolog": "2.9.2",
"mpdf/mpdf": "8.2.0",
"ongr/elasticsearch-dsl": "7.2.2",
"psr/link": "1.0.0",
"psr/log": "1.1.4",
"ramsey/uuid": "4.2.3",
"setasign/fpdf": "1.8.6",
- "setasign/fpdi": "2.4.1",
+ "setasign/fpdi": "2.5.0",
"stecman/symfony-console-completion": "0.11.0",
"superbalist/flysystem-google-storage": "7.2.2",
"symfony/config": "~4.4.34",
@@ -109,17 +109,17 @@
"behat/gherkin": "4.9.0",
"behat/mink": "1.10.0",
"behat/mink-selenium2-driver": "1.6.0",
- "friends-of-behat/mink-extension": "2.7.3",
+ "friends-of-behat/mink-extension": "2.7.4",
"php-parallel-lint/php-var-dump-check": "^0.5",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/extension-installer": "1.3.1",
- "phpstan/phpstan": "1.10.35",
- "phpstan/phpstan-doctrine": "1.3.43",
- "phpstan/phpstan-phpunit": "1.3.14",
- "phpstan/phpstan-symfony": "1.3.2",
+ "phpstan/phpstan": "1.10.41",
+ "phpstan/phpstan-doctrine": "1.3.45",
+ "phpstan/phpstan-phpunit": "1.3.15",
+ "phpstan/phpstan-symfony": "1.3.5",
"phpunit/phpunit": "^9.6",
"sensiolabs/behat-page-object-extension": "2.3.7",
- "staabm/phpstan-dba": "0.2.75",
+ "staabm/phpstan-dba": "0.2.79",
"symfony/browser-kit": "~4.4.27",
"symfony/dom-crawler": "~4.4.30"
},
diff --git a/composer.lock b/composer.lock
index ce37643c3cd..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": "a39fd5ba20eaa67be044cb23fe3255f1",
+ "content-hash": "684f2df29dc52cbfeeb671ca0c9a6e18",
"packages": [
{
"name": "aws/aws-crt-php",
@@ -1718,16 +1718,16 @@
},
{
"name": "firebase/php-jwt",
- "version": "v6.8.1",
+ "version": "v6.9.0",
"source": {
"type": "git",
"url": "https://github.com/firebase/php-jwt.git",
- "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26"
+ "reference": "f03270e63eaccf3019ef0f32849c497385774e11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5dbc8959427416b8ee09a100d7a8588c00fb2e26",
- "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26",
+ "url": "https://api.github.com/repos/firebase/php-jwt/zipball/f03270e63eaccf3019ef0f32849c497385774e11",
+ "reference": "f03270e63eaccf3019ef0f32849c497385774e11",
"shasum": ""
},
"require": {
@@ -1775,9 +1775,9 @@
],
"support": {
"issues": "https://github.com/firebase/php-jwt/issues",
- "source": "https://github.com/firebase/php-jwt/tree/v6.8.1"
+ "source": "https://github.com/firebase/php-jwt/tree/v6.9.0"
},
- "time": "2023-07-14T18:33:00+00:00"
+ "time": "2023-10-05T00:24:42+00:00"
},
{
"name": "friendsofphp/proxy-manager-lts",
@@ -1863,16 +1863,16 @@
},
{
"name": "google/auth",
- "version": "v1.30.0",
+ "version": "v1.32.1",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-auth-library-php.git",
- "reference": "6028b072aa444d7edecbed603431322026704627"
+ "reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/6028b072aa444d7edecbed603431322026704627",
- "reference": "6028b072aa444d7edecbed603431322026704627",
+ "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/999e9ce8b9d17914f04e1718271a0a46da4de2f3",
+ "reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3",
"shasum": ""
},
"require": {
@@ -1915,22 +1915,22 @@
"support": {
"docs": "https://googleapis.github.io/google-auth-library-php/main/",
"issues": "https://github.com/googleapis/google-auth-library-php/issues",
- "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.30.0"
+ "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.32.1"
},
- "time": "2023-09-07T19:13:44+00:00"
+ "time": "2023-10-17T21:13:22+00:00"
},
{
"name": "google/cloud-core",
- "version": "v1.52.4",
+ "version": "v1.52.8",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-cloud-php-core.git",
- "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6"
+ "reference": "2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/21c004745a32c71e03ab62effd7fbee0cf3ae7c6",
- "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6",
+ "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c",
+ "reference": "2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c",
"shasum": ""
},
"require": {
@@ -1946,7 +1946,7 @@
"require-dev": {
"erusev/parsedown": "^1.6",
"google/cloud-common-protos": "^0.4",
- "google/gax": "^1.19.1",
+ "google/gax": "^1.24.0",
"opis/closure": "^3",
"phpdocumentor/reflection": "^5.0",
"phpspec/prophecy-phpunit": "^2.0",
@@ -1980,26 +1980,26 @@
],
"description": "Google Cloud PHP shared dependency, providing functionality useful to all components.",
"support": {
- "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.4"
+ "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.8"
},
- "time": "2023-09-15T20:50:36+00:00"
+ "time": "2023-11-02T19:15:44+00:00"
},
{
"name": "google/cloud-storage",
- "version": "v1.33.2",
+ "version": "v1.34.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-cloud-php-storage.git",
- "reference": "6148b428737eae9b6590ccd8fec508ab8689d096"
+ "reference": "4589dd3c8f4171db4ce3eb335fc7d894661ca0e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/6148b428737eae9b6590ccd8fec508ab8689d096",
- "reference": "6148b428737eae9b6590ccd8fec508ab8689d096",
+ "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/4589dd3c8f4171db4ce3eb335fc7d894661ca0e9",
+ "reference": "4589dd3c8f4171db4ce3eb335fc7d894661ca0e9",
"shasum": ""
},
"require": {
- "google/cloud-core": "^1.51.3",
+ "google/cloud-core": "^1.52.7",
"php": ">=7.4",
"ramsey/uuid": "^4.2.3"
},
@@ -2036,9 +2036,9 @@
],
"description": "Cloud Storage Client for PHP",
"support": {
- "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.2"
+ "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.34.0"
},
- "time": "2023-09-15T20:50:36+00:00"
+ "time": "2023-11-02T19:15:44+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -2710,16 +2710,16 @@
},
{
"name": "monolog/monolog",
- "version": "2.9.1",
+ "version": "2.9.2",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1"
+ "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
- "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
+ "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
"shasum": ""
},
"require": {
@@ -2796,7 +2796,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
- "source": "https://github.com/Seldaek/monolog/tree/2.9.1"
+ "source": "https://github.com/Seldaek/monolog/tree/2.9.2"
},
"funding": [
{
@@ -2808,7 +2808,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-06T13:44:46+00:00"
+ "time": "2023-10-27T15:25:26+00:00"
},
{
"name": "mpdf/mpdf",
@@ -3259,16 +3259,16 @@
},
{
"name": "psr/http-client",
- "version": "1.0.2",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
- "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
- "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
"shasum": ""
},
"require": {
@@ -3305,9 +3305,9 @@
"psr-18"
],
"support": {
- "source": "https://github.com/php-fig/http-client/tree/1.0.2"
+ "source": "https://github.com/php-fig/http-client"
},
- "time": "2023-04-10T20:12:12+00:00"
+ "time": "2023-09-23T14:17:50+00:00"
},
{
"name": "psr/http-factory",
@@ -3933,16 +3933,16 @@
},
{
"name": "setasign/fpdi",
- "version": "v2.4.1",
+ "version": "v2.5.0",
"source": {
"type": "git",
"url": "https://github.com/Setasign/FPDI.git",
- "reference": "f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b"
+ "reference": "ecf0459643ec963febfb9a5d529dcd93656006a4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Setasign/FPDI/zipball/f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b",
- "reference": "f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b",
+ "url": "https://api.github.com/repos/Setasign/FPDI/zipball/ecf0459643ec963febfb9a5d529dcd93656006a4",
+ "reference": "ecf0459643ec963febfb9a5d529dcd93656006a4",
"shasum": ""
},
"require": {
@@ -3993,7 +3993,7 @@
],
"support": {
"issues": "https://github.com/Setasign/FPDI/issues",
- "source": "https://github.com/Setasign/FPDI/tree/v2.4.1"
+ "source": "https://github.com/Setasign/FPDI/tree/v2.5.0"
},
"funding": [
{
@@ -4001,7 +4001,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-27T08:12:09+00:00"
+ "time": "2023-09-28T10:46:27+00:00"
},
{
"name": "stecman/symfony-console-completion",
@@ -7918,16 +7918,16 @@
},
{
"name": "friends-of-behat/mink-extension",
- "version": "v2.7.3",
+ "version": "v2.7.4",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfBehat/MinkExtension.git",
- "reference": "b1ccaef9136f62c8efaad88b966345dd68374fa9"
+ "reference": "18d5a53dff3e2c8934c53e2db8b02b7ea345fe85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/b1ccaef9136f62c8efaad88b966345dd68374fa9",
- "reference": "b1ccaef9136f62c8efaad88b966345dd68374fa9",
+ "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/18d5a53dff3e2c8934c53e2db8b02b7ea345fe85",
+ "reference": "18d5a53dff3e2c8934c53e2db8b02b7ea345fe85",
"shasum": ""
},
"require": {
@@ -7977,9 +7977,9 @@
"web"
],
"support": {
- "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.7.3"
+ "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.7.4"
},
- "time": "2023-09-12T09:50:10+00:00"
+ "time": "2023-10-03T13:15:12+00:00"
},
{
"name": "instaclick/php-webdriver",
@@ -8598,16 +8598,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.24.1",
+ "version": "1.24.2",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01"
+ "reference": "bcad8d995980440892759db0c32acae7c8e79442"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
- "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442",
+ "reference": "bcad8d995980440892759db0c32acae7c8e79442",
"shasum": ""
},
"require": {
@@ -8639,22 +8639,22 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.1"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2"
},
- "time": "2023-09-18T12:18:02+00:00"
+ "time": "2023-09-26T12:28:12+00:00"
},
{
"name": "phpstan/phpstan",
- "version": "1.10.35",
+ "version": "1.10.41",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3"
+ "reference": "c6174523c2a69231df55bdc65b61655e72876d76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e730e5facb75ffe09dfb229795e8c01a459f26c3",
- "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76",
+ "reference": "c6174523c2a69231df55bdc65b61655e72876d76",
"shasum": ""
},
"require": {
@@ -8703,20 +8703,20 @@
"type": "tidelift"
}
],
- "time": "2023-09-19T15:27:56+00:00"
+ "time": "2023-11-05T12:57:57+00:00"
},
{
"name": "phpstan/phpstan-doctrine",
- "version": "1.3.43",
+ "version": "1.3.45",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-doctrine.git",
- "reference": "c5015035755ad2d5013bd6bf98ff423ca6150822"
+ "reference": "90e60ba9dbea4b29c7b87026a29e91ac0a02674e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/c5015035755ad2d5013bd6bf98ff423ca6150822",
- "reference": "c5015035755ad2d5013bd6bf98ff423ca6150822",
+ "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/90e60ba9dbea4b29c7b87026a29e91ac0a02674e",
+ "reference": "90e60ba9dbea4b29c7b87026a29e91ac0a02674e",
"shasum": ""
},
"require": {
@@ -8771,22 +8771,22 @@
"description": "Doctrine extensions for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-doctrine/issues",
- "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.43"
+ "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.45"
},
- "time": "2023-09-01T15:01:13+00:00"
+ "time": "2023-10-29T08:18:22+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
- "version": "1.3.14",
+ "version": "1.3.15",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
- "reference": "614acc10c522e319639bf38b0698a4a566665f04"
+ "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/614acc10c522e319639bf38b0698a4a566665f04",
- "reference": "614acc10c522e319639bf38b0698a4a566665f04",
+ "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
+ "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
"shasum": ""
},
"require": {
@@ -8823,28 +8823,28 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
- "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.14"
+ "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.15"
},
- "time": "2023-08-25T09:46:39+00:00"
+ "time": "2023-10-09T18:58:39+00:00"
},
{
"name": "phpstan/phpstan-symfony",
- "version": "1.3.2",
+ "version": "1.3.5",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-symfony.git",
- "reference": "7332b90dfc291ac5b4b83fbca2081936faa1e3f9"
+ "reference": "27ff6339f83796a7e0dd963cf445cd3c456fc620"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/7332b90dfc291ac5b4b83fbca2081936faa1e3f9",
- "reference": "7332b90dfc291ac5b4b83fbca2081936faa1e3f9",
+ "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/27ff6339f83796a7e0dd963cf445cd3c456fc620",
+ "reference": "27ff6339f83796a7e0dd963cf445cd3c456fc620",
"shasum": ""
},
"require": {
"ext-simplexml": "*",
"php": "^7.2 || ^8.0",
- "phpstan/phpstan": "^1.9.18"
+ "phpstan/phpstan": "^1.10.36"
},
"conflict": {
"symfony/framework-bundle": "<3.0"
@@ -8852,8 +8852,8 @@
"require-dev": {
"nikic/php-parser": "^4.13.0",
"php-parallel-lint/php-parallel-lint": "^1.2",
- "phpstan/phpstan-phpunit": "^1.0",
- "phpstan/phpstan-strict-rules": "^1.0",
+ "phpstan/phpstan-phpunit": "^1.3.11",
+ "phpstan/phpstan-strict-rules": "^1.5.1",
"phpunit/phpunit": "^8.5.29 || ^9.5",
"psr/container": "1.0 || 1.1.1",
"symfony/config": "^5.4 || ^6.1",
@@ -8864,7 +8864,8 @@
"symfony/http-foundation": "^5.4 || ^6.1",
"symfony/messenger": "^5.4",
"symfony/polyfill-php80": "^1.24",
- "symfony/serializer": "^5.4"
+ "symfony/serializer": "^5.4",
+ "symfony/service-contracts": "^2.2.0"
},
"type": "phpstan-extension",
"extra": {
@@ -8894,9 +8895,9 @@
"description": "Symfony Framework extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-symfony/issues",
- "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.2"
+ "source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.5"
},
- "time": "2023-05-16T12:46:15+00:00"
+ "time": "2023-10-30T14:52:15+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -10362,16 +10363,16 @@
},
{
"name": "staabm/phpstan-dba",
- "version": "0.2.75",
+ "version": "0.2.79",
"source": {
"type": "git",
"url": "https://github.com/staabm/phpstan-dba.git",
- "reference": "812b436d601c007e07cba93985a4bc87eccf6be0"
+ "reference": "14d9afd28413e9964a9a33d30bafa1683d044542"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/812b436d601c007e07cba93985a4bc87eccf6be0",
- "reference": "812b436d601c007e07cba93985a4bc87eccf6be0",
+ "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/14d9afd28413e9964a9a33d30bafa1683d044542",
+ "reference": "14d9afd28413e9964a9a33d30bafa1683d044542",
"shasum": ""
},
"require": {
@@ -10395,7 +10396,7 @@
"phpstan/phpstan-strict-rules": "^1.1",
"phpunit/phpunit": "^8.5|^9.5",
"symplify/easy-coding-standard": "^11.4",
- "tomasvotruba/unused-public": "^0.2.0",
+ "tomasvotruba/unused-public": "^0.3",
"vlucas/phpdotenv": "^5.4"
},
"type": "phpstan-extension",
@@ -10425,9 +10426,9 @@
],
"support": {
"issues": "https://github.com/staabm/phpstan-dba/issues",
- "source": "https://github.com/staabm/phpstan-dba/tree/0.2.75"
+ "source": "https://github.com/staabm/phpstan-dba/tree/0.2.79"
},
- "time": "2023-07-30T09:15:23+00:00"
+ "time": "2023-10-12T07:23:58+00:00"
},
{
"name": "symfony/browser-kit",
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php
index 38386a16beb..1d2a50af0d5 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php
@@ -161,11 +161,11 @@ private function findFuzzyMatches($term)
if (\strlen($term1) < 4) {
$relevance = $this->config->get('fuzzySearchMatchFactor', 5);
- // ipod === ipods
+ // ipod === ipods
} elseif (\strlen($term1) - \strlen($term2) <= 1) {
$relevance = $this->config->get('fuzzySearchExactMatchFactor', 100);
- // digital == digi
+ // digital == digi
} elseif ((round(\strlen($term2) / \strlen($term1), 2) * 100) >= $this->config->get('fuzzySearchPartNameDistancen', 25)) {
$relevance = $this->config->get('fuzzySearchPatternMatchFactor', 50);
}
diff --git a/engine/Shopware/Components/Api/Resource/Article.php b/engine/Shopware/Components/Api/Resource/Article.php
index 4439e8a9532..25207d51275 100644
--- a/engine/Shopware/Components/Api/Resource/Article.php
+++ b/engine/Shopware/Components/Api/Resource/Article.php
@@ -1649,7 +1649,7 @@ protected function preparePropertyValuesData($data, ProductModel $article)
if (!$value instanceof Value) {
throw new CustomValidationException(sprintf('Property value by id "%s" not found', $valueData['id']));
}
- // Get / create value by name
+ // Get / create value by name
} elseif (isset($valueData['value'])) {
// Get option
if (isset($valueData['option'])) {
@@ -1668,7 +1668,7 @@ protected function preparePropertyValuesData($data, ProductModel $article)
if (!$relation instanceof Relation) {
$propertyGroup->addOption($option);
}
- // Get/create option depending on associated filter groups
+ // Get/create option depending on associated filter groups
} elseif (isset($valueData['option']['name'])) {
// If a name is passed and there is a matching option/group relation, get this option
// If only a name is passed, create a new option
diff --git a/engine/Shopware/Components/Api/Resource/Variant.php b/engine/Shopware/Components/Api/Resource/Variant.php
index 6b2f3205655..c94ca840023 100644
--- a/engine/Shopware/Components/Api/Resource/Variant.php
+++ b/engine/Shopware/Components/Api/Resource/Variant.php
@@ -772,7 +772,7 @@ protected function prepareUnitAssociation($data)
throw new CustomValidationException(sprintf('Unit by id %s not found', $data['unitId']));
}
- // New unit data send? create new unit for this variant
+ // New unit data send? create new unit for this variant
} elseif (!empty($data['unit'])) {
$data['unit'] = $this->updateUnitReference($data['unit']);
}
diff --git a/engine/Shopware/Components/Cart/TaxAggregator.php b/engine/Shopware/Components/Cart/TaxAggregator.php
index b3cdcbd8269..7d1ba486255 100644
--- a/engine/Shopware/Components/Cart/TaxAggregator.php
+++ b/engine/Shopware/Components/Cart/TaxAggregator.php
@@ -82,7 +82,7 @@ public function positionsTaxSum(array $cart, float $maximumTaxRate): ?array
continue;
}
- /** @var numeric-string $taxRateString */
+ /** @var numeric-string&non-empty-string $taxRateString */
$taxRateString = number_format($taxRate, 2);
if (!\array_key_exists($taxRateString, $result)) {
diff --git a/engine/Shopware/Components/Model/Generator.php b/engine/Shopware/Components/Model/Generator.php
index 0b98e299c62..c42718fafa4 100644
--- a/engine/Shopware/Components/Model/Generator.php
+++ b/engine/Shopware/Components/Model/Generator.php
@@ -513,7 +513,7 @@ protected function getClassDefinition($table)
$parentClass = str_replace('_attributes', '', $table->getName());
$className = $this->getClassNameOfTableName($parentClass);
- // If the passed table is not an attribute table, we have to check if the table is already declared
+ // If the passed table is not an attribute table, we have to check if the table is already declared
} elseif (\array_key_exists($table->getName(), $this->getTableMapping())) {
// If this is the case we will use the already declared class name
$className = $this->tableMapping[$table->getName()]['class'];
diff --git a/engine/Shopware/Components/Model/ModelEntity.php b/engine/Shopware/Components/Model/ModelEntity.php
index 6ff4a9fee97..1dd410ae4b5 100644
--- a/engine/Shopware/Components/Model/ModelEntity.php
+++ b/engine/Shopware/Components/Model/ModelEntity.php
@@ -209,10 +209,10 @@ public function setOneToMany($data, $model, $property, $reference = null)
if (!$attribute instanceof $model) {
$attribute = new $model();
}
- // If the item is an array without an id, create a new model.
+ // If the item is an array without an id, create a new model.
} elseif (\is_array($item)) {
$attribute = new $model();
- // If the item is no array, it could be an instance of the expected object.
+ // If the item is no array, it could be an instance of the expected object.
} else {
$attribute = $item;
}
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product.php b/engine/Shopware/Components/MultiEdit/Resource/Product.php
index 484a4856254..036044499ff 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product.php
@@ -187,7 +187,7 @@ public function save($params)
$model->$setter($field['value']);
}
$entityManager->persist($model);
- // price_model
+ // price_model
} else {
$detailModel = $entityManager->find(Detail::class, $primaryIdentifiers['detail']);
// store net prices
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php b/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
index 34d5b0a9514..0802b383ce8 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
@@ -729,7 +729,7 @@ public function getDqlFromTokens($tokens)
// Non-numeric tokens will become their quotes removed:
if (!is_numeric($token['token'])) {
$params[] = substr($token['token'], 1, -1);
- // Numeric tokens can simple be appended to the params array
+ // Numeric tokens can simple be appended to the params array
} else {
$params[] = $token['token'];
}
diff --git a/engine/Shopware/Components/Theme/Configurator.php b/engine/Shopware/Components/Theme/Configurator.php
index ff24f0523fe..c494cffd09c 100644
--- a/engine/Shopware/Components/Theme/Configurator.php
+++ b/engine/Shopware/Components/Theme/Configurator.php
@@ -181,7 +181,7 @@ private function validateConfig(Container $container): void
if ($element instanceof Container) {
$this->validateConfig($element);
- // check Form\Field validation
+ // check Form\Field validation
} elseif ($element instanceof Validate) {
$element->validate();
}
diff --git a/engine/Shopware/Controllers/Backend/Address.php b/engine/Shopware/Controllers/Backend/Address.php
index ea08fcccd97..3b45eb3eb45 100644
--- a/engine/Shopware/Controllers/Backend/Address.php
+++ b/engine/Shopware/Controllers/Backend/Address.php
@@ -176,7 +176,7 @@ protected function getListQuery()
*/
protected function getQueryPaginator(QueryBuilder $builder, $hydrationMode = AbstractQuery::HYDRATE_ARRAY)
{
- /** @var Query $query */
+ /** @var Query> $query */
$query = $builder->getQuery();
$query->setHydrationMode($hydrationMode);
$query->setHint(Query::HINT_INCLUDE_META_COLUMNS, true);
diff --git a/engine/Shopware/Controllers/Backend/Article.php b/engine/Shopware/Controllers/Backend/Article.php
index 0a21a9d1109..81a134cb8e9 100644
--- a/engine/Shopware/Controllers/Backend/Article.php
+++ b/engine/Shopware/Controllers/Backend/Article.php
@@ -4394,7 +4394,7 @@ protected function recursiveInterpreter($cursor, $index, $commands)
return implode('.', $results);
- // If the result of the current command on the cursor is an object
+ // If the result of the current command on the cursor is an object
} elseif ($result instanceof Product || $result instanceof ProductVariant) {
// We have to execute the next command on the result
return $this->recursiveInterpreter($result, $index, $commands);
diff --git a/engine/Shopware/Controllers/Backend/Newsletter.php b/engine/Shopware/Controllers/Backend/Newsletter.php
index 973440eb4a7..51eb6a3606d 100644
--- a/engine/Shopware/Controllers/Backend/Newsletter.php
+++ b/engine/Shopware/Controllers/Backend/Newsletter.php
@@ -278,10 +278,10 @@ public function mailAction()
$validator = $this->container->get(EmailValidator::class);
if (!$validator->isValid($user['email'])) {
echo "Skipped invalid email\n";
- // SW-4526
- // Don't `continue` with next iteration without setting user's lastmailing
- // else the mailing.status will never be set to 2
- // and sending the mail will block
+ // SW-4526
+ // Don't `continue` with next iteration without setting user's lastmailing
+ // else the mailing.status will never be set to 2
+ // and sending the mail will block
} else {
try {
$mail->send();
diff --git a/engine/Shopware/Core/sBasket.php b/engine/Shopware/Core/sBasket.php
index 5f56112254e..6f69ac37117 100644
--- a/engine/Shopware/Core/sBasket.php
+++ b/engine/Shopware/Core/sBasket.php
@@ -2534,7 +2534,7 @@ private function calculateVoucherValues(array $voucherDetails)
if ($voucherDetails['taxconfig'] === 'default' || empty($voucherDetails['taxconfig'])) {
$tax = round($voucherDetails['value'] / (100 + $this->config->get('sVOUCHERTAX')) * 100, 3) * -1;
$taxRate = $this->config->get('sVOUCHERTAX');
- // Pre 3.5.4 behaviour
+ // Pre 3.5.4 behaviour
} elseif ($voucherDetails['taxconfig'] === 'auto') {
// Check max. used tax-rate from basket
$tax = $this->getMaxTax();
@@ -2724,7 +2724,7 @@ private function getBasketProducts(array $getProducts): array
}
} elseif ($getProducts[$key]['modus'] == CartPositionsMode::CUSTOMER_GROUP_DISCOUNT) {
$getProducts[$key]['amountWithTax'] = round(1 * (round($price, 2) / 100 * (100 + $tax)), 2);
- // Basket discount
+ // Basket discount
} elseif ($getProducts[$key]['modus'] == CartPositionsMode::VOUCHER) {
$getProducts[$key]['amountWithTax'] = round(1 * (round($price, 2) / 100 * (100 + $tax)), 2);
diff --git a/engine/Shopware/Models/Document/Order.php b/engine/Shopware/Models/Document/Order.php
index 68fafa8eebc..1d5978ae794 100644
--- a/engine/Shopware/Models/Document/Order.php
+++ b/engine/Shopware/Models/Document/Order.php
@@ -628,7 +628,7 @@ public function processPositions()
if (empty($position['tax_rate'])) {
if ($ticketResult['taxconfig'] === 'default' || empty($ticketResult['taxconfig'])) {
$position['tax'] = Shopware()->Config()->get('sVOUCHERTAX');
- // Pre 3.5.4 behaviour
+ // Pre 3.5.4 behaviour
} elseif ($ticketResult['taxconfig'] === 'auto') {
// Check max. used tax-rate from basket
$position['tax'] = $this->getMaxTaxRate();
diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json
index 020f5c2aadc..f196dc2bf83 100644
--- a/vendor-bin/cs-fixer/composer.json
+++ b/vendor-bin/cs-fixer/composer.json
@@ -1,6 +1,6 @@
{
"require-dev": {
- "friendsofphp/php-cs-fixer": "3.30.0",
+ "friendsofphp/php-cs-fixer": "3.37.1",
"kubawerlos/php-cs-fixer-custom-fixers": "3.16.2"
},
"sort-packages": true
diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock
index 0ee778dc817..e4cedb82552 100644
--- a/vendor-bin/cs-fixer/composer.lock
+++ b/vendor-bin/cs-fixer/composer.lock
@@ -4,21 +4,21 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "76fb5cc6a753441c64120e5da9d28356",
+ "content-hash": "e7642c7db2f04de1a82f1b385fe41167",
"packages": [],
"packages-dev": [
{
"name": "composer/pcre",
- "version": "3.1.0",
+ "version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
- "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
+ "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
- "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+ "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
"shasum": ""
},
"require": {
@@ -60,7 +60,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.1.0"
+ "source": "https://github.com/composer/pcre/tree/3.1.1"
},
"funding": [
{
@@ -76,7 +76,7 @@
"type": "tidelift"
}
],
- "time": "2022-11-17T09:50:14+00:00"
+ "time": "2023-10-11T07:11:09+00:00"
},
{
"name": "composer/semver",
@@ -227,16 +227,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.30.0",
+ "version": "v3.37.1",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "95c64693b2f149966a2bc05a7a4981b0343ea52f"
+ "reference": "c3fe76976081ab871aa654e872da588077e19679"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/95c64693b2f149966a2bc05a7a4981b0343ea52f",
- "reference": "95c64693b2f149966a2bc05a7a4981b0343ea52f",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/c3fe76976081ab871aa654e872da588077e19679",
+ "reference": "c3fe76976081ab871aa654e872da588077e19679",
"shasum": ""
},
"require": {
@@ -269,8 +269,6 @@
"phpspec/prophecy": "^1.16",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
- "phpunitgoodpractices/polyfill": "^1.6",
- "phpunitgoodpractices/traits": "^1.9.2",
"symfony/phpunit-bridge": "^6.2.3",
"symfony/yaml": "^5.4 || ^6.0"
},
@@ -310,7 +308,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.30.0"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.37.1"
},
"funding": [
{
@@ -318,7 +316,7 @@
"type": "github"
}
],
- "time": "2023-09-26T22:10:43+00:00"
+ "time": "2023-10-29T20:51:23+00:00"
},
{
"name": "kubawerlos/php-cs-fixer-custom-fixers",
@@ -1886,16 +1884,16 @@
},
{
"name": "symfony/string",
- "version": "v5.4.26",
+ "version": "v5.4.29",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "1181fe9270e373537475e826873b5867b863883c"
+ "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/1181fe9270e373537475e826873b5867b863883c",
- "reference": "1181fe9270e373537475e826873b5867b863883c",
+ "url": "https://api.github.com/repos/symfony/string/zipball/e41bdc93def20eaf3bfc1537c4e0a2b0680a152d",
+ "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d",
"shasum": ""
},
"require": {
@@ -1952,7 +1950,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v5.4.26"
+ "source": "https://github.com/symfony/string/tree/v5.4.29"
},
"funding": [
{
@@ -1968,7 +1966,7 @@
"type": "tidelift"
}
],
- "time": "2023-06-28T12:46:07+00:00"
+ "time": "2023-09-13T11:47:41+00:00"
}
],
"aliases": [],