Skip to content

Fixed issue #22767: Not clear logic for loading CMS Pages with setStoreId function #22772

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

Merged
magento-engcom-team merged 2 commits into from
May 29, 2019
Merged

Fixed issue #22767: Not clear logic for loading CMS Pages with setStoreId function #22772

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
ef5a50e
fixed issue #22767, changed the magic method type
mahesh-rajawat May 7, 2019
876d632
magento/magento2#22772 static-test-fix
Nazar65 May 24, 2019
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: 4 additions & 2 deletions app/code/Magento/Cms/Model/Block.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
/**
* CMS block model
*
* @method Block setStoreId(array $storeId)
* @method array getStoreId()
* @method Block setStoreId(int $storeId)
* @method int getStoreId()
*/
class Block extends AbstractModel implements BlockInterface, IdentityInterface
{
Expand Down Expand Up @@ -41,6 +41,8 @@ class Block extends AbstractModel implements BlockInterface, IdentityInterface
protected $_eventPrefix = 'cms_block';

/**
* Construct.
*
* @return void
*/
protected function _construct()
Expand Down
14 changes: 7 additions & 7 deletions app/code/Magento/Cms/Model/Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* Cms Page Model
*
* @api
* @method Page setStoreId(array $storeId)
* @method array getStoreId()
* @method Page setStoreId(int $storeId)
* @method int getStoreId()
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
* @since 100.0.2
*/
Expand Down Expand Up @@ -103,8 +103,7 @@ public function getStores()
}

/**
* Check if page identifier exist for specific store
* return page id if page exists
* Check if page identifier exist for specific store return page id if page exists
*
* @param string $identifier
* @param int $storeId
Expand All @@ -116,8 +115,7 @@ public function checkIdentifier($identifier, $storeId)
}

/**
* Prepare page's statuses.
* Available event cms_page_get_available_statuses to customize statuses.
* Prepare page's statuses, available event cms_page_get_available_statuses to customize statuses.
*
* @return array
*/
Expand Down Expand Up @@ -538,7 +536,7 @@ public function setIsActive($isActive)
}

/**
* {@inheritdoc}
* @inheritdoc
* @since 101.0.0
*/
public function beforeSave()
Expand Down Expand Up @@ -571,6 +569,8 @@ public function beforeSave()
}

/**
* Returns scope config.
*
* @return ScopeConfigInterface
*/
private function getScopeConfig()
Expand Down