refactor; add strict type

magento · Sep 7, 2020 · 9fd5436 · 9fd5436
1 parent 43b4f64
commit 9fd5436
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
@@ -256,10 +256,10 @@ public function cacheKeyProvider(): array
      */
     public function testGetCacheKeyInfo(
         array $expected,
-        string $priceCurrency = null,
-        string $customerGroupId = null
+        ?string $priceCurrency = null,
+        ?int $customerGroupId = null
     ): void {
-        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+        $storeMock = $this->getMockBuilder(StoreInterface::class)
             ->setMethods(['getCurrentCurrency'])
             ->getMockForAbstractClass();
         $storeMock->expects($this->any())

diff --git a/app/code/Magento/Tax/Pricing/Render/Adjustment.php b/app/code/Magento/Tax/Pricing/Render/Adjustment.php
@@ -181,11 +181,10 @@ public function displayPriceExcludingTax()
      *
      * @return string
      */
-    public function getDataPriceType()
+    public function getDataPriceType(): string
     {
-        if ($this->getData('price_type') && $this->getData('price_type') !== 'finalPrice') {
-            return 'base' . ucfirst($this->getData('price_type'));
-        }
-        return 'basePrice';
+        return $this->amountRender->getPriceType() === 'finalPrice'
+            ? 'basePrice'
+            : 'base' . ucfirst($this->amountRender->getPriceType());
     }
 }