Skip to content

Commit 214bc56

Browse files
committed
MAGETWO-63159: Fix Sales Rule Data Model convertor to support extension attributes
1 parent 5b85cc5 commit 214bc56

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

app/code/Magento/SalesRule/Model/Converter/ToDataModel.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function __construct(
8484
* @param Rule $ruleModel
8585
* @return RuleDataModel
8686
*/
87-
public function toDataModel(\Magento\SalesRule\Model\Rule $ruleModel)
87+
public function toDataModel(Rule $ruleModel)
8888
{
8989
$modelData = $ruleModel->getData();
9090
$modelData = $this->convertExtensionAttributesToObject($modelData);
@@ -99,10 +99,10 @@ public function toDataModel(\Magento\SalesRule\Model\Rule $ruleModel)
9999

100100
/**
101101
* @param RuleDataModel $dataModel
102-
* @param \Magento\SalesRule\Model\Rule $ruleModel
102+
* @param Rule $ruleModel
103103
* @return $this
104104
*/
105-
protected function mapConditions(RuleDataModel $dataModel, \Magento\SalesRule\Model\Rule $ruleModel)
105+
protected function mapConditions(RuleDataModel $dataModel, Rule $ruleModel)
106106
{
107107
$conditionSerialized = $ruleModel->getConditionsSerialized();
108108
if ($conditionSerialized) {
@@ -117,10 +117,10 @@ protected function mapConditions(RuleDataModel $dataModel, \Magento\SalesRule\Mo
117117

118118
/**
119119
* @param RuleDataModel $dataModel
120-
* @param \Magento\SalesRule\Model\Rule $ruleModel
120+
* @param Rule $ruleModel
121121
* @return $this
122122
*/
123-
protected function mapActionConditions(RuleDataModel $dataModel, \Magento\SalesRule\Model\Rule $ruleModel)
123+
protected function mapActionConditions(RuleDataModel $dataModel, Rule $ruleModel)
124124
{
125125
$actionConditionSerialized = $ruleModel->getActionsSerialized();
126126
if ($actionConditionSerialized) {
@@ -194,10 +194,11 @@ private function convertExtensionAttributesToObject(array $data)
194194
}
195195

196196
/**
197-
* @param \Magento\SalesRule\Model\Rule $ruleModel
197+
* @param RuleDataModel $dataModel
198+
* @param Rule $ruleModel
198199
* @return $this
199200
*/
200-
protected function mapFields(RuleDataModel $dataModel, \Magento\SalesRule\Model\Rule $ruleModel)
201+
protected function mapFields(RuleDataModel $dataModel, Rule $ruleModel)
201202
{
202203
$this->mapConditions($dataModel, $ruleModel);
203204
$this->mapActionConditions($dataModel, $ruleModel);

0 commit comments

Comments
 (0)