MAGETWO-94080: Aditional Fix for "Catalog Products List" widget displaying on frontend

victor-v-rad · victor-v-rad · commit 0809bf3abb7f · 2018-08-20T09:55:07.000+03:00
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -263,10 +263,10 @@ public function collectValidatedAttributes($productCollection)
      * @param \Magento\Framework\DataObject $attribute
      * @return bool
      */
-    private function isEnabledInFlat(\Magento\Framework\DataObject $attribute)
+    private function isEnabledInFlat(\Magento\Framework\DataObject $attribute): bool
     {
-        return $attribute->getData('backend_type') == 'static'
-            || $attribute->getData('used_in_product_listing') == 1
-            || $attribute->getData('used_for_sort_by') == 1;
+        return $attribute->getData('backend_type') === 'static'
+            || (int) $attribute->getData('used_in_product_listing') === 1
+            || (int) $attribute->getData('used_for_sort_by') === 1;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -263,10 +263,10 @@ public function collectValidatedAttributes($productCollection)`
`263`	`263`	`* @param \Magento\Framework\DataObject $attribute`
`264`	`264`	`* @return bool`
`265`	`265`	`*/`
`266`		`- private function isEnabledInFlat(\Magento\Framework\DataObject $attribute)`
	`266`	`+ private function isEnabledInFlat(\Magento\Framework\DataObject $attribute): bool`
`267`	`267`	`{`
`268`		`- return $attribute->getData('backend_type') == 'static'`
`269`		`- \|\| $attribute->getData('used_in_product_listing') == 1`
`270`		`- \|\| $attribute->getData('used_for_sort_by') == 1;`
	`268`	`+ return $attribute->getData('backend_type') === 'static'`
	`269`	`+ \|\| (int) $attribute->getData('used_in_product_listing') === 1`
	`270`	`+ \|\| (int) $attribute->getData('used_for_sort_by') === 1;`
`271`	`271`	`}`
`272`	`272`	`}`