Skip to content

[Composer][1.14] More specific confflict with serializer#18302

Merged
TheMilek merged 1 commit intoSylius:1.14from
Jibbarth:patch-1
Aug 20, 2025
Merged

[Composer][1.14] More specific confflict with serializer#18302
TheMilek merged 1 commit intoSylius:1.14from
Jibbarth:patch-1

Conversation

@Jibbarth
Copy link
Copy Markdown
Contributor

@Jibbarth Jibbarth commented Aug 14, 2025

Q A
Branch? 1.14
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Related tickets #18195
License MIT

The bug raised in #18195 as been revert in symfony/serializer in 6.4.24 (cf symfony/symfony#60958)

I guess we can target the conflict only on 6.4.23 now.

@Jibbarth Jibbarth requested a review from a team as a code owner August 14, 2025 07:09
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Aug 14, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing Touches
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR/Issue comments)

Type @coderabbitai help to get the list of available commands.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Status, Documentation and Community

  • Visit our Status Page to check the current availability of CodeRabbit.
  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Aug 14, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands:

  • 🚀 /bns:deploy to redeploy the environment

@TheMilek TheMilek merged commit ebf70b4 into Sylius:1.14 Aug 20, 2025
72 of 74 checks passed
@TheMilek TheMilek mentioned this pull request Sep 4, 2025
Closed
@Jibbarth Jibbarth deleted the patch-1 branch September 9, 2025 11:37
@alisolphp alisolphp mentioned this pull request Oct 20, 2025
Merged
Rafikooo added a commit that referenced this pull request Oct 21, 2025
@Rafikooo
[Changelog] Fix obvious typos in 2.1 changelog (#18461)
21428cc 
| Q               | A
|-----------------|-----
| Branch?         | 2.1
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | –
| License         | MIT

### Summary
Fix four obvious typos in `CHANGELOG-2.1.md`:
- `Uploud` → `Upload` (v2.1.5, PR #18286)
- `confflict` → `conflict` (v2.1.5, PR #18302)
- `nessecary` → `necessary` (v2.1.5, PR #18342)
- `lables` → `labels` (v2.1.2, PR #18180)

### Notes
- Minimal diffs only; no punctuation/style changes.
- Code, identifiers, and formatting are untouched.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **Documentation**
* Corrected typos in changelog entries for improved readability and
clarity.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TheMilek TheMilek TheMilek approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Jibbarth @TheMilek