[UPMERGE] 1.13 -> 2.0 #15519
Merged
[UPMERGE] 1.13 -> 2.0 #15519
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
Co-authored-by: Dmitri Perunov <diimpp@gmail.com>
…ojdylak) This PR was merged into the 1.13 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.13 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | N/A | License | MIT Commits ------- 96aee9f [ApiBundle] Add TranslatableLocaleKeyDenormalizer class 0bc4efe [AttributeBundle] Add validation on locale of translation 24e3500 [ProductBundle] Add validation on locale of translation a079062 [PromotionBundle] Add validation on locale of translation 5d1b951 [ShippingBundle] Add validation on locale of translation db58b52 [TaxonomyBundle] Add validation on locale of translation b070c24 [ApiBundle] Add contract test to check validation of locale a27f5c2 [ApiBundle] Improve readability aceb04b Standardize locale validation translations 4ec72b5 [AttributeBundle] Standardize locale validation translations 91ba39e [PromotionBundle] Remove unnecessary constraint 64cfae4 [ApiBundle] Fix type-hint b557adb [ApiBundle] Translation key as locale 504afcf [ApiBundle] Remove unnecessary method in TranslatableLocaleKeyDenormalizer a5f132c [ApiBundle] Fix ProductAssociationTypesTest
… tokens (Wojdylak) This PR was merged into the 1.13 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.13 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | #13902 | License | MIT Commits ------- [UserBundle] Implement TTL validation for password reset tokens [ApiBundle] Add ttl type-hint [UserBundle] Change type-hint
…(mamazu) This PR was merged into the 1.13 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.13 | | Bug fix? | performance fix | | New feature? | no | | BC breaks? | no | | Deprecations? | no | | Related tickets | - | | License | MIT | ## The problem Currently we have a user database of about 1 million users and we noticed that resetting your password is rather slow. It turns out that there isn't any index on neither the password reset nor the verification token. ## The solution The simplest solution would be to add an index to those fields and call it a day. But we can do even better. We know that those tokens are unique. Because all throughout the Sylius application those fields are queried with the `findOneBy` which crashes on result sets bigger than one. So adding a unique constraint should not break backwards compatibility (except for already broken entries). ## What still needs to be done I still need to generate a migration that actually adds those indices to the database. I will do that when the base idea of the PR is accepted. Commits ------- Making the verification and password reset token unqiue Implementing suggestions Update src/Sylius/Bundle/CoreBundle/Migrations/Version20231103004216.php Removing useless files Fixing minor issues
…-checkout-nvp` (Prometee) This PR was merged into the 1.13 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.12 | | Bug fix? | yes | | New feature? | no | | BC breaks? | no | | Deprecations? | no | | Related tickets | none | | License | MIT | See this comment for more explanations : #14805 (comment) This PR also add a way to not use `payum/paypal-express-checkout-nvp` and suggestion to install stripe or paypal packages Commits ------- Allow to not use PayPal Express NVP Check the Payum factory instead of the Stripe library class Add Paypal and Stripe suggestions to the SyliusPayumBundle Add return type Re-add payum/stripe and remove stripe lib from require-dev Move payum gateways to require-dev Add PAYPAL convert action service ID to the removed services Clean requirements Fix coding standard Update composer-require-checker
…nseMate) This PR was merged into the 1.12 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.12 | | Bug fix? | yes | | New feature? | no | | BC breaks? | no | | Deprecations? | no | | Related tickets | - | | License | MIT | Commits ------- [Maintenance] Fix AdminFilterSubscriber failing when no _route attribute present [Maintenance] Fix other possibly invalid route attribute getting
This PR was merged into the 1.13 branch. Discussion ---------- This PR has been generated automatically. For more details see [refactor.yaml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yaml). Commits ------- [CS][DX] Refactor
…us_shop_cart_c… (dsbe-ak) This PR was merged into the 1.12 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.12 | | Bug fix? | yes | | New feature? | no | | BC breaks? | no | | Deprecations? | no | | Related tickets | fixes #15505 | | License | MIT | Commits ------- Fix cart styles after form submission (data-route="sylius_shop_cart_checkout")
…le (GSadee) This PR was merged into the 1.13 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.13| | Bug fix? | yes? | | New feature? | no | | BC breaks? | no | | Deprecations? | no| | Related tickets | related to #15501 | | License | MIT | <!-- - Bug fixes must be submitted against the 1.12 branch - Features and deprecations must be submitted against the 1.13 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 --> Commits ------- [API] Improve contract test of creating a product with invalid translation locale [API] Disallow removing the translation in default locale [API] Adjust contract tests after changes with translations
probot-autolabeler
bot
added
the
Maintenance
Bunnyshell Preview Environment deletedAvailable commands:
|
jakubtobiasz
approved these changes
Nov 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR has been generated automatically.
For more details see upmerge_pr.yaml.
Remember! Use Rebase and merge when merging this PR if no conflict occurred. If any conflict occurs, checkout the branch, push changes and use Create a merge commit.