Merge remote-tracking branch 'trigger/imported-karyna-tsymbal-atwix-magento2-34617' into ph-delivery

Author: xmav

app/code/Magento/CatalogInventory/Model/StockStateProvider.php

@@ -135,7 +135,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
         $result->addData($this->checkQtyIncrements($stockItem, $qty)->getData());
 
         $result->setItemIsQtyDecimal($stockItem->getIsQtyDecimal());
-        if (!$stockItem->getIsQtyDecimal() && (floor($qty) !== $qty)) {
+        if (!$stockItem->getIsQtyDecimal() && (floor($qty) !== (float) $qty)) {
             $result->setHasError(true)
                 ->setMessage(__('You cannot use decimal quantity for this product.'))
                 ->setErrorCode('qty_decimal')

dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php

@@ -71,7 +71,10 @@ public function testNoAuthorizedServices()
         curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
         $responseContent = curl_exec($connection);
         $this->assertEquals(curl_getinfo($connection, CURLINFO_HTTP_CODE), 401);
-        $this->assertStringContainsString("The consumer isn't authorized to access %resources.", $responseContent);
+        $this->assertStringContainsString(
+            "The consumer isn't authorized to access %resources.",
+            htmlspecialchars_decode($responseContent, ENT_QUOTES)
+        );
     }
 
     public function testInvalidWsdlUrlNoServices()