Skip to content

Commit 4c9ad14

Browse files
authored
ENGCOM-5147: Fixed issue magento#22767: Not clear logic for loading CMS Pages with setStoreId function magento#22772
2 parents f99986c + 9107b3a commit 4c9ad14

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

app/code/Magento/Cms/Model/Block.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
/**
1313
* CMS block model
1414
*
15-
* @method Block setStoreId(array $storeId)
16-
* @method array getStoreId()
15+
* @method Block setStoreId(int $storeId)
16+
* @method int getStoreId()
1717
*/
1818
class Block extends AbstractModel implements BlockInterface, IdentityInterface
1919
{
@@ -41,6 +41,8 @@ class Block extends AbstractModel implements BlockInterface, IdentityInterface
4141
protected $_eventPrefix = 'cms_block';
4242

4343
/**
44+
* Construct.
45+
*
4446
* @return void
4547
*/
4648
protected function _construct()

app/code/Magento/Cms/Model/Page.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* Cms Page Model
1717
*
1818
* @api
19-
* @method Page setStoreId(array $storeId)
20-
* @method array getStoreId()
19+
* @method Page setStoreId(int $storeId)
20+
* @method int getStoreId()
2121
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
2222
* @since 100.0.2
2323
*/
@@ -103,8 +103,7 @@ public function getStores()
103103
}
104104

105105
/**
106-
* Check if page identifier exist for specific store
107-
* return page id if page exists
106+
* Check if page identifier exist for specific store return page id if page exists
108107
*
109108
* @param string $identifier
110109
* @param int $storeId
@@ -116,8 +115,7 @@ public function checkIdentifier($identifier, $storeId)
116115
}
117116

118117
/**
119-
* Prepare page's statuses.
120-
* Available event cms_page_get_available_statuses to customize statuses.
118+
* Prepare page's statuses, available event cms_page_get_available_statuses to customize statuses.
121119
*
122120
* @return array
123121
*/
@@ -538,7 +536,7 @@ public function setIsActive($isActive)
538536
}
539537

540538
/**
541-
* {@inheritdoc}
539+
* @inheritdoc
542540
* @since 101.0.0
543541
*/
544542
public function beforeSave()
@@ -571,6 +569,8 @@ public function beforeSave()
571569
}
572570

573571
/**
572+
* Returns scope config.
573+
*
574574
* @return ScopeConfigInterface
575575
*/
576576
private function getScopeConfig()

0 commit comments

Comments
 (0)