Merge branch 'ACP2E-2949' of https://github.com/adobe-commerce-tier-4/magento2ce into T4-PR-04-08-2024

Author: chittima

lib/internal/Magento/Framework/Model/AbstractModel.php

@@ -1040,12 +1040,14 @@ public function getEventPrefix()
     private function checkAndConvertNumericValue(mixed $key, mixed $value): void
     {
         if (array_key_exists($key, $this->_data) && is_numeric($this->_data[$key])
-            && $value != null
+            && $value !== null
         ) {
-            if (is_int($value)) {
-                $this->_data[$key] = (int) $this->_data[$key];
-            } elseif (is_float($value)) {
+            if (is_float($value) ||
+                (is_string($value) && preg_match('/^-?\d*\.\d+$/', $value))
+            ) {
                 $this->_data[$key] = (float) $this->_data[$key];
+            } elseif (is_int($value)) {
+                $this->_data[$key] = (int) $this->_data[$key];
             }
         }
     }

lib/internal/Magento/Framework/Model/Test/Unit/AbstractModelTest.php

@@ -233,6 +233,8 @@ public function getKeyValueDataPairs(): array
             'when test data and compare data are float' => [['key' => 1.0], 'key', 1.0, false],
             'when test data is 0 and compare data is null' => [['key' => 0], 'key', null, false],
             'when test data is null and compare data is 0' => [['key' => null], 'key', 0, false],
+            'when test data is string array and compare data is int' => [['key' => '10'], 'key', 10, false],
+            'when test data is string array and compare data is float' => [['key' => '22.00'], 'key', 22.00, false]
         ];
     }
 }