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

[Maintenance] Add support for Sylius 1.12 with Symfony 5.4 #294

Merged
merged 7 commits into from
Nov 2, 2022

Conversation

coldic3
Copy link
Contributor

@coldic3 coldic3 commented Oct 12, 2022

To be merged on Sylius 1.12 release 💃

It could be a nice intermediate step. Support for Symfony 6 is added in a separate PR: #296.

@coldic3 coldic3 requested a review from a team as a code owner October 12, 2022 11:27
@coldic3 coldic3 force-pushed the sylius1.12-symfony5.4 branch 7 times, most recently from 9924de2 to 630c23b Compare October 13, 2022 06:40
@coldic3 coldic3 changed the title [Maintenance] Add support for Sylius 1.12 but without Symfony 6 [Maintenance] Add support for Sylius 1.12 with Symfony 5.4 Oct 13, 2022
@coldic3 coldic3 mentioned this pull request Oct 13, 2022
@coldic3 coldic3 changed the title [Maintenance] Add support for Sylius 1.12 with Symfony 5.4 [WIP][Maintenance] Add support for Sylius 1.12 with Symfony 5.4 Oct 13, 2022
@coldic3 coldic3 changed the title [WIP][Maintenance] Add support for Sylius 1.12 with Symfony 5.4 [Maintenance] Add support for Sylius 1.12 with Symfony 5.4 Nov 2, 2022
@GSadee GSadee added Maintenance Configurations, READMEs, releases, etc. Dependencies Pull requests that update a dependency file labels Nov 2, 2022
"sylius/grid-bundle": "^1.7",
"sylius/resource-bundle": "^1.6",
"sylius/sylius": "^1.11",
"sylius/sylius": "^1.11 || ^1.12",
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
"sylius/sylius": "^1.11 || ^1.12",
"sylius/sylius": "^1.11",

is enough

Comment on lines +126 to +136
if (SyliusKernel::MINOR_VERSION > 11) {
$contents = array_merge(
['League\FlysystemBundle\FlysystemBundle' => ['all' => true]],
$contents,
);
} else {
$contents = array_merge(
['Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle' => ['all' => true]],
$contents,
);
}
Copy link
Member

Choose a reason for hiding this comment

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

Move it to bundles file as we did in other plugins

@GSadee GSadee merged commit 205b2a7 into main Nov 2, 2022
@GSadee
Copy link
Member

GSadee commented Nov 2, 2022

Thank you, Kevin! 🥇

@GSadee GSadee deleted the sylius1.12-symfony5.4 branch November 2, 2022 13:36
GSadee added a commit that referenced this pull request Nov 8, 2022
This PR was merged into the main branch.

Discussion
----------

To be merged on Sylius 1.12 release 💃

In addition, #295 and #294 should be merged before this one then the rebase will be needed.

Commits
-------

0f042d1 [GitHub Actions] Add Sylius 1.12 to the matrix
6a72609 [Maintenance] Add support for Symfony 6
4e8db27 [Maintenance] Fix Kernel.php and app configs
1f46157 [Maintenance] Adjust services to Sylius 6
85c8280 [Maintenance] Remove SymfonyMockerContainer fork
61b084f [Composer] Restrict Sylius to 1.11 or 1.12
4d9d941 [GitHub Actions] Bump node version
ce1b0ed [GitHub Actions] Remove exlusion of Sylius 1.12 during composer analyse
029c64f Add exclusion to PHPStan
16d6529 [PHPStan] Move directory to configuration file
dfbc661 [PHPStan] Temporarily exclude composer analyse on Sylius 1.12
1f517f5 [GitHub Actions] Force the newest version of Sylius 1.11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dependencies Pull requests that update a dependency file Maintenance Configurations, READMEs, releases, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants