Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.x] Carbon 3 #11348

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[6.x] Carbon 3 #11348

wants to merge 8 commits into from

Conversation

duncanmcclean
Copy link
Member

@duncanmcclean duncanmcclean commented Jan 13, 2025

This pull request adds support for Carbon 3.

Since it's an optional upgrade, and we have to support both Carbon 2 & 3 anyway (since Laravel 11 supports both versions), I figured we could merge this into 5.x without needing to wait until Statamic 6.

@duncanmcclean duncanmcclean changed the title [6.x] Carbon 3 [5.x] Carbon 3 Jan 13, 2025
@duncanmcclean duncanmcclean changed the base branch from master to 5.x January 13, 2025 15:17
@duncanmcclean duncanmcclean marked this pull request as ready for review January 13, 2025 15:20
Copy link
Member

@jasonvarga jasonvarga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep this targeting master.

If someone does a composer update and unintentionally upgrades to Carbon 3, there might be some breaking changes they'd need to deal with.

@duncanmcclean duncanmcclean changed the base branch from 5.x to master January 22, 2025 17:10
@duncanmcclean duncanmcclean changed the title [5.x] Carbon 3 [6.x] Carbon 3 Jan 22, 2025
@duncanmcclean
Copy link
Member Author

Changed the target branch back to master.

I've kept the Carbon v2 logic for now as Laravel 11 supports it alongside v3. We can probably remove it in Statamic 7?

@jasonvarga
Copy link
Member

Yup keeping v2 is good 👌

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