Update to upstream 3.6.0 and fix mailer transport decorator boot without SwagCommercial#3
Merged
Conversation
…t-decorator-boot-without-commercial # Conflicts: # composer.json
Register MailerTransportLoaderDecorator via services.xml against the SwagCommercial decorator with decoration-on-invalid="ignore", and drop the conditional class_exists() wrapper so the class is always declared. This stops the prototype autodiscovery from failing to boot on installations without SwagCommercial. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Replace services.xml with services.yaml. The prototype autodiscovery (excluding the decorator) and the explicit MailerTransportLoaderDecorator definition decorating the SwagCommercial decorator with decoration_on_invalid: ignore are unchanged in behaviour. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
avareldev
force-pushed
the
update/mail-archive-3.6.0-with-mailer-fix
branch
from
ce1fcea to
ea02395
Compare
The `version` field is intentionally omitted from composer.json in this fork. The shopware extension verifier flags this as a required-field error, so ignore the `metadata.version` identifier in .shopware-extension.yml. All other validation (PHPStan, ESLint, Stylelint, etc.) stays active. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
avareldev
force-pushed
the
update/mail-archive-3.6.0-with-mailer-fix
branch
from
38d9b17 to
81b9d00
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Brings the fork up to upstream 3.6.0 (
FriendsOfShopware/FroshPlatformMailArchive) and includes the mailer transport decorator boot fix.Changes
Update to upstream 3.6.0
Merged
upstream/main(release 3.6.0). New from upstream:feat: store mail template id(feat: store mail template id FriendsOfShopware/FroshPlatformMailArchive#140) — newMigration1770821445AddMailTemplateId, entity/definition fields, andMailSenderwiringfix: added column and table exists checks(fix: added column and table exists checks FriendsOfShopware/FroshPlatformMailArchive#141) — hardened migrationsfeat: make label of config clearer(feat: make label of config clearer FriendsOfShopware/FroshPlatformMailArchive#134)The only merge conflict was
composer.json'sversionfield, resolved by keeping it removed (consistent with this fork's earlierRemove version from composer.json).Fix: boot mailer transport decorator without SwagCommercial
MailerTransportLoaderDecoratorviaservices.xml, decorating the SwagCommercialQuoteMailerTransportLoaderDecoratorwithdecoration-on-invalid="ignore".class_exists()wrapper so the class is always declared.Verification
composer validatepasses.php -lclean on all touched files.🤖 Generated with Claude Code