Skip to content

Commit 72b95c2

Browse files
committed
ACPT-1451: Fix for CE functional tests failures
- fix for static tests
1 parent 6ec407c commit 72b95c2

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
6262
*/
6363
private $serializer;
6464

65-
/**
66-
* @var MetadataPool $metadataPool
67-
*/
68-
private $metadataPool;
69-
7065
/**
7166
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
7267
* @param \Psr\Log\LoggerInterface $logger
@@ -91,10 +86,8 @@ public function __construct(
9186
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
9287
$this->_date = $date;
9388
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
94-
$this->metadataPool = $serializer ?:
95-
\Magento\Framework\App\ObjectManager::getInstance()->get(MetadataPool::class);
9689
$this->_associatedEntitiesMap = $this->getAssociatedEntitiesMap();
97-
$this->_setIdFieldName($this->metadataPool->getMetadata(RuleInterface::class)->getLinkField());
90+
$this->_setIdFieldName($metadataPool->getMetadata(RuleInterface::class)->getLinkField());
9891
}
9992

10093
/**

app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public function calculate($rule, $item, $qty)
8080

8181
$ruleTotals = $this->validator->getRuleItemTotalsInfo($rule->getId());
8282
$baseRuleTotals = $ruleTotals['base_items_price'] ?? 0.0;
83-
$baseRuleTotalsDiscount = $ruleTotals['base_items_discount_amount'] ?? 0.0;
8483
$ruleItemsCount = $ruleTotals['items_count'] ?? 0;
8584

8685
$address = $item->getAddress();

0 commit comments

Comments
 (0)