33337: eliminated laminas-i18n and laminas-filter dependency

Author: korovitskyi

app/code/Magento/Checkout/Model/Cart/RequestQuantityProcessor.php

@@ -8,6 +8,7 @@
 namespace Magento\Checkout\Model\Cart;
 
 use Magento\Framework\Locale\ResolverInterface;
+use NumberFormatter;
 
 /**
  * Cart request quantity processor
@@ -37,13 +38,11 @@ public function __construct(
      */
     public function process(array $cartData): array
     {
-        $filter = new \Laminas\I18n\Filter\NumberParse($this->localeResolver->getLocale());
-
         foreach ($cartData as $index => $data) {
             if (isset($data['qty'])) {
                 $data['qty'] = $this->prepareQuantity($data['qty']);
                 $data['qty'] = is_string($data['qty']) ? trim($data['qty']) : $data['qty'];
-                $cartData[$index]['qty'] = $filter->filter($data['qty']);
+                $cartData[$index]['qty'] = $this->filter($data['qty']);
             }
         }
 
@@ -55,12 +54,11 @@ public function process(array $cartData): array
      *
      * @param int|float|string|array $quantity
      * @return int|float|string|array
-     * @throws \Zend_Locale_Exception
      */
     public function prepareQuantity($quantity)
     {
-        $formatter = new \NumberFormatter($this->localeResolver->getLocale(), \NumberFormatter::CURRENCY);
-        $decimalSymbol = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
+        $formatter = new NumberFormatter($this->localeResolver->getLocale(), NumberFormatter::CURRENCY);
+        $decimalSymbol = $formatter->getSymbol(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
 
         if (is_array($quantity)) {
             foreach ($quantity as $key => $qty) {
@@ -70,8 +68,47 @@ public function prepareQuantity($quantity)
             }
         } else {
             if (strpos((string)$quantity, '.') !== false && $decimalSymbol !== '.') {
-                $quantity = str_replace('.', $decimalSymbol, (string)$quantity);
+                $quantity = str_replace('.', $decimalSymbol, (string) $quantity);
+            }
+        }
+
+        return $quantity;
+    }
+
+    /**
+     * Filter quantity value and parse it by region if needed.
+     *
+     * @param float|int|array|string $quantity
+     *
+     * @return float|int|array|string
+     */
+    private function filter($quantity)
+    {
+        $formatter = new NumberFormatter($this->localeResolver->getLocale(), NumberFormatter::DEFAULT_STYLE);
+
+        if (is_array($quantity)) {
+            foreach ($quantity as $key => $qty) {
+                $quantity[$key] = $this->parseFormat($qty, $formatter);
             }
+        } else {
+            $quantity = $this->parseFormat($quantity, $formatter);
+        }
+
+        return $quantity;
+    }
+
+    /**
+     * Phrase quantity value if needed.
+     *
+     * @param float|int|string $quantity
+     * @param NumberFormatter $formatter
+     *
+     * @return float|int|string
+     */
+    private function parseFormat($quantity, NumberFormatter $formatter)
+    {
+        if (!is_float($quantity) && !is_int($quantity)) {
+            return $formatter->parse($quantity);
         }
 
         return $quantity;

composer.json

@@ -42,9 +42,7 @@
         "laminas/laminas-di": "^3.2.0",
         "laminas/laminas-eventmanager": "^3.0.0",
         "laminas/laminas-feed": "^2.13.0",
-        "laminas/laminas-filter": "^2.11",
         "laminas/laminas-http": "^2.6.0",
-        "laminas/laminas-i18n": "^2.7.3",
         "laminas/laminas-json": "^3.2.0",
         "laminas/laminas-mail": "^2.9.0",
         "laminas/laminas-mime": "^2.8.0",