Merge remote-tracking branch 'SilinMykola/php8-compatibility/fix-api-functional-tests' into platform-health

xmav · xmav · commit 070e4983be39 · 2021-10-01T16:18:28.000-05:00
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -152,7 +152,7 @@ protected function getStore($scope = null)
      */
     public function round($price)
     {
-        return round($price, 2);
+        return round((float) $price, 2);
     }
 
     /**
diff --git a/app/code/Magento/SalesGraphQl/Model/OrderItem/DataProvider.php b/app/code/Magento/SalesGraphQl/Model/OrderItem/DataProvider.php
@@ -227,7 +227,7 @@ private function getDiscountDetails(OrderInterface $associatedOrder, OrderItemIn
             $discounts [] = [
                 'label' => $associatedOrder->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
-                    'value' => abs($orderItem->getDiscountAmount()) ?? 0,
+                    'value' => abs((float) $orderItem->getDiscountAmount()),
                     'currency' => $associatedOrder->getOrderCurrencyCode()
                 ]
             ];
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
@@ -148,7 +148,7 @@ private function formatDiscountDetails(
             $discounts[] = [
                 'label' => $associatedOrder->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
-                    'value' => abs($creditmemoItem->getDiscountAmount()) ?? 0,
+                    'value' => abs((float) $creditmemoItem->getDiscountAmount()),
                     'currency' => $associatedOrder->getOrderCurrencyCode()
                 ]
             ];
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
@@ -106,7 +106,7 @@ public function resolve(
                 )
             ],
             'adjustment' => [
-                'value' =>  abs($creditMemo->getAdjustment()),
+                'value' =>  abs((float) $creditMemo->getAdjustment()),
                 'currency' => $currency
             ]
         ];
@@ -132,7 +132,7 @@ private function getShippingDiscountDetails(CreditmemoInterface $creditmemoModel
         if ($calculatedCreditmemoShippingDiscount != 0) {
             $shippingDiscounts[] = [
                 'amount' => [
-                    'value' => sprintf('%.2f', abs($calculatedCreditmemoShippingDiscount)),
+                    'value' => sprintf('%.2f', abs((float) $calculatedCreditmemoShippingDiscount)),
                     'currency' => $creditmemoModel->getOrderCurrencyCode()
                 ]
             ];
@@ -153,7 +153,7 @@ private function getDiscountDetails(CreditmemoInterface $creditmemo): array
             $discounts[] = [
                 'label' => $creditmemo->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
-                    'value' => abs($creditmemo->getDiscountAmount()),
+                    'value' => abs((float) $creditmemo->getDiscountAmount()),
                     'currency' => $creditmemo->getOrderCurrencyCode()
                 ]
             ];
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
@@ -146,7 +146,7 @@ private function formatDiscountDetails(OrderInterface $associatedOrder, InvoiceI
             $discounts[] = [
                 'label' => $associatedOrder->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
-                    'value' => abs($invoiceItem->getDiscountAmount()) ?? 0,
+                    'value' => abs((float) $invoiceItem->getDiscountAmount()),
                     'currency' => $associatedOrder->getOrderCurrencyCode()
                 ]
             ];
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
@@ -150,7 +150,7 @@ private function getDiscountDetails(InvoiceInterface $invoice): array
             $discounts[] = [
                 'label' => $invoice->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
-                    'value' => abs($invoice->getDiscountAmount()),
+                    'value' => abs((float) $invoice->getDiscountAmount()),
                     'currency' => $invoice->getOrderCurrencyCode()
                 ]
             ];
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -123,7 +123,7 @@ private function getDiscountDetails(OrderInterface $order): array
             $orderDiscounts[] = [
                 'label' => $order->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
-                    'value' => abs($order->getDiscountAmount()),
+                    'value' => abs((float) $order->getDiscountAmount()),
                     'currency' => $order->getOrderCurrencyCode()
                 ]
             ];
@@ -196,7 +196,7 @@ private function getShippingDiscountDetails(OrderInterface $order): array
                 [
                     'label' => $order->getDiscountDescription() ?? __('Discount'),
                     'amount' => [
-                        'value' => abs($order->getShippingDiscountAmount()),
+                        'value' => abs((float) $order->getShippingDiscountAmount()),
                         'currency' => $order->getOrderCurrencyCode()
                     ]
                 ];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php
@@ -414,7 +414,6 @@ public function priceDataProvider() : array
         ];
     }
 
-
     /**
      * Check the pricing for a grouped product with simple products having special price set
      *
@@ -750,7 +749,7 @@ public function testConfigurableProductWithVariantsHavingSpecialAndTierPrices()
                         "value" => $configurableProductVariants[$key]->getPrice()
                     ],
                     "final_price" => [
-                        "value" => round($configurableProductVariants[$key]->getSpecialPrice(), 2)
+                        "value" => round((float) $configurableProductVariants[$key]->getSpecialPrice(), 2)
                     ],
                     "discount" => [
                         "amount_off" => ($regularPrice[$key] - $finalPrice[$key]),
@@ -762,7 +761,7 @@ public function testConfigurableProductWithVariantsHavingSpecialAndTierPrices()
                         "value" => $configurableProductVariants[$key]->getPrice()
                     ],
                     "final_price" => [
-                        "value" => round($configurableProductVariants[$key]->getSpecialPrice(), 2)
+                        "value" => round((float) $configurableProductVariants[$key]->getSpecialPrice(), 2)
                     ],
                     "discount" => [
                         "amount_off" => $regularPrice[$key] - $finalPrice[$key],

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ protected function getStore($scope = null)`
`152`	`152`	`*/`
`153`	`153`	`public function round($price)`
`154`	`154`	`{`
`155`		`- return round($price, 2);`
	`155`	`+ return round((float) $price, 2);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ private function getDiscountDetails(OrderInterface $associatedOrder, OrderItemIn`
`227`	`227`	`$discounts [] = [`
`228`	`228`	`'label' => $associatedOrder->getDiscountDescription() ?? __('Discount'),`
`229`	`229`	`'amount' => [`
`230`		`- 'value' => abs($orderItem->getDiscountAmount()) ?? 0,`
	`230`	`+ 'value' => abs((float) $orderItem->getDiscountAmount()),`
`231`	`231`	`'currency' => $associatedOrder->getOrderCurrencyCode()`
`232`	`232`	`]`
`233`	`233`	`];`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private function formatDiscountDetails(`
`148`	`148`	`$discounts[] = [`
`149`	`149`	`'label' => $associatedOrder->getDiscountDescription() ?? __('Discount'),`
`150`	`150`	`'amount' => [`
`151`		`- 'value' => abs($creditmemoItem->getDiscountAmount()) ?? 0,`
	`151`	`+ 'value' => abs((float) $creditmemoItem->getDiscountAmount()),`
`152`	`152`	`'currency' => $associatedOrder->getOrderCurrencyCode()`
`153`	`153`	`]`
`154`	`154`	`];`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private function formatDiscountDetails(OrderInterface $associatedOrder, InvoiceI`
`146`	`146`	`$discounts[] = [`
`147`	`147`	`'label' => $associatedOrder->getDiscountDescription() ?? __('Discount'),`
`148`	`148`	`'amount' => [`
`149`		`- 'value' => abs($invoiceItem->getDiscountAmount()) ?? 0,`
	`149`	`+ 'value' => abs((float) $invoiceItem->getDiscountAmount()),`
`150`	`150`	`'currency' => $associatedOrder->getOrderCurrencyCode()`
`151`	`151`	`]`
`152`	`152`	`];`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ private function getDiscountDetails(InvoiceInterface $invoice): array`
`150`	`150`	`$discounts[] = [`
`151`	`151`	`'label' => $invoice->getDiscountDescription() ?? __('Discount'),`
`152`	`152`	`'amount' => [`
`153`		`- 'value' => abs($invoice->getDiscountAmount()),`
	`153`	`+ 'value' => abs((float) $invoice->getDiscountAmount()),`
`154`	`154`	`'currency' => $invoice->getOrderCurrencyCode()`
`155`	`155`	`]`
`156`	`156`	`];`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ private function getDiscountDetails(OrderInterface $order): array`
`123`	`123`	`$orderDiscounts[] = [`
`124`	`124`	`'label' => $order->getDiscountDescription() ?? __('Discount'),`
`125`	`125`	`'amount' => [`
`126`		`- 'value' => abs($order->getDiscountAmount()),`
	`126`	`+ 'value' => abs((float) $order->getDiscountAmount()),`
`127`	`127`	`'currency' => $order->getOrderCurrencyCode()`
`128`	`128`	`]`
`129`	`129`	`];`
`@@ -196,7 +196,7 @@ private function getShippingDiscountDetails(OrderInterface $order): array`
`196`	`196`	`[`
`197`	`197`	`'label' => $order->getDiscountDescription() ?? __('Discount'),`
`198`	`198`	`'amount' => [`
`199`		`- 'value' => abs($order->getShippingDiscountAmount()),`
	`199`	`+ 'value' => abs((float) $order->getShippingDiscountAmount()),`
`200`	`200`	`'currency' => $order->getOrderCurrencyCode()`
`201`	`201`	`]`
`202`	`202`	`];`