VILA-967 update to shopware 6 7 (#79)

* prepare plugin for sw 6-7

* update npm packages

* run linter, update pipeline

* run linter, update pipeline

* update changelog

* update changelog

* update compose.yaml

* fix json

Author: rvalley98

.github/workflows/linting.yml

@@ -7,7 +7,7 @@ jobs:
 
         strategy:
             matrix:
-                php-version: [ 8.2, 8.3 ]
+                php-version: [ 8.2, 8.3 , 8.4]
 
         steps:
             -   name: Set up PHP
@@ -31,15 +31,15 @@ jobs:
                 run: 'composer install --prefer-dist --no-ansi --no-interaction --no-progress --optimize-autoloader'
 
             -   name: Run PHP CS Fixer
-                run: './vendor/bin/php-cs-fixer check'
+                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 ]
+                php-version: [ 8.2, 8.3, 8.4 ]
                 composer-strategy: [ lowest, stable ]
 
         steps:

CHANGELOG.md

@@ -4,6 +4,11 @@ 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.0] - 2025-07-11
+### Added
+- Added support for PHP 8.4
+- Added support for Shopware 6.7
+
 ## [3.1.0] - 2025-04-01
 ### Changed
 - Allow to use FQCN in fixture name filtering
@@ -180,6 +185,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `getNotSpecifiedSalutationId`
   - `getGermanCountryId`
 
+[4.0.0]: https://github.com/basecom/FixturesPlugin/compare/3.1.0...4.0.0
 [3.1.0]: https://github.com/basecom/FixturesPlugin/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/basecom/FixturesPlugin/compare/2.4.0...3.0.0
 [2.4.0]: https://github.com/basecom/FixturesPlugin/compare/2.3.0...2.4.0

docker-compose.yml compose.ymldocker-compose.yml renamed to compose.yml

@@ -1,8 +1,6 @@
-version: "3"
-
 services:
   shopware:
-    image: 'dockware/dev:6.6.1.1'
+    image: 'dockware/dev:6.7.0.0'
     ports:
       - "80:80"       # Webserver / Apache
       - "3306:3306"   # MySQL database
@@ -11,7 +9,7 @@ services:
       - "9999:9999"   # Storefront watcher (background)
       - "9998:9998"   # Storefront watcher (background)
     environment:
-      - 'XDEBUG_ENABLED=1'
+      - 'XDEBUG_ENABLED=0'
       - 'PHP_VERSION=8.3'
     volumes:
       - "./:/var/www/html/custom/static-plugins/plugin"

composer.json

@@ -35,15 +35,15 @@
         }
     },
     "require": {
-        "php": "^8.2 || ^8.3",
-        "shopware/core": "6.5.*|6.6.*",
-        "shopware/administration": "6.5.*|6.6.*",
-        "shopware/storefront": "6.5.*|6.6.*",
+        "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.59.3",
-        "phpstan/phpstan": "^1.10"
+        "friendsofphp/php-cs-fixer": "3.75.0",
+        "phpstan/phpstan": "^2.1.17"
     },
     "config": {
         "allow-plugins": {

package.json

@@ -3,8 +3,8 @@
   "private": true,
   "type": "module",
   "devDependencies": {
-    "prettier": "^3.2.5",
-    "vitepress": "^1.2.3"
+    "prettier": "^3.6.2",
+    "vitepress": "^1.6.3"
   },
   "scripts": {
     "docs:dev": "vitepress dev docs",

phpstan.neon

@@ -9,3 +9,4 @@ parameters:
         # This is ignored until we drop support for Shopware 6.5
         - message: '#Shopware\\Core\\Framework\\DataAbstractionLayer\\EntityRepository is not generic\.#'
           reportUnmatched: false
+        - '#Trait Basecom\\FixturePlugin\\FixtureTrait is used zero times and is not analysed#'

src/Command/LoadFixtureGroupCommand.php

@@ -35,7 +35,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $now = new \DateTimeImmutable();
         $io  = new SymfonyStyle($input, $output);
 
-        /** @var string $groupNameInput */
         $groupNameInput = $input->getArgument('groupName');
         $dry            = (bool) ($input->getOption('dry') ?? false);
         $vendor         = (bool) ($input->getOption('vendor') ?? false);

src/Command/LoadSingleFixtureCommand.php

@@ -37,7 +37,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $now = new \DateTimeImmutable();
         $io  = new SymfonyStyle($input, $output);
 
-        /** @var string $fixtureName */
         $fixtureName      = $input->getArgument('fixtureName');
         $dry              = (bool) ($input->getOption('dry') ?? false);
         $withDependencies = (bool) ($input->getOption('with-dependencies') ?? false);

src/FixtureLoader.php

@@ -147,7 +147,7 @@ private function checkDependenciesAreInSameGroup(
 
         foreach ($dependencies as $dependency) {
             if (!\in_array(strtolower($dependency), $inGroup, true)) {
-                $io?->error(sprintf("Dependency '%s' of fixture '%s' is not in group '%s'", $dependency, $fixture::class, $groupName));
+                $io?->error(\sprintf("Dependency '%s' of fixture '%s' is not in group '%s'", $dependency, $fixture::class, $groupName));
 
                 return false;
             }

src/Utils/CategoryUtils.php

@@ -41,7 +41,7 @@ public function getRootCategory(): ?CategoryEntity
                 ->addFilter(new EqualsFilter('level', 1))
                 ->setLimit(1);
 
-            $criteria->setTitle(sprintf('%s::%s()', __CLASS__, __FUNCTION__));
+            $criteria->setTitle(\sprintf('%s::%s()', __CLASS__, __FUNCTION__));
 
             $category = $this->categoryRepository
                 ->search($criteria, Context::createDefaultContext())