Skip to content

Commit 0ccadf5

Browse files
committed
#28569: Multi-store: Missing store codes in relation to a group and website
- Fixed strict types and tests
1 parent b23125e commit 0ccadf5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public function getStoreByWebsiteId($websiteId)
4747
/**
4848
* Get website store data
4949
*
50-
* @param string $websiteId
50+
* @param int $websiteId
5151
* @param bool $available
5252
* @return array
5353
*/
54-
public function getWebsiteStores(string $websiteId, bool $available = false): array
54+
public function getWebsiteStores(int $websiteId, bool $available = false): array
5555
{
5656
$connection = $this->resource->getConnection();
5757
$storeTable = $this->resource->getTableName('store');

app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function resolve(
4242
array $args = null
4343
) {
4444
return $this->storeConfigDataProvider->getAvailableStoreConfig(
45-
$context->getExtensionAttributes()->getStore()->getWebsiteId()
45+
(int)$context->getExtensionAttributes()->getStore()->getWebsiteId()
4646
);
4747
}
4848
}

app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ public function getStoreConfigData(StoreInterface $store): array
7272
/**
7373
* Get available website stores
7474
*
75-
* @param string $websiteId
75+
* @param int $websiteId
7676
* @return array
7777
*/
78-
public function getAvailableStoreConfig(string $websiteId): array
78+
public function getAvailableStoreConfig(int $websiteId): array
7979
{
8080
$websiteStores = $this->storeWebsiteRelation->getWebsiteStores($websiteId, true);
8181
$storeCodes = array_column($websiteStores, 'code');

dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,6 @@ private function validateStoreConfig(StoreConfigInterface $storeConfig, array $r
166166
$this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $responseConfig['secure_base_link_url']);
167167
$this->assertEquals($storeConfig->getSecureBaseStaticUrl(), $responseConfig['secure_base_static_url']);
168168
$this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $responseConfig['secure_base_media_url']);
169-
$this->assertEquals($storeConfig->getName(), $responseConfig['store_name']);
169+
$this->assertEquals($store->getName(), $responseConfig['store_name']);
170170
}
171171
}

0 commit comments

Comments
 (0)