From 353e5b4dc195370c530a38f376b4e800e9169a18 Mon Sep 17 00:00:00 2001 From: Jordan Kniest Date: Fri, 24 Apr 2026 09:35:32 +0200 Subject: [PATCH 1/4] [PHP-85] Allow php8.5 --- .github/workflows/linting.yml | 160 +++++++++++++++++----------------- composer.json | 102 +++++++++++----------- 2 files changed, 131 insertions(+), 131 deletions(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 50da9ab..5314451 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -1,83 +1,83 @@ name: Linting on: [push] jobs: - php-cs-fixer: - name: PHP-CS-Fixer - runs-on: ubuntu-latest - - strategy: - matrix: - php-version: [ 8.2, 8.3 , 8.4] - - steps: - - name: Set up PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - - - name: Check out code - uses: actions/checkout@v4 - - - name: Cache Composer packages - id: composer-cache - uses: actions/cache@v4 - with: - path: vendor - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-php- - - - name: Install dependencies - run: 'composer install --prefer-dist --no-ansi --no-interaction --no-progress --optimize-autoloader' - - - name: Run PHP CS Fixer - run: 'PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer check' - - phpstan: - name: PHPStan - runs-on: ubuntu-latest - - strategy: - matrix: - php-version: [ 8.2, 8.3, 8.4 ] - composer-strategy: [ lowest, stable ] - - steps: - - name: Set up PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - - - name: Check out code - uses: actions/checkout@v4 - - - name: Cache Composer packages - id: composer-cache - uses: actions/cache@v4 - with: - path: vendor - key: ${{ runner.os }}-php-strategy-${{ matrix.composer-strategy }}-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-php-strategy-${{ matrix.composer-strategy }}- - - - name: Install dependencies - run: 'composer update -W --prefer-${{ matrix.composer-strategy }} --no-ansi --no-interaction --no-progress --optimize-autoloader' - - - name: Run PHPStan - run: './vendor/bin/phpstan analyse --memory-limit=1G' - - prettier: - name: Prettier - runs-on: ubuntu-latest - - steps: - - name: Check out code - uses: actions/checkout@v4 - - - uses: oven-sh/setup-bun@v1 - - - name: Install dependencies - run: bun install - - - name: Run Prettier - run: './node_modules/.bin/prettier --check "src/**/*.{js,scss,yaml,yml,json,md,ts}"' + php-cs-fixer: + name: PHP-CS-Fixer + runs-on: ubuntu-latest + + strategy: + matrix: + php-version: [8.2, 8.3, 8.4, 8.5] + + steps: + - name: Set up PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + + - name: Check out code + uses: actions/checkout@v4 + + - name: Cache Composer packages + id: composer-cache + uses: actions/cache@v4 + with: + path: vendor + key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-php- + + - name: Install dependencies + run: "composer install --prefer-dist --no-ansi --no-interaction --no-progress --optimize-autoloader" + + - name: Run PHP CS Fixer + run: "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer check" + + phpstan: + name: PHPStan + runs-on: ubuntu-latest + + strategy: + matrix: + php-version: [8.2, 8.3, 8.4, 8.5] + composer-strategy: [lowest, stable] + + steps: + - name: Set up PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + + - name: Check out code + uses: actions/checkout@v4 + + - name: Cache Composer packages + id: composer-cache + uses: actions/cache@v4 + with: + path: vendor + key: ${{ runner.os }}-php-strategy-${{ matrix.composer-strategy }}-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-php-strategy-${{ matrix.composer-strategy }}- + + - name: Install dependencies + run: "composer update -W --prefer-${{ matrix.composer-strategy }} --no-ansi --no-interaction --no-progress --optimize-autoloader" + + - name: Run PHPStan + run: "./vendor/bin/phpstan analyse --memory-limit=1G" + + prettier: + name: Prettier + runs-on: ubuntu-latest + + steps: + - name: Check out code + uses: actions/checkout@v4 + + - uses: oven-sh/setup-bun@v1 + + - name: Install dependencies + run: bun install + + - name: Run Prettier + run: './node_modules/.bin/prettier --check "src/**/*.{js,scss,yaml,yml,json,md,ts}"' diff --git a/composer.json b/composer.json index d684ed6..36119ee 100644 --- a/composer.json +++ b/composer.json @@ -1,53 +1,53 @@ { - "name": "basecom/sw6-fixtures-plugin", - "description": "basecom Fixtures Plugin", - "type": "shopware-platform-plugin", - "license": "proprietary", - "authors": [ - { - "name": "basecom GmbH & Co. KG", - "email": "info@basecom.de", - "homepage": "https://basecom.de", - "role": "Manufacturer" - } - ], - "autoload": { - "psr-4": { - "Basecom\\FixturePlugin\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "Basecom\\FixturePlugin\\Tests\\": "tests/" - } - }, - "extra": { - "shopware-plugin-class": "Basecom\\FixturePlugin\\BasecomFixturePlugin", - "label": { - "de-DE": "basecom Fixture Plugin", - "en-GB": "basecom Fixture Plugin" - }, - "copyright": "(c) basecom GmbH & Co. KG", - "plugin-icon": "src/Resources/config/plugin.png", - "description": { - "de-DE": "Erlaubt das Generieren von Demo-Daten", - "en-GB": "Allows the generation of demo data" - } - }, - "require": { - "php": "^8.2 || ^8.3 ||^8.4", - "shopware/core": "6.5.*|6.6.*|6.7.*", - "shopware/administration": "6.5.*|6.6.*|6.7.*", - "shopware/storefront": "6.5.*|6.6.*|6.7.*", - "spatie/once": "^3.1" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "3.93.0", - "phpstan/phpstan": "^2.1.17" - }, - "config": { - "allow-plugins": { - "symfony/runtime": true - } - } + "name": "basecom/sw6-fixtures-plugin", + "description": "basecom Fixtures Plugin", + "type": "shopware-platform-plugin", + "license": "proprietary", + "authors": [ + { + "name": "basecom GmbH & Co. KG", + "email": "info@basecom.de", + "homepage": "https://basecom.de", + "role": "Manufacturer" + } + ], + "autoload": { + "psr-4": { + "Basecom\\FixturePlugin\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Basecom\\FixturePlugin\\Tests\\": "tests/" + } + }, + "extra": { + "shopware-plugin-class": "Basecom\\FixturePlugin\\BasecomFixturePlugin", + "label": { + "de-DE": "basecom Fixture Plugin", + "en-GB": "basecom Fixture Plugin" + }, + "copyright": "(c) basecom GmbH & Co. KG", + "plugin-icon": "src/Resources/config/plugin.png", + "description": { + "de-DE": "Erlaubt das Generieren von Demo-Daten", + "en-GB": "Allows the generation of demo data" + } + }, + "require": { + "php": "^8.2 || ^8.3 || ^8.4 || ^8.5", + "shopware/core": "6.5.*|6.6.*|6.7.*", + "shopware/administration": "6.5.*|6.6.*|6.7.*", + "shopware/storefront": "6.5.*|6.6.*|6.7.*", + "spatie/once": "^3.1" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "3.93.0", + "phpstan/phpstan": "^2.1.17" + }, + "config": { + "allow-plugins": { + "symfony/runtime": true + } + } } From 797e9c0ef36a6714ff01531e1fe87ce7ef773321 Mon Sep 17 00:00:00 2001 From: Jordan Kniest Date: Fri, 24 Apr 2026 09:38:52 +0200 Subject: [PATCH 2/4] [PHP-85] Add table --- docs/supported-versions.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/supported-versions.md b/docs/supported-versions.md index 11d72e0..75af2f6 100644 --- a/docs/supported-versions.md +++ b/docs/supported-versions.md @@ -2,14 +2,14 @@ Please use the following table to check which version of the FixturePlugin can be used with your PHP and Shopware versions: -| Shopware Version | PHP Versions | Newest FixturePlugin version | Supported | -| ------------------ | -------------- | ------------------------------ | ----------- | -| 6.7.* | v8.2, v8.3, v8.4 | v3.2.* | ✅ | -| 6.6.* | v8.2, v8.3 | v3.2.* | ✅ | -| 6.5.* | v8.2, v8.3 | v3.2.* | ✅ | -| 6.5.* | v8.1 | v2.0.* | ❌ | -| 6.4.* | v8.1, v8.2 | v2.0.* | ❌ | -| 6.3.* | v8.1, v8.2 | v2.0.* | ❌ | +| Shopware Version | PHP Versions | Newest FixturePlugin version | Supported | +| ---------------- | ---------------------- | ---------------------------- | --------- | +| 6.7.* | v8.2, v8.3, v8.4, v8.5 | v3.2.* | ✅ | +| 6.6.* | v8.2, v8.3 | v3.2.* | ✅ | +| 6.5.* | v8.2, v8.3 | v3.2.* | ✅ | +| 6.5.* | v8.1 | v2.0.* | ❌ | +| 6.4.* | v8.1, v8.2 | v2.0.* | ❌ | +| 6.3.* | v8.1, v8.2 | v2.0.* | ❌ | :::info We strive to support new Shopware and PHP versions as quickly as possible. If there is a new version out and it is not yet supported, feel free to contribute and help us expedite the update process! From 28ac18a4e880905a1432621c6a05ddecb89309d1 Mon Sep 17 00:00:00 2001 From: Jordan Kniest Date: Fri, 24 Apr 2026 09:51:08 +0200 Subject: [PATCH 3/4] [PHP-85] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ceed4a0..2187e90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.2.2] - 2026-04-24 +### Added +- Added support for PHP 8.4 + ## [3.2.1] - 2025-11-10 ### Fixed - Admin build issue in Shopware 6.7 From 9c930a5a9b1df79f83eb6a852b9fa600f64c6d31 Mon Sep 17 00:00:00 2001 From: Jordan Kniest Date: Fri, 24 Apr 2026 16:59:45 +0200 Subject: [PATCH 4/4] Apply suggestion from @xabbuh Co-authored-by: Christian Flothmann --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2187e90..e29dd10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [3.2.2] - 2026-04-24 ### Added -- Added support for PHP 8.4 +- Added support for PHP 8.5 ## [3.2.1] - 2025-11-10 ### Fixed