Backport the two applicable upstream fixes to the 2.4.8 line - #43
Merged
jeanmarcos-dev merged 2 commits intoAug 4, 2026
Merged
Conversation
… param is invalid [picked ACP2E-5003]
… when it is set [picked ACP2E-4765]
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
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.
Backports the two upstream fixes from the 2.4.9 sync (#41) that also apply to this line.
The other three tickets from that sync do not apply here:
ACP2E-4349reverts a regression thisline never had (its publishers already carry no pinned
queueattribute), andACP2E-4741/ACP2E-4973touch files that do not exist on 2.4.8.ACP2E-5003 — invalid store code no longer 500s
GetStockIdForCurrentWebsite::execute()read?store=straight intoStoreManagerInterface::getStore()and letNoSuchEntityExceptionpropagate. A stale link, aremoved store view or a bot passing an unknown code therefore surfaced as a 500 on every consumer
of that service: the category-listing stock plugins
(
AdaptAddStockDataToCollection,AdaptAddInStockFilterToCollection,AdaptAddStockStatusToProducts,AdaptAddIsInStockFilterToCollection), the GraphQLStockStatusProviderandOnlyXLeftInStockResolver, andMergeCarts\CartQuantityValidator.The call is now guarded and falls back to the current store. The resulting file is byte-identical
to the 2.4.9 one.
ACP2E-4765 — pickup location region resolved by id
ExtractPickupLocationAddressDataresolved the region withloadByName(), which stops matchingonce a Directory data patch renames a subdivision, breaking in-store pickup order placement. It now
loads by
region_idwhen the pickup location has one and keepsloadByName()as the fallback. Thenew
RegionResourcedependency follows the optional-with-ObjectManager-fallback pattern alreadyused for
RegionFactoryin that constructor, so the signature stays backward compatible.Baseline adjustment
The upstream unit test builds its region mock with
createPartialMockWithReflection(), which comesfrom
Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait— that trait ships in the2.4.9 framework and does not exist in 103.0.8. Taking upstream's version verbatim would fail
with an undefined method here, so the existing
getMockBuilder()construction on this line waskept; it already stubs
load,getNameandloadByName, which is what the new cases need. Thethree new test cases came across unchanged.
Verification
(both test classes, including the three new pickup-region cases and the new invalid-store case).
The stress suite was not run: neither change touches reservations, salability or the inventory
indexer —
GetStockIdForCurrentWebsiteonly resolves which stock id the current request readsfrom, and the pickup change is confined to address extraction.