Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Api\SearchResults implement Api\SearchResultsInterface #1420

Merged
merged 1 commit into from
Jul 15, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
6 changes: 3 additions & 3 deletions lib/internal/Magento/Framework/Api/SearchResults.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/internal/Magento/Framework/Api/SearchResultsInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down