MC-5777: Catalog rule does not apply as expected in EE

Author: amolina-adobe

app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php

@@ -64,7 +64,7 @@ public function build(Filter $filter): string
                 ->select()
                 ->from(
                     [Collection::MAIN_TABLE_ALIAS => $entityResourceModel->getEntityTable()],
-                    Collection::MAIN_TABLE_ALIAS . '.' . $entityResourceModel->getLinkField()
+                    Collection::MAIN_TABLE_ALIAS . '.' . $entityResourceModel->getEntityIdField()
                 )->joinLeft(
                     [$tableAlias => $attribute->getBackendTable()],
                     $tableAlias . '.' . $attribute->getEntityIdField() . '=' . Collection::MAIN_TABLE_ALIAS .

app/code/Magento/CatalogRule/Model/RuleDateFormatter.php

@@ -28,15 +28,15 @@ public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface
     /**
      * @inheritdoc
      */
-    public function getDate($scope = null)
+    public function getDate($scope = null): \DateTime
     {
         return $this->localeDate->scopeDate($scope, null, true);
     }
 
     /**
      * @inheritdoc
      */
-    public function getTimeStamp($scope = null)
+    public function getTimeStamp($scope = null): int
     {
         return $this->localeDate->scopeTimeStamp($scope);
     }

app/code/Magento/CatalogRule/Model/RuleDateFormatterInterface.php

@@ -15,16 +15,16 @@ interface RuleDateFormatterInterface
     /**
      * Create \DateTime object with date converted to scope timezone for catalog rule
      *
-     * @param   mixed $scope Information about scope
-     * @return  \DateTime
+     * @param mixed $scope Information about scope
+     * @return \DateTime
      */
-    public function getDate($scope = null);
+    public function getDate($scope = null): \DateTime;
 
     /**
-     * Get scope timestamp  for catalog rule
+     * Get scope timestamp for catalog rule
      *
-     * @param   mixed $scope Information about scope
-     * @return  int
+     * @param mixed $scope Information about scope
+     * @return int
      */
-    public function getTimeStamp($scope = null);
+    public function getTimeStamp($scope = null): int;
 }