MAGETWO-36882: Stabilizing branch

Author: valdislav

app/code/Magento/Sales/Model/Resource/EntityAbstract.php

@@ -209,6 +209,7 @@ protected function processRelations(\Magento\Framework\Model\AbstractModel $obje
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {

app/code/Magento/Sales/Model/Resource/Order.php

@@ -101,9 +101,7 @@ public function aggregateProductsByTypes($orderId, $productTypeIds = [], $isProd
             $select->where(
                 sprintf(
                     '(o.product_type %s (?))',
-                    $isProductTypeIn
-                        ? 'IN'
-                        : 'NOT IN'
+                    $isProductTypeIn ? 'IN' : 'NOT IN'
                 ),
                 $productTypeIds
             );