-
Notifications
You must be signed in to change notification settings - Fork 83
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
coldic3
force-pushed
the
sylius1.12-symfony5.4
branch
7 times, most recently
from
October 13, 2022 06:40
9924de2
to
630c23b
Compare
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
Merged
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
force-pushed
the
sylius1.12-symfony5.4
branch
from
October 14, 2022 06:48
630c23b
to
5682d01
Compare
GSadee
approved these changes
Oct 14, 2022
coldic3
force-pushed
the
sylius1.12-symfony5.4
branch
from
October 17, 2022 10:38
5682d01
to
774eb0c
Compare
Co-authored-by: Jakub Tobiasz <jakub.tobiasz@icloud.com>
coldic3
force-pushed
the
sylius1.12-symfony5.4
branch
from
November 2, 2022 07:35
774eb0c
to
27e98bd
Compare
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
added
Maintenance
Configurations, READMEs, releases, etc.
Dependencies
Pull requests that update a dependency file
labels
Nov 2, 2022
GSadee
approved these changes
Nov 2, 2022
"sylius/grid-bundle": "^1.7", | ||
"sylius/resource-bundle": "^1.6", | ||
"sylius/sylius": "^1.11", | ||
"sylius/sylius": "^1.11 || ^1.12", |
There was a problem hiding this comment.
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, | ||
); | ||
} |
There was a problem hiding this comment.
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
Thank you, Kevin! 🥇 |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.