Skip to content

feat: add shopware/conflicts composer repository to generated composer.json#1160

Merged
Soner (shyim) merged 1 commit into
mainfrom
add-conflicts-composer-repository
Jul 4, 2026
Merged

feat: add shopware/conflicts composer repository to generated composer.json#1160
Soner (shyim) merged 1 commit into
mainfrom
add-conflicts-composer-repository

Conversation

@shyim

Copy link
Copy Markdown
Member

Why

The shopware/conflicts package will be served from a composer repository hosted on GitHub Pages (https://shopware.github.io/conflicts/), and shopware/platform is adding that repository to its own composer.json. Since composer only honors repositories defined in the root package, projects created or migrated by shopware-cli need the entry themselves.

What

  • project create (packagist.GenerateComposerJson): the generated composer.json now always contains the conflicts composer repository alongside the existing path repositories.
  • Flex migration (flexmigrator.MigrateComposerJson): adds the repository when it is missing, guarded by HasRepository so an existing entry is not duplicated.
  • Tests for both paths, including a case that verifies the repository appears exactly once when it already exists before migration.

🤖 Generated with Claude Code

…r.json

The shopware/conflicts package will be served from a composer repository
on GitHub Pages. Since composer only honors repositories of the root
package, projects need the repository entry themselves:

- project create: always include it in the generated composer.json
- flex migration: add it when missing, without duplicating an existing entry

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 47.35%. Comparing base (345d5cd) to head (7b44dfc).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1160      +/-   ##
==========================================
+ Coverage   47.33%   47.35%   +0.02%     
==========================================
  Files         230      230              
  Lines       16501    16509       +8     
==========================================
+ Hits         7810     7818       +8     
  Misses       8691     8691              
Flag Coverage Δ
go-test 47.35% <100.00%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@shyim Soner (shyim) merged commit 735d1b5 into main Jul 4, 2026
3 checks passed
@shyim Soner (shyim) deleted the add-conflicts-composer-repository branch July 4, 2026 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants