AC-746: Malformed request body or parameters cause Internal Server Error

Author: wip44850

dev/tests/api-functional/testsuite/Magento/Framework/Webapi/ApiErrorProcessorTest.php

@@ -84,7 +84,7 @@ public static function malformedRequestParamsDataProvider()
                     ]
                 ],
                 'endpoint' => 'eav/attribute-sets/list',
-                'expectedExceptionCode' => 500,
+                'expectedExceptionCode' => 400,
             ],
             'empty_filter_groups_value' => [
                 'requestData' => [
@@ -118,7 +118,7 @@ public static function malformedRequestParamsDataProvider()
                     ]
                 ],
                 'endpoint' => 'cmsBlock/search',
-                'expectedExceptionCode' => 500,
+                'expectedExceptionCode' => 400,
             ],
             'empty_filter_groups_value2' => [
                 'requestData' => [

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

@@ -179,6 +179,7 @@ private function getClientErrorHttpCode(\Exception $exception)
     {
         // Check if this is a client error based on the exception type
         if ($exception instanceof \Zend_Db_Exception
+            || $exception instanceof \Exception
             || $exception instanceof \Zend_Db_Adapter_Exception
             || $exception instanceof \Zend_Db_Statement_Exception
             || $exception instanceof \PDOException