Skip to content

⚡ perf: memoize hasSingleStore() in StoreManager #40732

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

Open
lbajsarowicz wants to merge 2 commits into
base: 2.4-develop
Choose a base branch
from
+35 −4
Open

⚡ perf: memoize hasSingleStore() in StoreManager #40732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
994cf96
perf: memoize hasSingleStore() in StoreManager
lbajsarowicz Apr 13, 2026
bf35ae1
fix: strengthen hasSingleStore memoization test per review feedback
lbajsarowicz Apr 13, 2026
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
13 changes: 9 additions & 4 deletions app/code/Magento/Store/Model/StoreManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ class StoreManager implements
protected $currentStoreId = null;

/**
* Flag that shows that system has only one store view
* Flag that shows that system has only one store view; null is used as the cache sentinel.
*
* @var bool
* @var bool|null
*/
protected $_hasSingleStore;

Expand Down Expand Up @@ -137,8 +137,11 @@ public function setIsSingleStoreModeAllowed($value)
*/
public function hasSingleStore()
{
// TODO: MAGETWO-39902 add cache, move value to consts
return $this->isSingleStoreAllowed && count($this->getStores(true)) < 3;
if ($this->_hasSingleStore === null) {
$this->_hasSingleStore = $this->isSingleStoreAllowed && count($this->getStores(true)) < 3;
}

return $this->_hasSingleStore;
}

/**
Expand Down Expand Up @@ -237,6 +240,7 @@ public function getWebsites($withDefault = false, $codeKey = false)
public function reinitStores()
{
$this->currentStoreId = null;
$this->_hasSingleStore = null;
$this->cache->clean(
CacheConstants::CLEANING_MODE_MATCHING_ANY_TAG,
[StoreResolver::CACHE_TAG, Store::CACHE_TAG, Website::CACHE_TAG, Group::CACHE_TAG]
Expand Down Expand Up @@ -340,5 +344,6 @@ public function __debugInfo()
public function _resetState(): void
{
$this->currentStoreId = null;
$this->_hasSingleStore = null;
}
}
26 changes: 26 additions & 0 deletions app/code/Magento/Store/Test/Unit/Model/StoreManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,32 @@ public function testReinitStores()
$this->model->reinitStores();
}

public function testHasSingleStoreIsMemoizedAndReinitialized(): void
{
$defaultStoreMock = $this->getMockForStoreInterfaceClass(0, 'default');
$storeMock = $this->getMockForStoreInterfaceClass(1, 'first_store');

$this->storeRepositoryMock->expects($this->exactly(2))
->method('getList')
->willReturn([$defaultStoreMock, $storeMock]);
$this->cache->expects($this->once())->method('clean')->with(
CacheConstants::CLEANING_MODE_MATCHING_ANY_TAG,
[StoreResolver::CACHE_TAG, Store::CACHE_TAG, Website::CACHE_TAG, Group::CACHE_TAG]
);
$this->scopeConfig->expects($this->once())->method('clean');
$this->storeRepositoryMock->expects($this->once())->method('clean');
$this->websiteRepository->expects($this->once())->method('clean');
$this->groupRepository->expects($this->once())->method('clean');

$this->assertTrue($this->model->hasSingleStore());
$this->assertTrue($this->model->hasSingleStore());

$this->model->reinitStores();

$this->assertTrue($this->model->hasSingleStore());
$this->assertTrue($this->model->hasSingleStore());
}

#[DataProvider('getStoresDataProvider')]
public function testGetStores($storesList, $withDefault, $codeKey, $expectedStores)
{
Expand Down