Merge branch 'MC-29865' of https://github.com/magento-tango/magento2ce into PR-01-02-2020

Author: Roman Lytvynenko

app/code/Magento/Catalog/Model/Product/Type/Price.php

@@ -262,7 +262,7 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
 
         $tierPrice = $product->getTierPrice($qty);
         if (is_numeric($tierPrice)) {
-            $finalPrice = min($finalPrice, $tierPrice);
+            $finalPrice = min($finalPrice, (float) $tierPrice);
         }
         return $finalPrice;
     }
@@ -645,7 +645,7 @@ public function calculateSpecialPrice(
     ) {
         if ($specialPrice !== null && $specialPrice != false) {
             if ($this->_localeDate->isScopeDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
-                $finalPrice = min($finalPrice, $specialPrice);
+                $finalPrice = min($finalPrice, (float) $specialPrice);
             }
         }
         return $finalPrice;

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceTest.php

@@ -111,8 +111,19 @@ public function testTierPriceWithDifferentCustomerGroups(): void
      */
     public function testGetPrice(): void
     {
-        $objectWithPrice = $this->objectManager->create(DataObject::class, ['data' => ['price' => 'test']]);
-        $this->assertEquals('test', $this->productPrice->getPrice($objectWithPrice));
+        $objectWithPrice = $this->objectManager->create(DataObject::class, ['data' => ['price' => 9.0]]);
+        $this->assertEquals(9.0, $this->productPrice->getPrice($objectWithPrice));
+    }
+
+    /**
+     * Get base price from product.
+     *
+     * @return void
+     */
+    public function testGetBasePrice(): void
+    {
+        $product = $this->productRepository->get('simple');
+        $this->assertSame(10.0, $this->productPrice->getBasePrice($product));
     }
 
     /**
@@ -175,13 +186,13 @@ public function testCalculatePrice(): void
      */
     public function testCalculateSpecialPrice(): void
     {
-        $this->assertEquals(
-            10,
-            $this->productPrice->calculateSpecialPrice(10, 8, '1970-12-12 23:59:59', '1971-01-01 01:01:01')
+        $this->assertSame(
+            10.0,
+            $this->productPrice->calculateSpecialPrice(10.0, 8.0, '1970-12-12 23:59:59', '1971-01-01 01:01:01')
         );
-        $this->assertEquals(
-            8,
-            $this->productPrice->calculateSpecialPrice(10, 8, '1970-12-12 23:59:59', '2034-01-01 01:01:01')
+        $this->assertSame(
+            8.0,
+            $this->productPrice->calculateSpecialPrice(10.0, 8.0, '1970-12-12 23:59:59', '2034-01-01 01:01:01')
         );
     }