Skip to content

Conflict API Platform#17763

Merged
GSadee merged 2 commits intoSylius:2.0from
mpysiak:conflict-apip-and-fix-builds
Mar 25, 2025
Merged

Conflict API Platform#17763
GSadee merged 2 commits intoSylius:2.0from
mpysiak:conflict-apip-and-fix-builds

Conversation

@mpysiak
Copy link
Copy Markdown
Member

@mpysiak mpysiak commented Mar 20, 2025 •
edited
Loading

Q A
Branch? 2.0
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Related tickets fixes failing CI on 2.x
License MIT

@probot-autolabeler probot-autolabeler bot added Documentation Documentation related issues and PRs - requests, fixes, proposals. Maintenance CI configurations, READMEs, releases, etc. labels Mar 20, 2025
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 20, 2025 •
edited
Loading

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.

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.
    • Generate unit testing code for this file.
    • 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. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • 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 src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai plan to trigger planning for file edits and PR creation.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

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

Documentation and Community

  • 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 Mar 20, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands:

  • 🚀 /bns:deploy to redeploy the environment

@mpysiak mpysiak force-pushed the conflict-apip-and-fix-builds branch from 15babc7 to e4bfc17 Compare March 21, 2025 05:43
@mpysiak mpysiak changed the base branch from 2.1 to 2.0 March 21, 2025 05:46
@mpysiak mpysiak force-pushed the conflict-apip-and-fix-builds branch 2 times, most recently from 358e29a to 20d66dd Compare March 21, 2025 05:49
@mpysiak mpysiak closed this Mar 21, 2025
@mpysiak mpysiak reopened this Mar 21, 2025
@mpysiak mpysiak force-pushed the conflict-apip-and-fix-builds branch 2 times, most recently from 9cf6d30 to 28f37cf Compare March 25, 2025 05:26
@probot-autolabeler probot-autolabeler bot added the API APIs related issues and PRs. label Mar 25, 2025
@mpysiak mpysiak changed the title Conflict apip and fix builds Conflict API Platform Mar 25, 2025
@mpysiak mpysiak marked this pull request as ready for review March 25, 2025 05:27
@mpysiak mpysiak requested review from a team as code owners March 25, 2025 05:27
@mpysiak mpysiak force-pushed the conflict-apip-and-fix-builds branch from 28f37cf to af2124d Compare March 25, 2025 05:37
GSadee
GSadee reviewed Mar 25, 2025
View reviewed changes
@mpysiak mpysiak force-pushed the conflict-apip-and-fix-builds branch from af2124d to a12507d Compare March 25, 2025 05:40
@GSadee GSadee added Dependencies Pull requests that update a dependency file and removed Documentation Documentation related issues and PRs - requests, fixes, proposals. labels Mar 25, 2025
@GSadee GSadee merged commit 1b27a65 into Sylius:2.0 Mar 25, 2025
25 of 27 checks passed
@GSadee GSadee mentioned this pull request May 23, 2025
Merged
mpysiak added a commit that referenced this pull request May 23, 2025
@mpysiak
[Composer] Bump APIP to 4.1 and remove conflict to api-platform/json-…
1f09e31 
…ld (#18063)

| Q               | A
|-----------------|-----
| Branch?         | 2.1
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | fixes #17763
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.14 or 2.0 branch
 - Features and deprecations must be submitted against the 2.1 branch
 - Make sure that the correct base branch is set

To be sure you are not breaking any Backward Compatibilities, check the
documentation:

https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


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

## Summary by CodeRabbit

- **Chores**
- Updated dependencies to require newer versions of key packages for
improved compatibility.
- Removed restrictions related to a previously conflicting package
version.
  - Deleted outdated documentation regarding dependency conflicts.

<!-- 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

@GSadee GSadee GSadee approved these changes

Assignees

No one assigned

Labels

API APIs related issues and PRs. Dependencies Pull requests that update a dependency file Maintenance CI configurations, READMEs, releases, etc.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mpysiak @GSadee