Merge branch '2.3.5-develop' of github.com:magento/magento2ce into 2.3.5-asi

Author: sivaschenko

app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 
+/**
+ * Controller for removing quote item from shopping cart.
+ */
 class RemoveItem extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
 {
     /**
@@ -56,7 +59,7 @@ public function __construct(
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     public function execute()
     {
@@ -67,11 +70,17 @@ public function execute()
         try {
             $this->sidebar->checkQuoteItem($itemId);
             $this->sidebar->removeQuoteItem($itemId);
+
             return $this->jsonResponse();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             return $this->jsonResponse($e->getMessage());
+        } catch (\Zend_Db_Exception $e) {
+            $this->logger->critical($e);
+
+            return $this->jsonResponse(__('An unspecified error occurred. Please contact us for assistance.'));
         } catch (\Exception $e) {
             $this->logger->critical($e);
+
             return $this->jsonResponse($e->getMessage());
         }
     }
@@ -92,6 +101,8 @@ protected function jsonResponse($error = '')
     }
 
     /**
+     * Return formKey Validator object instance.
+     *
      * @return \Magento\Framework\Data\Form\FormKey\Validator
      * @deprecated 100.0.9
      */

app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php

@@ -234,6 +234,52 @@ public function testExecuteWithException()
         $this->assertEquals('json represented', $this->removeItem->execute());
     }
 
+    /**
+     * Test controller when DB exception is thrown.
+     *
+     * @return void
+     */
+    public function testExecuteWithDbException(): void
+    {
+        $itemId = 1;
+        $dbError = 'Error';
+        $message = __('An unspecified error occurred. Please contact us for assistance.');
+        $response = [
+            'success' => false,
+            'error_message' => $message,
+        ];
+
+        $this->getPropertyValue($this->removeItem, 'formKeyValidator')
+            ->expects($this->once())
+            ->method('validate')
+            ->with($this->requestMock)
+            ->willReturn(true);
+        $this->requestMock->expects($this->once())->method('getParam')->with('item_id')->willReturn($itemId);
+
+        $exception = new \Zend_Db_Exception($dbError);
+
+        $this->sidebarMock->expects($this->once())
+            ->method('checkQuoteItem')
+            ->with($itemId)
+            ->willThrowException($exception);
+
+        $this->loggerMock->expects($this->once())->method('critical')->with($exception);
+
+        $this->sidebarMock->expects($this->once())->method('getResponseData')->with($message)->willReturn($response);
+        $encodedResponse = json_encode($response);
+        $this->jsonHelperMock->expects($this->once())
+            ->method('jsonEncode')
+            ->with($response)
+            ->willReturn($encodedResponse);
+
+        $this->responseMock->expects($this->once())
+            ->method('representJson')
+            ->with($encodedResponse)
+            ->willReturn($this->responseMock);
+
+        $this->removeItem->execute();
+    }
+
     public function testExecuteWhenFormKeyValidationFailed()
     {
         $resultRedirect = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);

lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php

@@ -160,7 +160,7 @@ private function handleObjectMethod(Template $filter, array $templateVariables,
     {
         $object = $stackArgs[$i - 1]['variable'];
         $method = $stackArgs[$i]['name'];
-        if (method_exists($object, $method)) {
+        if (method_exists($object, $method) && substr($method, 0, 3) !== 'set') {
             $args = $this->getStackArgs($stackArgs[$i]['args'], $filter, $templateVariables);
             $stackArgs[$i]['variable'] = call_user_func_array([$object, $method], $args);
         }