Merge remote-tracking branch 'origin/MC-33856-CE-2' into MC-33856

zakdma · zakdma · commit 7dca786fe759 · 2020-04-30T16:28:06.000+03:00
# Conflicts:
#	app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
diff --git a/app/code/Magento/Wishlist/Model/LocaleQuantityProcessor.php b/app/code/Magento/Wishlist/Model/LocaleQuantityProcessor.php
@@ -43,10 +43,11 @@ public function __construct(
     public function process($qty)
     {
         $this->localFilter->setOptions(['locale' => $this->localeResolver->getLocale()]);
-        $qty = $this->localFilter->filter($qty);
+        $qty = $this->localFilter->filter((string)$qty);
         if ($qty < 0) {
             $qty = null;
         }
+
         return $qty;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,11 @@ public function __construct(`
`43`	`43`	`public function process($qty)`
`44`	`44`	`{`
`45`	`45`	`$this->localFilter->setOptions(['locale' => $this->localeResolver->getLocale()]);`
`46`		`- $qty = $this->localFilter->filter($qty);`
	`46`	`+ $qty = $this->localFilter->filter((string)$qty);`
`47`	`47`	`if ($qty < 0) {`
`48`	`48`	`$qty = null;`
`49`	`49`	`}`
	`50`	`+`
`50`	`51`	`return $qty;`
`51`	`52`	`}`
`52`	`53`	`}`