Merge remote-tracking branch 'remotes/mainline_ce/develop' into MAGET…

…WO-32996
magento · Jul 9, 2015 · c2b7723 · c2b7723
2 parents f5b0c4a + 1988a1b
commit c2b7723
Show file tree

Hide file tree

Showing 107 changed files with 218 additions and 192 deletions.
diff --git a/app/code/Magento/Backend/Model/Search/Customer.php b/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);
 

diff --git a/app/code/Magento/Catalog/Api/Data/CategoryAttributeSearchResultsInterface.php b/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);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeSearchResultsInterface.php b/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);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductSearchResultsInterface.php b/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);
 }
diff --git a/app/code/Magento/Catalog/Model/Category/AttributeRepository.php b/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')

diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php b/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')

diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php b/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')

diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/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')

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/AttributeRepositoryTest.php b/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);

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php b/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);

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/SetRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/SetRepositoryTest.php
@@ -181,7 +181,7 @@ public function testGetList()
         $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($filterMock);
 
         $this->searchCriteriaBuilderMock->expects($this->once())
-            ->method('addFilter')
+            ->method('addFilters')
             ->with([$filterMock])
             ->willReturnSelf();
         $this->searchCriteriaBuilderMock->expects($this->once())

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
@@ -573,7 +573,7 @@ public function testGetList()
         $this->filterBuilderMock->expects($this->once())->method('setValue')
             ->with(4)
             ->willReturn($this->filterBuilderMock);
-        $this->searchCriteriaBuilderMock->expects($this->once())->method('addFilter')->with([$filterMock])
+        $this->searchCriteriaBuilderMock->expects($this->once())->method('addFilters')->with([$filterMock])
             ->willReturn($searchCriteriaBuilderMock);
         $searchCriteriaBuilderMock->expects($this->once())->method('create')->willReturn($extendedSearchCriteriaMock);
         $this->metadataServiceMock->expects($this->once())->method('getList')->with($extendedSearchCriteriaMock)

diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml
@@ -21,7 +21,7 @@
                     <block class="Magento\Framework\View\Element\RendererList" name="category.product.type.details.renderers" as="details.renderers">
                         <block class="Magento\Framework\View\Element\Template" as="default"/>
                     </block>
-                    <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
+                    <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="Magento_Catalog::product/list/toolbar.phtml">
                         <block class="Magento\Theme\Block\Html\Pager" name="product_list_toolbar_pager"/>
                         <!-- The following code shows how to set your own pager increments -->
                         <!--

diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
@@ -30,5 +30,5 @@ public function getItems();
      * @param \Magento\CatalogInventory\Api\Data\StockInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
