From f150bc02e1712de9314a03130d8f2805b9b7f021 Mon Sep 17 00:00:00 2001 From: Lars Kemper Date: Wed, 15 Apr 2026 10:27:02 +0200 Subject: [PATCH 1/3] ci: pin migration assistant version --- .github/actions/setup-magento-plugin/action.yml | 7 ++++++- composer.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-magento-plugin/action.yml b/.github/actions/setup-magento-plugin/action.yml index 5ea3af61..255008b5 100644 --- a/.github/actions/setup-magento-plugin/action.yml +++ b/.github/actions/setup-magento-plugin/action.yml @@ -18,6 +18,10 @@ inputs: default: "trunk" required: false description: "Which Shopware version should be used" + migration-assistant-ref: + default: "16.2.0" + required: false + description: "Which SwagMigrationAssistant ref should be used" runs: using: composite @@ -48,6 +52,7 @@ runs: [ { "name": "SwagMigrationAssistant", - "repo": "https://github.com/shopware/SwagMigrationAssistant.git" + "repo": "https://github.com/shopware/SwagMigrationAssistant.git", + "branch": "${{ inputs.migration-assistant-ref }}" } ] diff --git a/composer.json b/composer.json index 823dfac2..bbc37283 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "shopware/core": "~6.7", - "swag/migration-assistant": "~16.1" + "swag/migration-assistant": "16.2.0" }, "extra": { "shopware-plugin-class": "Swag\\MigrationMagento\\SwagMigrationMagento", From 8fd6fa14fc24c79471647e42daaf34ed9c87817f Mon Sep 17 00:00:00 2001 From: Lars Kemper Date: Wed, 15 Apr 2026 10:35:13 +0200 Subject: [PATCH 2/3] fix: remove redundant phpstan config --- phpstan.neon.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 7a7076a4..932ac57d 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -15,7 +15,6 @@ parameters: scanDirectories: - ../SwagMigrationAssistant/src - - ../SwagMigrationAssistant/tests symfony: constantHassers: false @@ -45,4 +44,3 @@ parameters: # TODO: https://github.com/shopware/shopware/issues/16034 - identifier: empty.notAllowed - From 7e66dabfac8d7cbdb9c589f69513013ca7e0afa0 Mon Sep 17 00:00:00 2001 From: Lars Kemper Date: Wed, 15 Apr 2026 13:52:10 +0200 Subject: [PATCH 3/3] ci: fetch test dir --- .github/actions/setup-magento-plugin/action.yml | 6 ++++++ phpstan.neon.dist | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.github/actions/setup-magento-plugin/action.yml b/.github/actions/setup-magento-plugin/action.yml index 255008b5..00263866 100644 --- a/.github/actions/setup-magento-plugin/action.yml +++ b/.github/actions/setup-magento-plugin/action.yml @@ -56,3 +56,9 @@ runs: "branch": "${{ inputs.migration-assistant-ref }}" } ] + + - name: Fetch SwagMigrationAssistant tests for PHPStan + shell: bash + run: | + git -C custom/plugins/SwagMigrationAssistant fetch origin trunk + git -C custom/plugins/SwagMigrationAssistant checkout origin/trunk -- tests/ diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 932ac57d..7a7076a4 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -15,6 +15,7 @@ parameters: scanDirectories: - ../SwagMigrationAssistant/src + - ../SwagMigrationAssistant/tests symfony: constantHassers: false @@ -44,3 +45,4 @@ parameters: # TODO: https://github.com/shopware/shopware/issues/16034 - identifier: empty.notAllowed +