Skip to content

fix(framework): normalize plugin list cache ID generation #40499

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.

Sign up for GitHub

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

Closed
lbajsarowicz wants to merge 1 commit into from
Closed

fix(framework): normalize plugin list cache ID generation #40499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,11 @@ protected function _loadScopedData()
}
$this->_scopePriorityScheme[] = $scope;

$cacheId = implode('|', $this->_scopePriorityScheme) . "|" . $this->_cacheId;
// Sort scopes alphabetically to ensure cache ID is deterministic
// regardless of processing order (fixes mismatch with compile-time generation)
$sortedScheme = array_values($this->_scopePriorityScheme);
sort($sortedScheme);
$cacheId = implode('|', $sortedScheme) . "|" . $this->_cacheId;
$configData = $this->configLoader->load($cacheId);

if ($configData) {
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/Magento/Framework/Interception/PluginListGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ public function write(array $scopes): void
if (false === in_array($scope, $this->scopePriorityScheme, true)) {
$this->scopePriorityScheme[] = $scope;
}
$cacheId = implode('|', $this->scopePriorityScheme) . "|" . $this->cacheId;
// Sort scopes alphabetically to ensure cache ID is deterministic
// regardless of processing order (fixes mismatch with runtime loading)
$sortedScheme = array_values($this->scopePriorityScheme);
sort($sortedScheme);
$cacheId = implode('|', $sortedScheme) . "|" . $this->cacheId;
[
$virtualTypes,
$this->scopePriorityScheme,
Expand Down