Skip to content

Commit ce5838f

Browse files
committed
MAGE-839 Clean up method naming convention per review
1 parent 327bb2f commit ce5838f

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

Model/Product/ReplicaManager.php

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,12 @@ protected function clearAlgoliaReplicaSettingCache($primaryIndexName = null): vo
100100
* relevant to the Magento integration
101101
*
102102
* @param string $primaryIndexName
103-
* @param int $storeId
104103
* @return string[]
105104
*/
106105
protected function getMagentoReplicaConfigurationFromAlgolia(string $primaryIndexName): array
107106
{
108107
$algoliaReplicas = $this->getReplicaConfigurationFromAlgolia($primaryIndexName);
109-
$magentoReplicas = $this->getPossibleMagentoReplicaSettings($primaryIndexName, $algoliaReplicas);
108+
$magentoReplicas = $this->getMagentoReplicaSettings($primaryIndexName, $algoliaReplicas);
110109
return array_values(array_intersect($magentoReplicas, $algoliaReplicas));
111110
}
112111

@@ -116,7 +115,7 @@ protected function getMagentoReplicaConfigurationFromAlgolia(string $primaryInde
116115
* @param string[] $algoliaReplicas
117116
* @return string[]
118117
*/
119-
protected function getPossibleMagentoReplicaSettings(string $baseIndexName, array $algoliaReplicas): array
118+
protected function getMagentoReplicaSettings(string $baseIndexName, array $algoliaReplicas): array
120119
{
121120
return array_filter(
122121
$algoliaReplicas,
@@ -128,13 +127,12 @@ function ($algoliaReplicaSetting) use ($baseIndexName) {
128127

129128
/**
130129
* @param string $primaryIndexName
131-
* @param int $storeId
132130
* @return array
133131
*/
134-
protected function getNonMagentoReplicaConfigurationFromAlgolia(string $primaryIndexName, int $storeId): array
132+
protected function getNonMagentoReplicaConfigurationFromAlgolia(string $primaryIndexName): array
135133
{
136134
$algoliaReplicas = $this->getReplicaConfigurationFromAlgolia($primaryIndexName);
137-
$magentoReplicas = $this->getPossibleMagentoReplicaSettings($primaryIndexName, $algoliaReplicas);
135+
$magentoReplicas = $this->getMagentoReplicaSettings($primaryIndexName, $algoliaReplicas);
138136
return array_diff($algoliaReplicas, $magentoReplicas);
139137
}
140138

@@ -176,7 +174,7 @@ function ($sort) use ($mode) {
176174
* @throws LocalizedException
177175
* @throws NoSuchEntityException
178176
*/
179-
protected function getPossibleMagentoReplicaSettingsFromConfig(string $primaryIndexName, int $storeId, bool $refreshCache = false): array
177+
protected function getMagentoReplicaSettingsFromConfig(string $primaryIndexName, int $storeId, bool $refreshCache = false): array
180178
{
181179
if ($refreshCache || !isset($this->_magentoReplicaPossibleConfig[$storeId])) {
182180
$sortConfig = $this->replicaState->getChangeState($storeId) === ReplicaState::REPLICA_STATE_CHANGED
@@ -205,19 +203,19 @@ public function handleReplicas(string $primaryIndexName, int $storeId, array $pr
205203
}
206204

207205
/**
208-
* @param $primaryIndexName
206+
* @param string $indexName
209207
* @param int $storeId
210208
* @return string[] Replicas added or modified by this operation
211209
* @throws LocalizedException
212210
* @throws NoSuchEntityException
213211
* @throws AlgoliaException
214212
*/
215-
protected function setReplicasOnPrimaryIndex($indexName, int $storeId): array
213+
protected function setReplicasOnPrimaryIndex(string $indexName, int $storeId): array
216214
{
217215
$sortingIndices = $this->configHelper->getSortingIndices($indexName, $storeId);
218216
$newMagentoReplicasSetting = $this->transformSortingIndicesToReplicaSetting($sortingIndices);
219-
$oldMagentoReplicasSetting = $this->getMagentoReplicaConfigurationFromAlgolia($indexName, $storeId);
220-
$nonMagentoReplicasSetting = $this->getNonMagentoReplicaConfigurationFromAlgolia($indexName, $storeId);
217+
$oldMagentoReplicasSetting = $this->getMagentoReplicaConfigurationFromAlgolia($indexName);
218+
$nonMagentoReplicasSetting = $this->getNonMagentoReplicaConfigurationFromAlgolia($indexName);
221219
$oldMagentoReplicaIndices = $this->getBareIndexNamesFromReplicaSetting($oldMagentoReplicasSetting);
222220
$newMagentoReplicaIndices = $this->getBareIndexNamesFromReplicaSetting($newMagentoReplicasSetting);
223221

@@ -267,6 +265,11 @@ protected function getBareIndexNameFromReplicaSetting(string $replicaSetting): s
267265
return preg_replace('/.*\((.*)\).*/', '$1', $replicaSetting);
268266
}
269267

268+
/**
269+
* @param array $replicasToDelete
270+
* @return void
271+
* @throws AlgoliaException
272+
*/
270273
protected function deleteReplicas(array $replicasToDelete): void
271274
{
272275
foreach ($replicasToDelete as $deletedReplica) {

0 commit comments

Comments
 (0)