addressed comments: backwards compatibility, inheritance based API and and long var names from codacy/pr

Author: bka

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -140,7 +140,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
     /**
      * @var \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage
      */
-    private $minimumAmountErrorMessage;
+    private $minimumAmountMessage;
 
     /**
      * @param EventManager $eventManager
@@ -163,7 +163,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Api\AccountManagementInterface $accountManagement
      * @param QuoteFactory $quoteFactory
-     * @param Quote\Validator\MinimumOrderAmount\ValidationMessage $minimumAmountErrorMessage
+     * @param Quote\Validator\MinimumOrderAmount\ValidationMessage $minimumAmountMessage
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -187,7 +187,7 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Api\AccountManagementInterface $accountManagement,
         \Magento\Quote\Model\QuoteFactory $quoteFactory,
-        \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage $minimumAmountErrorMessage
+        \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage $minimumAmountMessage = null
     ) {
         $this->eventManager = $eventManager;
         $this->quoteValidator = $quoteValidator;
@@ -209,7 +209,8 @@ public function __construct(
         $this->accountManagement = $accountManagement;
         $this->customerSession = $customerSession;
         $this->quoteFactory = $quoteFactory;
-        $this->minimumAmountErrorMessage = $minimumAmountErrorMessage;
+        $this->minimumAmountMessage = $minimumAmountMessage ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage::class);
     }
 
     /**
@@ -330,7 +331,7 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
     {
         $quote = $this->quoteRepository->getActive($cartId);
         if (!$quote->validateMinimumAmount($quote->getIsMultiShipping())) {
-            throw new InputException($this->minimumAmountErrorMessage->getMessage());
+            throw new InputException($this->minimumAmountMessage->getMessage());
         }
 
         if ($paymentMethod) {

app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php

@@ -124,7 +124,7 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage
      */
-    protected $minimumAmountErrorMessage;
+    private $minimumAmountMessage;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -256,7 +256,7 @@ protected function setUp()
             false
         );
 
-        $this->minimumAmountErrorMessage = $this->getMock(
+        $this->minimumAmountMessage = $this->getMock(
             \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage::class,
             ['getMessage'],
             [],
@@ -288,7 +288,7 @@ protected function setUp()
                 'customerSession' => $this->customerSessionMock,
                 'accountManagement' => $this->accountManagementMock,
                 'quoteFactory' => $this->quoteFactoryMock,
-                'minimumAmountErrorMessage' => $this->minimumAmountErrorMessage
+                'minimumAmountMessage' => $this->minimumAmountMessage
             ]
         );
 
@@ -724,7 +724,7 @@ public function testPlaceOrderIfCustomerIsGuest()
         $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(false);
         $this->quoteMock->expects($this->once())->method('validateMinimumAmount')->with(false)->willReturn(true);
 
-        $this->minimumAmountErrorMessage->expects($this->never())->method('getMessage');
+        $this->minimumAmountMessage->expects($this->never())->method('getMessage');
 
         $addressMock = $this->getMock(\Magento\Quote\Model\Quote\Address::class, ['getEmail'], [], '', false);
         $addressMock->expects($this->once())->method('getEmail')->willReturn($email);
@@ -760,7 +760,7 @@ public function testPlaceOrderIfCustomerIsGuest()
                 'customerSession' => $this->customerSessionMock,
                 'accountManagement' => $this->accountManagementMock,
                 'quoteFactory' => $this->quoteFactoryMock,
-                'minimumAmountErrorMessage' => $this->minimumAmountErrorMessage
+                'minimumAmountMessage' => $this->minimumAmountMessage
             ]
         );
         $orderMock = $this->getMock(
@@ -819,7 +819,7 @@ public function testPlaceOrder()
                 'customerSession' => $this->customerSessionMock,
                 'accountManagement' => $this->accountManagementMock,
                 'quoteFactory' => $this->quoteFactoryMock,
-                'minimumAmountErrorMessage' => $this->minimumAmountErrorMessage
+                'minimumAmountMessage' => $this->minimumAmountMessage
             ]
         );
         $orderMock = $this->getMock(
@@ -854,7 +854,7 @@ public function testPlaceOrder()
         $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(false);
         $this->quoteMock->expects($this->once())->method('validateMinimumAmount')->with(false)->willReturn(true);
 
-        $this->minimumAmountErrorMessage->expects($this->never())->method('getMessage');
+        $this->minimumAmountMessage->expects($this->never())->method('getMessage');
 
         $service->expects($this->once())->method('submit')->willReturn($orderMock);
 
@@ -894,7 +894,7 @@ public function testPlaceOrderWithViolationOfMinimumAmount()
         $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(false);
         $this->quoteMock->expects($this->once())->method('validateMinimumAmount')->with(false)->willReturn(false);
 
-        $this->minimumAmountErrorMessage->expects($this->once())
+        $this->minimumAmountMessage->expects($this->once())
             ->method('getMessage')
             ->willReturn(__('Incorrect amount'));
 
@@ -928,7 +928,7 @@ public function testPlaceOrderWithViolationOfMinimumAmount()
                 'customerSession' => $this->customerSessionMock,
                 'accountManagement' => $this->accountManagementMock,
                 'quoteFactory' => $this->quoteFactoryMock,
-                'minimumAmountErrorMessage' => $this->minimumAmountErrorMessage
+                'minimumAmountMessage' => $this->minimumAmountMessage
             ]
         );