Merge remote-tracking branch 'origin/MAGETWO-36857' into develop

Author: Roman Ganin

app/code/Magento/Reports/Model/Resource/Quote/Collection.php

@@ -81,7 +81,8 @@ public function addSubtotal($storeIds = '', $filter = null)
             $this->getSelect()->columns(
                 ['subtotal' => '(main_table.base_subtotal_with_discount*main_table.base_to_global_rate)']
             );
-            $this->_joinedFields['subtotal'] = '(main_table.base_subtotal_with_discount*main_table.base_to_global_rate)';
+            $this->_joinedFields['subtotal'] =
+                '(main_table.base_subtotal_with_discount*main_table.base_to_global_rate)';
         } else {
             $this->getSelect()->columns(['subtotal' => 'main_table.base_subtotal_with_discount']);
             $this->_joinedFields['subtotal'] = 'main_table.base_subtotal_with_discount';

app/code/Magento/Reports/Model/Resource/Quote/Item/Collection.php

@@ -8,6 +8,8 @@
 
 /**
  * Collection of Magento\Quote\Model\Quote\Item
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
 {

app/code/Magento/Reports/Test/Unit/Model/Resource/Quote/Item/CollectionTest.php

@@ -271,6 +271,4 @@ function () {
             $this->collection->getItems()[0]->getData()
         );
     }
-
 }
-

dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php

@@ -34,4 +34,4 @@ public function testGridContent()
         $this->assertEquals('customer@example.com', $quote->getCustomerEmail());
         $this->assertEquals(10.00, $quote->getSubtotal());
     }
-}
+}

dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/GridTestAbstract.php

@@ -29,4 +29,4 @@ protected function setUp()
         $quoteFixture->setCustomer($customerData);
         $quoteFixture->save();
     }
-}
+}

dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Product/GridTest.php

@@ -36,4 +36,4 @@ public function testGridContent()
         $this->assertEquals(1, $quoteItem->getProductId());
         $this->assertEquals('Simple Product', $quoteItem->getName());
     }
-}
+}