ENGCOM-6044: Fix #13278 - Wrong return type in Salesrule Module RuleInterface.php #24814

Author: VladimirZaets

app/code/Magento/SalesRule/Api/Data/RuleInterface.php

@@ -5,13 +5,15 @@
  */
 namespace Magento\SalesRule\Api\Data;
 
+use Magento\Framework\Api\ExtensibleDataInterface;
+
 /**
  * Interface RuleInterface
  *
  * @api
  * @since 100.0.2
  */
-interface RuleInterface extends \Magento\Framework\Api\ExtensibleDataInterface
+interface RuleInterface extends ExtensibleDataInterface
 {
     const FREE_SHIPPING_NONE = 'NONE';
     const FREE_SHIPPING_MATCHING_ITEMS_ONLY = 'MATCHING_ITEMS_ONLY';
@@ -173,7 +175,7 @@ public function getIsActive();
      * Set whether the coupon is active
      *
      * @param bool $isActive
-     * @return bool
+     * @return $this
      */
     public function setIsActive($isActive);
 
@@ -232,6 +234,8 @@ public function setStopRulesProcessing($stopRulesProcessing);
     public function getIsAdvanced();
 
     /**
+     * Set if rule is advanced
+     *
      * @param bool $isAdvanced
      * @return $this
      */
@@ -260,6 +264,8 @@ public function setProductIds(array $productIds = null);
     public function getSortOrder();
 
     /**
+     * Set sort order
+     *
      * @param int $sortOrder
      * @return $this
      */
@@ -446,5 +452,5 @@ public function getExtensionAttributes();
      * @param \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setExtensionAttributes(\Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes);
+    public function setExtensionAttributes(RuleExtensionInterface $extensionAttributes);
 }

app/code/Magento/SalesRule/Model/Data/Rule.php

@@ -5,18 +5,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\SalesRule\Model\Data;
 
+use Magento\Framework\Api\AbstractExtensibleObject;
 use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\RuleExtensionInterface;
 use Magento\SalesRule\Api\Data\RuleInterface;
+use Magento\SalesRule\Api\Data\RuleLabelInterface;
 
 /**
  * Class Rule
  *
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @codeCoverageIgnore
  */
-class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements RuleInterface
+class Rule extends AbstractExtensibleObject implements RuleInterface
 {
     const KEY_RULE_ID = 'rule_id';
     const KEY_NAME = 'name';
@@ -187,7 +192,7 @@ public function getIsActive()
      * Set whether the coupon is active
      *
      * @param bool $isActive
-     * @return bool
+     * @return $this
      */
     public function setIsActive($isActive)
     {
@@ -197,7 +202,7 @@ public function setIsActive($isActive)
     /**
      * Get condition for the rule
      *
-     * @return \Magento\SalesRule\Api\Data\ConditionInterface|null
+     * @return ConditionInterface|null
      */
     public function getCondition()
     {
@@ -207,7 +212,7 @@ public function getCondition()
     /**
      * Set condition for the rule
      *
-     * @param \Magento\SalesRule\Api\Data\ConditionInterface|null $condition
+     * @param ConditionInterface|null $condition
      * @return $this
      */
     public function setCondition(ConditionInterface $condition = null)
@@ -218,7 +223,7 @@ public function setCondition(ConditionInterface $condition = null)
     /**
      * Get action condition
      *
-     * @return \Magento\SalesRule\Api\Data\ConditionInterface|null
+     * @return ConditionInterface|null
      */
     public function getActionCondition()
     {
@@ -228,7 +233,7 @@ public function getActionCondition()
     /**
      * Set action condition
      *
-     * @param \Magento\SalesRule\Api\Data\ConditionInterface|null $actionCondition
+     * @param ConditionInterface|null $actionCondition
      * @return $this
      */
     public function setActionCondition(ConditionInterface $actionCondition = null)
@@ -283,7 +288,7 @@ public function setIsAdvanced($isAdvanced)
     /**
      * Get display label
      *
-     * @return \Magento\SalesRule\Api\Data\RuleLabelInterface[]|null
+     * @return RuleLabelInterface[]|null
      */
     public function getStoreLabels()
     {
@@ -293,7 +298,7 @@ public function getStoreLabels()
     /**
      * Set display label
      *
-     * @param \Magento\SalesRule\Api\Data\RuleLabelInterface[]|null $storeLabels
+     * @param RuleLabelInterface[]|null $storeLabels
      * @return $this
      */
     public function setStoreLabels(array $storeLabels = null)
@@ -622,7 +627,7 @@ public function setSimpleFreeShipping($simpleFreeShipping)
     /**
      * @inheritdoc
      *
-     * @return \Magento\SalesRule\Api\Data\RuleExtensionInterface|null
+     * @return RuleExtensionInterface|null
      */
     public function getExtensionAttributes()
     {
@@ -632,11 +637,11 @@ public function getExtensionAttributes()
     /**
      * @inheritdoc
      *
-     * @param \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
+     * @param RuleExtensionInterface $extensionAttributes
      * @return $this
      */
     public function setExtensionAttributes(
-        \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
+        RuleExtensionInterface $extensionAttributes
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }