Skip to content

Commit ecb3a8d

Browse files
committed
#26986 Fix Static checks for Collection file
1 parent e001493 commit ecb3a8d

File tree

1 file changed

+21
-39
lines changed

1 file changed

+21
-39
lines changed

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
1313
use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
1414
use Magento\Catalog\Model\Product\Gallery\ReadHandler as GalleryReadHandler;
15+
use Magento\Catalog\Model\ResourceModel\Category;
1516
use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
1617
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
1718
use Magento\CatalogUrlRewrite\Model\Storage\DbStorage;
@@ -23,7 +24,6 @@
2324
use Magento\Framework\Indexer\DimensionFactory;
2425
use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
2526
use Magento\Store\Model\Store;
26-
use Magento\Catalog\Model\ResourceModel\Category;
2727

2828
/**
2929
* Product collection
@@ -1013,9 +1013,9 @@ public function getMaxAttributeValue($attribute)
10131013
$tableAlias = $attributeCode . '_max_value';
10141014
$fieldAlias = 'max_' . $attributeCode;
10151015
$condition = 'e.entity_id = ' . $tableAlias . '.entity_id AND ' . $this->_getConditionSql(
1016-
$tableAlias . '.attribute_id',
1017-
$attribute->getId()
1018-
);
1016+
$tableAlias . '.attribute_id',
1017+
$attribute->getId()
1018+
);
10191019

10201020
$select->join(
10211021
[$tableAlias => $attribute->getBackend()->getTable()],
@@ -1048,9 +1048,9 @@ public function getAttributeValueCountByRange($attribute, $range)
10481048
$tableAlias = $attributeCode . '_range_count_value';
10491049

10501050
$condition = 'e.entity_id = ' . $tableAlias . '.entity_id AND ' . $this->_getConditionSql(
1051-
$tableAlias . '.attribute_id',
1052-
$attribute->getId()
1053-
);
1051+
$tableAlias . '.attribute_id',
1052+
$attribute->getId()
1053+
);
10541054

10551055
$select->reset(\Magento\Framework\DB\Select::GROUP);
10561056
$select->join(
@@ -1088,9 +1088,9 @@ public function getAttributeValueCount($attribute)
10881088

10891089
$select->reset(\Magento\Framework\DB\Select::GROUP);
10901090
$condition = 'e.entity_id=' . $tableAlias . '.entity_id AND ' . $this->_getConditionSql(
1091-
$tableAlias . '.attribute_id',
1092-
$attribute->getId()
1093-
);
1091+
$tableAlias . '.attribute_id',
1092+
$attribute->getId()
1093+
);
10941094

10951095
$select->join(
10961096
[$tableAlias => $attribute->getBackend()->getTable()],
@@ -1783,30 +1783,19 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
17831783
*/
17841784
protected function _prepareProductLimitationFilters()
17851785
{
1786-
if (isset(
1787-
$this->_productLimitationFilters['visibility']
1788-
) && !isset(
1789-
$this->_productLimitationFilters['store_id']
1790-
)
1791-
) {
1786+
if (isset($this->_productLimitationFilters['visibility'])
1787+
&& !isset($this->_productLimitationFilters['store_id'])) {
17921788
$this->_productLimitationFilters['store_id'] = $this->getStoreId();
17931789
}
1794-
if (isset(
1795-
$this->_productLimitationFilters['category_id']
1796-
) && !isset(
1797-
$this->_productLimitationFilters['store_id']
1798-
)
1799-
) {
1790+
1791+
if (isset($this->_productLimitationFilters['category_id'])
1792+
&& !isset($this->_productLimitationFilters['store_id'])) {
18001793
$this->_productLimitationFilters['store_id'] = $this->getStoreId();
18011794
}
1802-
if (isset(
1803-
$this->_productLimitationFilters['store_id']
1804-
) && isset(
1805-
$this->_productLimitationFilters['visibility']
1806-
) && !isset(
1807-
$this->_productLimitationFilters['category_id']
1808-
)
1809-
) {
1795+
1796+
if (isset($this->_productLimitationFilters['store_id'])
1797+
&& isset($this->_productLimitationFilters['visibility'])
1798+
&& !isset($this->_productLimitationFilters['category_id'])) {
18101799
$this->_productLimitationFilters['category_id'] = $this->_storeManager->getStore(
18111800
$this->_productLimitationFilters['store_id']
18121801
)->getRootCategoryId();
@@ -1837,14 +1826,8 @@ protected function _productLimitationJoinWebsite()
18371826
$filters['website_ids'],
18381827
'int'
18391828
);
1840-
} elseif (isset(
1841-
$filters['store_id']
1842-
) && (!isset(
1843-
$filters['visibility']
1844-
) && !isset(
1845-
$filters['category_id']
1846-
)) && !$this->isEnabledFlat()
1847-
) {
1829+
} elseif (isset($filters['store_id']) && !$this->isEnabledFlat()
1830+
&& (!isset($filters['visibility']) && !isset($filters['category_id']))) {
18481831
$joinWebsite = true;
18491832
$websiteId = $this->_storeManager->getStore($filters['store_id'])->getWebsiteId();
18501833
$conditions[] = $this->getConnection()->quoteInto('product_website.website_id = ?', $websiteId, 'int');
@@ -2431,7 +2414,6 @@ private function getGalleryReadHandler()
24312414
*
24322415
* @return \Magento\Catalog\Model\ResourceModel\Product\Gallery
24332416
* @deprecated 101.0.1
2434-
*
24352417
*/
24362418
private function getMediaGalleryResource()
24372419
{

0 commit comments

Comments
 (0)