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

Add support for Symfony 6.4 #809

Merged
merged 1 commit into from
Dec 1, 2023

Conversation

loic425
Copy link
Member

@loic425 loic425 commented Dec 1, 2023

Q A
Bug fix? yes (cause we do not exclude it on composer)
New feature? no
BC breaks? no
Deprecations? no
Related tickets
License MIT

@loic425 loic425 requested a review from a team as a code owner December 1, 2023 09:28
@loic425 loic425 changed the base branch from 1.11 to 1.10 December 1, 2023 09:29
@loic425 loic425 closed this Dec 1, 2023
@loic425 loic425 reopened this Dec 1, 2023
/**
* @internal
*/
trait ContainerAwareTrait
Copy link
Member Author

Choose a reason for hiding this comment

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

I've copied the Symfony trait cause it's now deprecated

Copy link
Member

Choose a reason for hiding this comment

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

It is deprecated but not removed in 6.4, so do we really need to copy it in this version? 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah but it's removed on 7.0... But right, maybe adding it in 1.11 (the current development one which contains the new resource metadata system).

@@ -71,6 +71,7 @@
"sylius/grid-bundle": "^1.7 || v1.12.0-ALPHA.1",
"symfony/dependency-injection": "^5.4 || ^6.0",
"symfony/dotenv": "^5.4 || ^6.0",
"symfony/stopwatch": "^5.4 || ^6.0",
Copy link
Member Author

@loic425 loic425 Dec 1, 2023

Choose a reason for hiding this comment

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

I've added this cause there is a bug with workflow without stopwatch.
These 2 ones are on dev requirements

/*
* This file is part of the Sylius package.
*
* (c) Paweł Jędrzejewski
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
* (c) Paweł Jędrzejewski
* (c) Sylius Sp. z o.o.

Copy link
Member Author

Choose a reason for hiding this comment

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

We did this on the 1.11 branch, but not on the 1.10 (for bugfix)

/**
* @internal
*/
trait ContainerAwareTrait
Copy link
Member

Choose a reason for hiding this comment

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

It is deprecated but not removed in 6.4, so do we really need to copy it in this version? 🤔

tests/Application/config/db.sql Outdated Show resolved Hide resolved
@loic425 loic425 force-pushed the fix/support-for-symfony-6.4 branch 2 times, most recently from 60daf2d to cd37a8d Compare December 1, 2023 13:24
@GSadee GSadee merged commit 2c9637b into Sylius:1.10 Dec 1, 2023
21 checks passed
@GSadee
Copy link
Member

GSadee commented Dec 1, 2023

Thank you, Loïc! 🎉

@GSadee GSadee added the Maintenance Configurations, READMEs, releases, etc. label Dec 1, 2023
@loic425 loic425 deleted the fix/support-for-symfony-6.4 branch December 1, 2023 16:07
GSadee added a commit that referenced this pull request Dec 6, 2023
… 2.0 (GSadee, loic425)

This PR was merged into the 1.11 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | after #809 
| License         | MIT

Fix after upmerge

Commits
-------

1983dc7 [CI] Exclude builds for Symfony 6.4 and doctrine/persistence 2.0
891cdf4 Fix PHPUnit tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Maintenance Configurations, READMEs, releases, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants