Merge remote-tracking branch 'remotes/mainline_ce/develop' into MAGETWO-32996

Author: Pechenushko

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

@@ -96,7 +96,7 @@ public function load()
                 ->setValue($this->getQuery() . '%')
                 ->create();
         }
-        $this->searchCriteriaBuilder->addFilter($filters);
+        $this->searchCriteriaBuilder->addFilters($filters);
         $searchCriteria = $this->searchCriteriaBuilder->create();
         $searchResults = $this->customerRepository->getList($searchCriteria);
 

app/code/Magento/Catalog/Api/Data/CategoryAttributeSearchResultsInterface.php

@@ -24,5 +24,5 @@ public function getItems();
      * @param \Magento\Catalog\Api\Data\CategoryAttributeInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }

app/code/Magento/Catalog/Api/Data/ProductAttributeSearchResultsInterface.php

@@ -24,5 +24,5 @@ public function getItems();
      * @param \Magento\Catalog\Api\Data\ProductAttributeInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }

app/code/Magento/Catalog/Api/Data/ProductSearchResultsInterface.php

@@ -24,5 +24,5 @@ public function getItems();
      * @param \Magento\Catalog\Api\Data\ProductInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }

app/code/Magento/Catalog/Model/Category/AttributeRepository.php

@@ -73,7 +73,7 @@ public function getCustomAttributesMetadata($dataObjectClassName = null)
         $defaultAttributeSetId = $this->eavConfig
             ->getEntityType(\Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE)
             ->getDefaultAttributeSetId();
-        $searchCriteria = $this->searchCriteriaBuilder->addFilter(
+        $searchCriteria = $this->searchCriteriaBuilder->addFilters(
             [
                 $this->filterBuilder
                     ->setField('attribute_set_id')

app/code/Magento/Catalog/Model/Product/Attribute/Repository.php

@@ -212,7 +212,7 @@ public function getCustomAttributesMetadata($dataObjectClassName = null)
         $defaultAttributeSetId = $this->eavConfig
             ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
             ->getDefaultAttributeSetId();
-        $searchCriteria = $this->searchCriteriaBuilder->addFilter(
+        $searchCriteria = $this->searchCriteriaBuilder->addFilters(
             [
                 $this->filterBuilder
                     ->setField('attribute_set_id')

app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php

@@ -62,7 +62,7 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet)
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
-        $this->searchCriteriaBuilder->addFilter(
+        $this->searchCriteriaBuilder->addFilters(
             [
                 $this->filterBuilder
                     ->setField('entity_type_code')

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -652,7 +652,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $defaultAttributeSetId = $this->eavConfig
             ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
             ->getDefaultAttributeSetId();
-        $extendedSearchCriteria = $this->searchCriteriaBuilder->addFilter(
+        $extendedSearchCriteria = $this->searchCriteriaBuilder->addFilters(
             [
                 $this->filterBuilder
                     ->setField('attribute_set_id')

app/code/Magento/Catalog/Test/Unit/Model/Category/AttributeRepositoryTest.php

@@ -114,7 +114,7 @@ public function testGetCustomAttributesMetadata()
             3
         )->willReturnSelf();
         $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($filterMock);
-        $this->searchBuilderMock->expects($this->once())->method('addFilter')->with([$filterMock])->willReturnSelf();
+        $this->searchBuilderMock->expects($this->once())->method('addFilters')->with([$filterMock])->willReturnSelf();
         $searchCriteriaMock = $this->getMock('Magento\Framework\Api\SearchCriteria', [], [], '', false);
         $this->searchBuilderMock->expects($this->once())->method('create')->willReturn($searchCriteriaMock);
         $itemMock = $this->getMock('Magento\Framework\Object', [], [], '', false);

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php

@@ -180,7 +180,7 @@ public function testGetCustomAttributesMetadata()
             ->willReturnSelf();
         $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($filterMock);
         $this->searchCriteriaBuilderMock->expects($this->once())
-            ->method('addFilter')
+            ->method('addFilters')
             ->with([$filterMock])
             ->willReturnSelf();
         $searchCriteriaMock = $this->getMock('Magento\Framework\Api\SearchCriteria', [], [], '', false);