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.

Sign up for GitHub

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

Jump to bottom

use return value instead of reference parameter #1818

Merged
merged 2 commits into from
Oct 6, 2015
Merged

use return value instead of reference parameter #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2726b9
use return value instead of reference parameter
daniel-rose Sep 8, 2015
eebdcb7
Only return array
daniel-rose Sep 9, 2015
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
6 changes: 4 additions & 2 deletions app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
$store = $this->storeManager->getStore(
Expand All @@ -64,5 +64,7 @@ public function prepareDataSource(array & $dataSource)
}
}
}

return $dataSource;
}
}
6 changes: 4 additions & 2 deletions app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array &$dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
$storeId = $this->context->getFilterParam('store_id');
Expand All @@ -60,5 +60,7 @@ public function prepareDataSource(array &$dataSource)
];
}
}

return $dataSource;
}
}
6 changes: 4 additions & 2 deletions app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
$fieldName = $this->getData('name');
Expand All @@ -58,6 +58,8 @@ public function prepareDataSource(array & $dataSource)
$item[$fieldName . '_orig_src'] = $origImageHelper->getUrl();
}
}

return $dataSource;
}

/**
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function __construct(
/**
* {@inheritdoc}
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
$websiteNames = [];
foreach ($this->getData('options') as $website) {
Expand All @@ -60,6 +60,8 @@ public function prepareDataSource(array & $dataSource)
$item[$fieldName] = implode(', ', $websites);
}
}

return $dataSource;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function testPrepareItemsByPageId()
);

$model->setName($name);
$model->prepareDataSource($items);
$items = $model->prepareDataSource($items);
// Run test
$this->assertEquals($expectedItems, $items['data']['items']);
}
Expand Down
6 changes: 4 additions & 2 deletions app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
Expand Down Expand Up @@ -98,5 +98,7 @@ public function prepareDataSource(array & $dataSource)
}
}
}

return $dataSource;
}
}
6 changes: 4 additions & 2 deletions app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
Expand Down Expand Up @@ -92,5 +92,7 @@ public function prepareDataSource(array & $dataSource)
}
}
}

return $dataSource;
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function testPrepareDataSource()
)
->willReturn('http://magento.com/customer/index/edit');

$this->component->prepareDataSource($dataSource);
$dataSource = $this->component->prepareDataSource($dataSource);

$this->assertEquals($expectedDataSource, $dataSource);
}
Expand Down
15 changes: 1 addition & 14 deletions app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AttributeColumnTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,6 @@ public function setup()
$this->component->setData('name', 'gender');
}

public function testPrepareDataSourceWithoutItems()
{
$dataSource = [
'data' => [

]
];
$this->attributeRepository->expects($this->never())
->method('getMetadataByCode');

$this->assertNull($this->component->prepareDataSource($dataSource));
}

public function testPrepareDataSource()
{
$genderOptionId = 1;
Expand Down Expand Up @@ -125,7 +112,7 @@ public function testPrepareDataSource()
'is_searchable_in_grid' => true,
]);

$this->component->prepareDataSource($dataSource);
$dataSource = $this->component->prepareDataSource($dataSource);

$this->assertEquals($expectedSource, $dataSource);
}
Expand Down
6 changes: 4 additions & 2 deletions app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array &$dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
$storeId = $this->context->getFilterParam('store_id');
Expand All @@ -60,5 +60,7 @@ public function prepareDataSource(array &$dataSource)
];
}
}

return $dataSource;
}
}
10 changes: 4 additions & 6 deletions app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,10 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array &$dataSource)
public function prepareDataSource(array $dataSource)
{
if (!isset($dataSource['data']['items'])) {
return null;
}

$metaData = $this->attributeRepository->getMetadataByCode($this->getName());
if ($metaData && count($metaData[AttributeMetadata::OPTIONS])) {
foreach ($dataSource['data']['items'] as &$item) {
Expand All @@ -60,5 +56,7 @@ public function prepareDataSource(array &$dataSource)
}
}
}

return $dataSource;
}
}
4 changes: 3 additions & 1 deletion app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Type extends Column
* @param array $dataSource
* @return void
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
Expand All @@ -28,5 +28,7 @@ public function prepareDataSource(array & $dataSource)
: __('Customer');
}
}

return $dataSource;
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function testPrepareDataSource()
];

$this->model->setData('name', $itemName);
$this->model->prepareDataSource($dataSource);
$dataSource = $this->model->prepareDataSource($dataSource);
$this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/CustomerGroupTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function testPrepareDataSource()
->willReturn($group);

$this->model->setData('name', $itemName);
$this->model->prepareDataSource($dataSource);
$dataSource = $this->model->prepareDataSource($dataSource);
$this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/OrderActionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function testPrepareDataSource()
->willReturn($url);

$this->model->setData('name', $itemName);
$this->model->prepareDataSource($dataSource);
$dataSource = $this->model->prepareDataSource($dataSource);
$this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/PaymentMethodTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function testPrepareDataSource()
->willReturn($payment);

$this->model->setData('name', $itemName);
$this->model->prepareDataSource($dataSource);
$dataSource = $this->model->prepareDataSource($dataSource);
$this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/PriceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function testPrepareDataSource()
->willReturn($newItemValue);

$this->model->setData('name', $itemName);
$this->model->prepareDataSource($dataSource);
$dataSource = $this->model->prepareDataSource($dataSource);
$this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/StatusTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function testPrepareDataSource()
['collectionFactory' => $collectionFactoryMock]
);
$model->setData('name', $itemName);
$model->prepareDataSource($dataSource);
$dataSource = $model->prepareDataSource($dataSource);
$this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
}
}
6 changes: 4 additions & 2 deletions app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ class Address extends Column
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
$item[$this->getData('name')] = str_replace("\n", '<br/>', $item[$this->getData('name')]);
}
}

return $dataSource;
}
}
6 changes: 4 additions & 2 deletions app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
Expand All @@ -55,5 +55,7 @@ public function prepareDataSource(array & $dataSource)
: $item[$this->getData('name')];
}
}

return $dataSource;
}
}
6 changes: 4 additions & 2 deletions app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
Expand All @@ -62,5 +62,7 @@ public function prepareDataSource(array & $dataSource)
}
}
}

return $dataSource;
}
}
6 changes: 4 additions & 2 deletions app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
Expand All @@ -55,5 +55,7 @@ public function prepareDataSource(array & $dataSource)
: $item[$this->getData('name')];
}
}

return $dataSource;
}
}
6 changes: 4 additions & 2 deletions app/code/Magento/Sales/Ui/Component/Listing/Column/OrderActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ public function __construct(
* Prepare Data Source
*
* @param array $dataSource
* @return void
* @return array
*/
public function prepareDataSource(array & $dataSource)
public function prepareDataSource(array $dataSource)
{
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
Expand All @@ -70,5 +70,7 @@ public function prepareDataSource(array & $dataSource)
}
}
}

return $dataSource;
}
}
Loading