@@ -30,7 +30,7 @@ public function getItems();
      * @param \Magento\CatalogInventory\Api\Data\StockItemInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 
     /**
      * Get search criteria.

diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
@@ -27,7 +27,7 @@ public function getItems();
      * @param \Magento\CatalogInventory\Api\Data\StockStatusInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 
     /**
      * Get search criteria.

diff --git a/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php b/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php
@@ -26,5 +26,5 @@ public function getItems();
      * @param \Magento\Cms\Api\Data\BlockInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php b/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php
@@ -26,5 +26,5 @@ public function getItems();
      * @param \Magento\Cms\Api\Data\PageInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php b/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php
@@ -26,5 +26,5 @@ public function getItems();
      * @param \Magento\Customer\Api\Data\AddressInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php b/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php
@@ -26,5 +26,5 @@ public function getItems();
      * @param \Magento\Customer\Api\Data\CustomerInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php b/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php
@@ -26,5 +26,5 @@ public function getItems();
      * @param \Magento\Customer\Api\Data\GroupInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -154,8 +154,8 @@ public function getLoggedInGroups()
             ->setValue(self::CUST_GROUP_ALL)
             ->create();
         $searchCriteria = $this->searchCriteriaBuilder
-            ->addFilter($notLoggedInFilter)
-            ->addFilter($groupAll)
+            ->addFilters($notLoggedInFilter)
+            ->addFilters($groupAll)
             ->create();
         return $this->groupRepository->getList($searchCriteria)->getItems();
     }

diff --git a/app/code/Magento/Customer/Test/Unit/Model/Resource/Group/Grid/ServiceCollectionTest.php b/app/code/Magento/Customer/Test/Unit/Model/Resource/Group/Grid/ServiceCollectionTest.php
@@ -88,7 +88,7 @@ public function testGetSearchCriteriaImplicitEq()
             ->setCurrentPage(1)
             ->setPageSize(false)
             ->addSortOrder($sortOrder)
-            ->addFilter(
+            ->addFilters(
                 [$this->filterBuilder->setField('name')->setConditionType('eq')->setValue('Magento')->create()]
             )->create();
 
@@ -119,7 +119,7 @@ public function testGetSearchCriteriaOneField()
             ->setCurrentPage(1)
             ->setPageSize(0)
             ->addSortOrder($sortOrder)
-            ->addFilter([$filter])
+            ->addFilters([$filter])
             ->create();
 
         // Verifies that the search criteria Data Object created by the serviceCollection matches expected
@@ -150,7 +150,7 @@ public function testGetSearchCriteriaOr()
             ->setCurrentPage(1)
             ->setPageSize(0)
             ->addSortOrder($sortOrder)
-            ->addFilter(
+            ->addFilters(
                 [
                     $this->filterBuilder->setField($fieldA)->setConditionType('eq')->setValue($value)->create(),
                     $this->filterBuilder->setField($fieldB)->setConditionType('eq')->setValue($value)->create(),
@@ -186,13 +186,13 @@ public function testGetSearchCriteriaAnd()
             ->setCurrentPage(1)
             ->setPageSize(0)
             ->addSortOrder($sortOrder)
-            ->addFilter(
+            ->addFilters(
                 [
                     $this->filterBuilder->setField($fieldA)->setConditionType('gt')
                         ->setValue($value)->create(),
                 ]
             )
-            ->addFilter(
+            ->addFilters(
                 [
                     $this->filterBuilder->setField($fieldB)->setConditionType('gt')
                         ->setValue($value)->create(),

diff --git a/app/code/Magento/Eav/Api/Data/AttributeGroupSearchResultsInterface.php b/app/code/Magento/Eav/Api/Data/AttributeGroupSearchResultsInterface.php
@@ -21,5 +21,5 @@ public function getItems();
      * @param \Magento\Eav\Api\Data\AttributeGroupInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeSearchResultsInterface.php b/app/code/Magento/Eav/Api/Data/AttributeSearchResultsInterface.php
@@ -21,5 +21,5 @@ public function getItems();
      * @param \Magento\Eav\Api\Data\AttributeInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeSetSearchResultsInterface.php b/app/code/Magento/Eav/Api/Data/AttributeSetSearchResultsInterface.php
@@ -21,5 +21,5 @@ public function getItems();
      * @param \Magento\Eav\Api\Data\AttributeSetInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php b/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
@@ -101,7 +101,7 @@ public function getAddress()
                     ->setConditionType('eq')
                     ->create();
                 $addresses = (array)($this->addressRepository->getList(
-                    $this->searchCriteriaBuilder->addFilter([$filter])->create()
+                    $this->searchCriteriaBuilder->addFilters([$filter])->create()
                 )->getItems());
             } catch (NoSuchEntityException $e) {
                 return [];

diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
@@ -61,7 +61,7 @@ public function execute()
         $filter = $this->filterBuilder->setField('parent_id')->setValue($this->_getCheckout()->getCustomer()->getId())
             ->setConditionType('eq')->create();
         $addresses = (array)($this->addressRepository->getList(
-            $this->searchCriteriaBuilder->addFilter([$filter])->create()
+            $this->searchCriteriaBuilder->addFilters([$filter])->create()
         )->getItems());
 
         /**

diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -878,7 +878,7 @@ private function getDefaultAddressByDataKey($key, $defaultAddressIdFromCustomer)
                     ->setConditionType('eq')
                     ->create();
                 $addresses = (array)($this->addressRepository->getList(
-                    $this->searchCriteriaBuilder->addFilter([$filter])->create()
+                    $this->searchCriteriaBuilder->addFilters([$filter])->create()
                 )->getItems());
                 if ($addresses) {
                     $address = reset($addresses);

diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php
@@ -130,7 +130,7 @@ public function testGetAddress()
         $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($this->filterMock);
         $this->searchCriteriaBuilderMock
             ->expects($this->once())
-            ->method('addFilter')
+            ->method('addFilters')
             ->with([$this->filterMock])
             ->willReturnSelf();
         $this->searchCriteriaBuilderMock
@@ -176,7 +176,7 @@ public function testGetAddressWhenItNotExistInCustomer()
         $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($this->filterMock);
         $this->searchCriteriaBuilderMock
             ->expects($this->once())
-            ->method('addFilter')
+            ->method('addFilters')
             ->with([$this->filterMock])
             ->willReturnSelf();
         $this->searchCriteriaBuilderMock

diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/ShippingSavedTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/ShippingSavedTest.php
@@ -138,7 +138,7 @@ private function mockCustomerAddressRepository($customerId, array $addresses)
         $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($filterMock);
 
         $searchCriteriaMock = $this->getMock('Magento\Framework\Api\SearchCriteria', [], [], '', false);
-        $this->criteriaBuilderMock->expects($this->once())->method('addFilter')->with([$filterMock])->willReturnSelf();
+        $this->criteriaBuilderMock->expects($this->once())->method('addFilters')->with([$filterMock])->willReturnSelf();
         $this->criteriaBuilderMock->expects($this->once())->method('create')->willReturn($searchCriteriaMock);
 
         $searchResultMock = $this->getMock('Magento\Customer\Api\Data\AddressSearchResultsInterface');

diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
@@ -149,7 +149,7 @@ public function testSetShippingItemsInformation()
         $this->filterBuilderMock->expects($this->atLeastOnce())->method('create')->willReturnSelf();
 
         $searchCriteriaMock = $this->getMock('\Magento\Framework\Api\SearchCriteria', [], [], '', false);
-        $this->searchCriteriaBuilderMock->expects($this->atLeastOnce())->method('addFilter')->willReturnSelf();
+        $this->searchCriteriaBuilderMock->expects($this->atLeastOnce())->method('addFilters')->willReturnSelf();
         $this->searchCriteriaBuilderMock->expects($this->atLeastOnce())->method('create')
             ->willReturn($searchCriteriaMock);
 

diff --git a/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php b/app/code/Magento/Quote/Api/Data/CartSearchResultsInterface.php
@@ -35,7 +35,7 @@ public function getItems();
      * @param \Magento\Quote\Api\Data\CartInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 
     /**
      * Get search criteria.
@@ -50,7 +50,7 @@ public function getSearchCriteria();
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return $this
      */
