Merge branch 'MAGETWO-95945' into 2.3-bugfixes-020119

Author: dvoskoboinikov

app/code/Magento/Backend/Model/Search/Customer.php

@@ -89,7 +89,7 @@ public function load()
 
         $this->searchCriteriaBuilder->setCurrentPage($this->getStart());
         $this->searchCriteriaBuilder->setPageSize($this->getLimit());
-        $searchFields = ['firstname', 'lastname', 'company'];
+        $searchFields = ['firstname', 'lastname', 'billing_company'];
         $filters = [];
         foreach ($searchFields as $field) {
             $filters[] = $this->filterBuilder

app/code/Magento/Bundle/Model/Product/SaveHandler.php

@@ -58,6 +58,8 @@ public function __construct(
     }
 
     /**
+     * Perform action on Bundle product relation/extension attribute
+     *
      * @param object $entity
      * @param array $arguments
      *
@@ -83,7 +85,7 @@ public function execute($entity, $arguments = [])
             : [];
 
         if (!$entity->getCopyFromView()) {
-            $this->processRemovedOptions($entity->getSku(), $existingOptionsIds, $optionIds);
+            $this->processRemovedOptions($entity, $existingOptionsIds, $optionIds);
             $newOptionsIds = array_diff($optionIds, $existingOptionsIds);
             $this->saveOptions($entity, $bundleProductOptions, $newOptionsIds);
         } else {
@@ -96,6 +98,8 @@ public function execute($entity, $arguments = [])
     }
 
     /**
+     * Remove option product links
+     *
      * @param string $entitySku
      * @param \Magento\Bundle\Api\Data\OptionInterface $option
      * @return void
@@ -154,16 +158,19 @@ private function getOptionIds(array $options): array
     /**
      * Removes old options that no longer exists.
      *
-     * @param string $entitySku
+     * @param ProductInterface $entity
      * @param array $existingOptionsIds
      * @param array $optionIds
      * @return void
      */
-    private function processRemovedOptions(string $entitySku, array $existingOptionsIds, array $optionIds): void
+    private function processRemovedOptions(ProductInterface $entity, array $existingOptionsIds, array $optionIds): void
     {
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $parentId = $entity->getData($metadata->getLinkField());
         foreach (array_diff($existingOptionsIds, $optionIds) as $optionId) {
-            $option = $this->optionRepository->get($entitySku, $optionId);
-            $this->removeOptionLinks($entitySku, $option);
+            $option = $this->optionRepository->get($entity->getSku(), $optionId);
+            $option->setParentId($parentId);
+            $this->removeOptionLinks($entity->getSku(), $option);
             $this->optionRepository->delete($option);
         }
     }

app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php

@@ -32,18 +32,20 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\InputException
      */
     public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
 
     /**
      * Remove the product assignment from the category by category id and sku
      *
-     * @param string $sku
+     * @param string $categoryId
      * @param string $sku
      * @return bool will returned True if products successfully deleted
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\InputException
      */
     public function deleteByIds($categoryId, $sku);
 }

app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php

@@ -139,7 +139,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
     }
 
     /**
-     * Get fiter items count
+     * Get filter items count
      *
      * @return int
      */

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml

@@ -17,6 +17,8 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-61717"/>
             <group value="Catalog"/>
+            <!-- skip due to MAGETWO-97424 -->
+            <group value="skip"/>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>

app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php

@@ -5,8 +5,11 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
+/**
+ * Edit CMS block action.
+ */
 class Edit extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
     /**

app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php

@@ -1,13 +1,15 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
+/**
+ * Index action.
+ */
 class Index extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
     /**

app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php

@@ -6,6 +6,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
@@ -14,7 +15,7 @@
 /**
  * Class MassDelete
  */
-class MassDelete extends \Magento\Backend\App\Action
+class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session

app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php

@@ -1,13 +1,15 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
+/**
+ * Create CMS block action.
+ */
 class NewAction extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
     /**

app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php

@@ -1,12 +1,11 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Cms\Api\BlockRepositoryInterface;
 use Magento\Cms\Model\Block;
@@ -15,6 +14,9 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
 
+/**
+ * Save CMS block action.
+ */
 class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface
 {
     /**