From eebdcb7055d961ddae30dbd577cbf688ec9faf7d Mon Sep 17 00:00:00 2001
From: Daniel Rose <daniel-rose@gmx.de>
Date: Wed, 9 Sep 2015 12:47:36 +0200
Subject: [PATCH] Only return array

---
 .../Listing/Column/AttributeColumnTest.php          | 13 -------------
 .../Ui/Component/Listing/Column/AttributeColumn.php |  4 ----
 app/code/Magento/Ui/Component/AbstractComponent.php |  1 -
 3 files changed, 18 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AttributeColumnTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AttributeColumnTest.php
index 4631bf130ad65..68853c63e3751 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AttributeColumnTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AttributeColumnTest.php
@@ -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;
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
index dc1057e5b13eb..c4175a35040bb 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
@@ -42,10 +42,6 @@ public function __construct(
      */
     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) {
diff --git a/app/code/Magento/Ui/Component/AbstractComponent.php b/app/code/Magento/Ui/Component/AbstractComponent.php
index 4d534975d3c41..27ffd158016cb 100644
--- a/app/code/Magento/Ui/Component/AbstractComponent.php
+++ b/app/code/Magento/Ui/Component/AbstractComponent.php
@@ -226,7 +226,6 @@ public function getData($key = '', $index = null)
      *
      * @param array $dataSource
      * @return array
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function prepareDataSource(array $dataSource)
     {