[UPMERGE] 5.0 -> 5.1#3088
Merged
Merged
Conversation
[StorageListBundle] Fix authentication (remember me token)
[OrderBundle] Restore last-opened cart across sessions
[UPMERGE] 4.1 -> 5.0
dpfaffenbauer
force-pushed
the
upmerge/5.0_5.1
branch
from
3c18f81 to
54fff4b
Compare
Resolve cart.yml: keep 5.1's removal of the legacy CartFilterListener grid service (relocated to classic_admin.yml as AdminClass\...).
dpfaffenbauer
force-pushed
the
upmerge/5.0_5.1
branch
from
54fff4b to
4c03957
Compare
…wareTrait Symfony 7 removed ContainerAwareInterface/ContainerAwareTrait, so the lastActivatedAt migration fataled on install with deps-highest. Switch to Pimcore::getContainer()->getParameter(), matching the existing pattern in Version20260419121310. (cherry picked from commit e5bfa33)
… 0.4 page-object-extension ^0.4.0 declares SymfonyPage::$additionalParameters as 'protected static array', and PHP property types are invariant, so the untyped overrides in AbstractFrontendPage/AbstractPimcorePage caused a compile-time fatal under deps-highest. Match the parent's array type.
…raint The split TestBundle package still required ^0.3.2 (untyped SymfonyPage::$additionalParameters) while the root repo uses ^0.4.0 (typed). That inconsistency made the typed array override fail in the TestBundle split job. Align the sub-package constraint with the root.
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Remember! The upmerge should always be merged with using
Merge pull requestbutton.In case of conflicts, please resolve them manually with usign the following commands: