Merge remote-tracking branch '38282/fix-35931' into commpr-21755-0809

Author: harshityadav90

app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php

@@ -1,12 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Webapi\Controller\Rest;
 
+use Magento\Framework\Webapi\Exception as WebapiException;
 use Magento\Framework\Webapi\Rest\Response as RestResponse;
 use Magento\Framework\Webapi\ServiceOutputProcessor;
 use Magento\Framework\Webapi\Rest\Response\FieldsFilter;
@@ -19,7 +20,7 @@
  */
 class SynchronousRequestProcessor implements RequestProcessorInterface
 {
-    const PROCESSOR_PATH = "/^\\/V\\d+/";
+    public const PROCESSOR_PATH = "/^\\/V\\d+/";
 
     /**
      * @var RestResponse
@@ -78,7 +79,7 @@ public function __construct(
     }
 
     /**
-     *  {@inheritdoc}
+     * @inheritdoc
      */
     public function process(\Magento\Framework\Webapi\Rest\Request $request)
     {
@@ -92,7 +93,13 @@ public function process(\Magento\Framework\Webapi\Rest\Request $request)
         /**
          * @var \Magento\Framework\Api\AbstractExtensibleObject $outputData
          */
-        $outputData = call_user_func_array([$service, $serviceMethodName], $inputParams);
+        try {
+            // phpcs:disable Magento2.Functions.DiscouragedFunction
+            $outputData = call_user_func_array([$service, $serviceMethodName], $inputParams);
+            // phpcs:enable Magento2.Functions.DiscouragedFunction
+        } catch (\TypeError $e) {
+            throw new WebapiException(__($e->getMessage()));
+        }
         $outputData = $this->serviceOutputProcessor->process(
             $outputData,
             $serviceClassName,
@@ -109,7 +116,7 @@ public function process(\Magento\Framework\Webapi\Rest\Request $request)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
     {

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -181,6 +181,26 @@ public function testShipOrder()
         );
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/order_new.php
+     */
+    public function testShipOrderWithTypeError()
+    {
+        /** @var Order $existingOrder */
+        $existingOrder = $this->getOrder('100000001');
+
+        $requestData = [
+            'orderId' => $existingOrder->getId(),
+            'items' => "[]",
+        ];
+
+        try {
+            $this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
+            $this->fail('Expected exception was not raised');
+        } catch (\Exception $exception) {
+        }
+    }
+
     /**
      * Tests that not providing a tracking number produces the correct error. See MAGETWO-95429
      * @codingStandardsIgnoreStart