Merge branch 'AC-465' into 2.4-bugfixes-121621

Author: dvoskoboinikov

lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php

@@ -13,7 +13,6 @@
 use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\SerializationException;
 use Magento\Framework\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
@@ -98,7 +97,7 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
     private $defaultPageSize;
 
     /**
-     * @var DefaultPageSizeSetter
+     * @var DefaultPageSizeSetter|null
      */
     private $defaultPageSizeSetter;
 
@@ -177,19 +176,19 @@ private function getNameFinder()
      * @param string $serviceMethodName name of the method that we are trying to call
      * @param array $inputArray data to send to method in key-value format
      * @return array list of parameters that can be used to call the service method
-     * @throws Exception
-     * @throws LocalizedException
+     * @throws WebapiException
      */
     public function process($serviceClassName, $serviceMethodName, array $inputArray)
     {
         $inputData = [];
         $inputError = [];
-
         foreach ($this->methodsMap->getMethodParams($serviceClassName, $serviceMethodName) as $param) {
             $paramName = $param[MethodsMap::METHOD_META_NAME];
             $snakeCaseParamName = strtolower(preg_replace("/(?<=\\w)(?=[A-Z])/", "_$1", $paramName));
             if (isset($inputArray[$paramName]) || isset($inputArray[$snakeCaseParamName])) {
-                $paramValue = $inputArray[$paramName] ?? $inputArray[$snakeCaseParamName];
+                $paramValue = isset($inputArray[$paramName])
+                    ? $inputArray[$paramName]
+                    : $inputArray[$snakeCaseParamName];
 
                 try {
                     $inputData[] = $this->convertValue($paramValue, $param[MethodsMap::METHOD_META_TYPE]);
@@ -204,9 +203,7 @@ public function process($serviceClassName, $serviceMethodName, array $inputArray
                 }
             }
         }
-
         $this->processInputError($inputError);
-
         return $inputData;
     }
 
@@ -217,7 +214,7 @@ public function process($serviceClassName, $serviceMethodName, array $inputArray
      * @param array $data
      * @return array
      * @throws \ReflectionException
-     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getConstructorData(string $className, array $data): array
     {
@@ -491,7 +488,7 @@ protected function _createDataObjectForTypeAndArrayValue($type, $customAttribute
      * @param mixed $data
      * @param string $type Convert given value to the this type
      * @return mixed
-     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function convertValue($data, $type)
     {