-    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null);
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
     /**
      * Get total count.

diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -268,7 +268,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      *
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
      */
-    protected $criteriaBuilder;
+    protected $searchCriteriaBuilder;
 
     /**
      * Filter builder
@@ -421,7 +421,7 @@ public function __construct(
         $this->_quotePaymentCollectionFactory = $quotePaymentCollectionFactory;
         $this->_objectCopyService = $objectCopyService;
         $this->addressRepository = $addressRepository;
-        $this->criteriaBuilder = $criteriaBuilder;
+        $this->searchCriteriaBuilder = $criteriaBuilder;
         $this->filterBuilder = $filterBuilder;
         $this->stockRegistry = $stockRegistry;
         $this->itemProcessor = $itemProcessor;

diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoCommentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoCommentSearchResultInterface.php
@@ -29,5 +29,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\CreditmemoCommentInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoItemSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoItemSearchResultInterface.php
@@ -29,5 +29,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\CreditmemoItemInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoSearchResultInterface.php
@@ -28,5 +28,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\CreditmemoInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceCommentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceCommentSearchResultInterface.php
@@ -27,5 +27,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\InvoiceCommentInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceItemSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceItemSearchResultInterface.php
@@ -26,5 +26,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\InvoiceItemInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/InvoiceSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceSearchResultInterface.php
@@ -26,5 +26,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\InvoiceInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderAddressSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/OrderAddressSearchResultInterface.php
@@ -28,5 +28,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\OrderAddressInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }