[5.11] Ensure addresses are memoized when eager loaded - #19471
Merged
Merged
Conversation
nfourtythree
requested review from
brandonkelly
and
a lite review from Copilot
August 21, 2026 07:32
Contributor
There was a problem hiding this comment.
Pull request overview
This PR memoizes user addresses during eager loading to avoid redundant queries and adds consistency coverage.
Changes:
- Caches eagerly loaded addresses on
User. - Adds tests for eager-loaded address consistency.
- Requires filtering to
fieldId = nulland preserving defaultid ASCordering while allowing explicit ordering overrides.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Review |
|---|---|
src/elements/User.php |
Address eager loading has ordering and filtering inconsistencies with getAddresses(). |
tests/unit/elements/EagerLoadedElementConsistencyTest.php |
Adds coverage for eager-loaded address behavior. |
Suppressed comments (1)
tests/unit/elements/EagerLoadedElementConsistencyTest.php:222
- This fixture only creates unscoped addresses, so it cannot catch the field-address case introduced by this change. The eager-loading map is keyed by
primaryOwnerIdwhilegetAddresses()filters onfieldId = null; add a field-owned address and assert thatgetAddresses()excludes it (and define whether that address should remain ingetEagerLoadedElements('addresses')).
$addressData = [
[
'id' => 9004,
'countryCode' => 'US',
'addressLine1' => '123 Main St',
'administrativeArea' => 'CA',
'locality' => 'Los Angeles',
'postalCode' => '90001',
],
[
'id' => 9005,
'countryCode' => 'US',
'addressLine1' => '456 Elm St',
'administrativeArea' => 'CA',
'locality' => 'Los Angeles',
'postalCode' => '90002',
],
];
$addresses = array_map(fn($data) => new Address($data), $addressData);
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
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.
Description
Similar to how authors on entires works, addresses should be memoized when eager loaded so there aren't any accidental extra queries if someone was to call
getAddresses()