Merge commit 'refs/pull/1420/head' of https://github.com/magento/magento2 into MX_GITHUB

Andrey Konosov · Andrey Konosov · commit 0e92b981fa4d · 2015-07-08T19:05:30.000+03:00
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/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/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/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/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);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderItemSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/OrderItemSearchResultInterface.php
@@ -28,5 +28,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\OrderItemInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderPaymentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/OrderPaymentSearchResultInterface.php
@@ -28,5 +28,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\OrderPaymentInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/OrderStatusHistorySearchResultInterface.php b/app/code/Magento/Sales/Api/Data/OrderStatusHistorySearchResultInterface.php
@@ -28,5 +28,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\OrderStatusHistoryInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentCommentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentCommentSearchResultInterface.php
@@ -27,5 +27,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentItemSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentItemSearchResultInterface.php
@@ -27,5 +27,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\ShipmentItemInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentSearchResultInterface.php
@@ -29,5 +29,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\ShipmentInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentTrackSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentTrackSearchResultInterface.php
@@ -28,5 +28,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\ShipmentTrackInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Sales/Api/Data/TransactionSearchResultInterface.php b/app/code/Magento/Sales/Api/Data/TransactionSearchResultInterface.php
@@ -26,5 +26,5 @@ public function getItems();
      * @param \Magento\Sales\Api\Data\TransactionInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxClassSearchResultsInterface.php b/app/code/Magento/Tax/Api/Data/TaxClassSearchResultsInterface.php
@@ -25,5 +25,5 @@ public function getItems();
      * @param \Magento\Tax\Api\Data\TaxClassInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxRateSearchResultsInterface.php b/app/code/Magento/Tax/Api/Data/TaxRateSearchResultsInterface.php
@@ -28,5 +28,5 @@ public function getItems();
      * @param \Magento\Tax\Api\Data\TaxRateInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Tax/Api/Data/TaxRuleSearchResultsInterface.php b/app/code/Magento/Tax/Api/Data/TaxRuleSearchResultsInterface.php
@@ -25,5 +25,5 @@ public function getItems();
      * @param \Magento\Tax\Api\Data\TaxRuleInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/RepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/RepositoryTest.php
@@ -222,6 +222,7 @@ public function testGetList()
 
         $collection->expects($this->any())->method('getSize')->willReturn(2);
         $collection->expects($this->any())->method('setItems')->with([$taxClassOne, $taxClassTwo]);
+        $collection->expects($this->any())->method('getItems')->willReturn([$taxClassOne, $taxClassTwo]);
         $collection->expects($this->once())->method('setCurPage')->with(0);
         $collection->expects($this->once())->method('setPageSize')->with(20);
 
diff --git a/app/code/Magento/Ui/Api/Data/BookmarkSearchResultsInterface.php b/app/code/Magento/Ui/Api/Data/BookmarkSearchResultsInterface.php
@@ -26,5 +26,5 @@ public function getItems();
      * @param \Magento\Ui\Api\Data\BookmarkInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchResults.php b/lib/internal/Magento/Framework/Api/SearchResults.php
@@ -9,7 +9,7 @@
 /**
  * SearchResults Service Data Object used for the search service requests
  */
-class SearchResults extends AbstractSimpleObject
+class SearchResults extends AbstractSimpleObject implements SearchResultsInterface
 {
     const KEY_ITEMS = 'items';
     const KEY_SEARCH_CRITERIA = 'search_criteria';
@@ -49,10 +49,10 @@ public function getSearchCriteria()
     /**
      * Set search criteria
      *
-     * @param \Magento\Framework\Api\SearchCriteria $searchCriteria
+     * @param SearchCriteriaInterface $searchCriteria
      * @return $this
      */
-    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteria $searchCriteria)
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
         return $this->setData(self::KEY_SEARCH_CRITERIA, $searchCriteria);
     }
diff --git a/lib/internal/Magento/Framework/Api/SearchResultsInterface.php b/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
@@ -26,7 +26,7 @@ public function getItems();
      * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(array $items);
 
     /**
      * Get search criteria.
@@ -41,7 +41,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.

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ public function getItems();`
`24`	`24`	`* @param \Magento\Catalog\Api\Data\CategoryAttributeInterface[] $items`
`25`	`25`	`* @return $this`
`26`	`26`	`*/`
`27`		`- public function setItems(array $items = null);`
	`27`	`+ public function setItems(array $items);`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ public function getItems();`
`30`	`30`	`* @param \Magento\CatalogInventory\Api\Data\StockInterface[] $items`
`31`	`31`	`* @return $this`
`32`	`32`	`*/`
`33`		`- public function setItems(array $items = null);`
	`33`	`+ public function setItems(array $items);`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@ public function getItems();`
`26`	`26`	`* @param \Magento\Cms\Api\Data\BlockInterface[] $items`
`27`	`27`	`* @return $this`
`28`	`28`	`*/`
`29`		`- public function setItems(array $items = null);`
	`29`	`+ public function setItems(array $items);`
`30`	`30`	`}`