diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 01df019ddcf..6b6347c1f1f 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -14,7 +14,7 @@ jobs: php: strategy: matrix: - php: ['7.4', '8.0', '8.1', '8.2'] + php: ['7.4', '8.0', '8.1', '8.2', '8.3'] mysql: ['pkgs.mysql80'] runs-on: ubuntu-latest steps: diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md index d9b09206409..6483de47d8b 100644 --- a/UPGRADE-5.7.md +++ b/UPGRADE-5.7.md @@ -6,6 +6,11 @@ This changelog references changes done in Shopware 5.7 patch versions. [View all changes from v5.7.19...v5.7.20](https://github.com/shopware5/shopware/compare/v5.7.19...v5.7.20) +### Additions + +* Added compatibility with PHP 8.3 +* Added new polyfill `symfony/polyfill-php83` to be able to use PHP 8.3 features + ### Changes * Changed behaviour of the translation transfer while setting a product variant as the main variant diff --git a/composer.json b/composer.json index 3a5e8795a5d..c113e271f1b 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "issues": "https://issues.shopware.com" }, "require": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "ext-ctype": "*", "ext-curl": "*", "ext-date": "*", @@ -84,6 +84,7 @@ "symfony/polyfill-php80": "^1.23", "symfony/polyfill-php81": "^1.23", "symfony/polyfill-php82": "^1.26", + "symfony/polyfill-php83": "^1.28", "symfony/process": "~4.4.34", "symfony/serializer": "~5.4.0", "symfony/validator": "~4.4.34", diff --git a/composer.lock b/composer.lock index d22096c5f46..f78c0951554 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": "1d25b5a3d868b27da86b27c330b6bf81", + "content-hash": "b0ea6c0efc0378d9808bdb6072617119", "packages": [ { "name": "aws/aws-crt-php", @@ -6169,6 +6169,86 @@ ], "time": "2023-08-25T17:27:25+00:00" }, + { + "name": "symfony/polyfill-php83", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php83.git", + "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11", + "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "symfony/polyfill-php80": "^1.14" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php83\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php83/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-08-16T06:22:46+00:00" + }, { "name": "symfony/process", "version": "v4.4.44", @@ -10528,7 +10608,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "ext-ctype": "*", "ext-curl": "*", "ext-date": "*", diff --git a/recovery/common/composer.json b/recovery/common/composer.json index c3bfab730d5..cd2632a4d6f 100644 --- a/recovery/common/composer.json +++ b/recovery/common/composer.json @@ -1,6 +1,6 @@ { "require": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "knplabs/gaufrette": "0.11.1", "pimple/pimple": "3.5.0", "slim/slim": "2.6.3", diff --git a/recovery/common/composer.lock b/recovery/common/composer.lock index d3069143ba3..6d60879c133 100644 --- a/recovery/common/composer.lock +++ b/recovery/common/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": "5e12e58996c7d623ea395eeaf95a1a88", + "content-hash": "c6ceb3b9ec9de94345bd1d0c524c235a", "packages": [ { "name": "knplabs/gaufrette", @@ -1381,7 +1381,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "platform-dev": [], "plugin-api-version": "2.3.0"