From 8d930448e0d1b63c0c8bfd30c7b0b556907ae253 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Tue, 6 Mar 2018 17:58:19 +0100
Subject: [PATCH] TASK: Fix scurtinizer issues

---
 Classes/Connection/SearchRequestInterface.php | 7 +++++++
 Classes/DataProcessing/GeoPointProcessor.php  | 4 ++--
 Classes/Domain/Index/AbstractIndexer.php      | 2 +-
 Classes/Domain/Service/DataHandler.php        | 4 +---
 Classes/Hook/DataHandler.php                  | 6 +++---
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Classes/Connection/SearchRequestInterface.php b/Classes/Connection/SearchRequestInterface.php
index 051f32d..a400447 100644
--- a/Classes/Connection/SearchRequestInterface.php
+++ b/Classes/Connection/SearchRequestInterface.php
@@ -38,6 +38,9 @@ interface SearchRequestInterface extends QueryInterface
 
     public function setFilter(array $filter);
 
+    /**
+     * @return void
+     */
     public function addFacet(FacetRequestInterface $facet);
 
     /**
@@ -48,12 +51,16 @@ interface SearchRequestInterface extends QueryInterface
     /**
      * Workaround for paginate widget support which will
      * use the request to build another search.
+     *
+     * @return void
      */
     public function setConnection(ConnectionInterface $connection);
 
     /**
      * Workaround for paginate widget support which will
      * use the request to build another search.
+     *
+     * @return void
      */
     public function setSearchService(SearchService $searchService);
 }
diff --git a/Classes/DataProcessing/GeoPointProcessor.php b/Classes/DataProcessing/GeoPointProcessor.php
index c5b6d18..971e2c4 100644
--- a/Classes/DataProcessing/GeoPointProcessor.php
+++ b/Classes/DataProcessing/GeoPointProcessor.php
@@ -27,7 +27,7 @@ class GeoPointProcessor implements ProcessorInterface
 {
     public function processData(array $record, array $configuration) : array
     {
-        if (! $this->canApply($record, $configuration)) {
+        if (! $this->isApplyable($record, $configuration)) {
             return $record;
         }
 
@@ -39,7 +39,7 @@ class GeoPointProcessor implements ProcessorInterface
         return $record;
     }
 
-    protected function canApply(array $record, array $configuration) : bool
+    protected function isApplyable(array $record, array $configuration) : bool
     {
         if (!isset($record[$configuration['lat']])
             || !is_numeric($record[$configuration['lat']])
diff --git a/Classes/Domain/Index/AbstractIndexer.php b/Classes/Domain/Index/AbstractIndexer.php
index 5687cb1..e8f032e 100644
--- a/Classes/Domain/Index/AbstractIndexer.php
+++ b/Classes/Domain/Index/AbstractIndexer.php
@@ -152,7 +152,7 @@ abstract class AbstractIndexer implements IndexerInterface
                 ',',
                 $this->configuration->get('indexing.' . $this->identifier . '.abstractFields')
             );
-            if (!$fieldsToUse) {
+            if ($fieldsToUse === []) {
                 return;
             }
             foreach ($fieldsToUse as $fieldToUse) {
diff --git a/Classes/Domain/Service/DataHandler.php b/Classes/Domain/Service/DataHandler.php
index fd6b08d..5b587e4 100644
--- a/Classes/Domain/Service/DataHandler.php
+++ b/Classes/Domain/Service/DataHandler.php
@@ -104,7 +104,7 @@ class DataHandler implements Singleton
         return $this->indexerFactory->getIndexer($table);
     }
 
-    public function canHandle(string $table) : bool
+    public function supportsTable(string $table) : bool
     {
         try {
             $this->getIndexer($table);
@@ -112,7 +112,5 @@ class DataHandler implements Singleton
         } catch (NoMatchingIndexerException $e) {
             return false;
         }
-
-        return false;
     }
 }
diff --git a/Classes/Hook/DataHandler.php b/Classes/Hook/DataHandler.php
index 6277708..3bd698f 100644
--- a/Classes/Hook/DataHandler.php
+++ b/Classes/Hook/DataHandler.php
@@ -90,8 +90,8 @@ class DataHandler implements Singleton
             $uid = key($record);
             $fieldData = current($record);
 
-            if (isset($fieldArray['uid'])) {
-                $uid = $fieldArray['uid'];
+            if (isset($fieldData['uid'])) {
+                $uid = $fieldData['uid'];
             } elseif (isset($dataHandler->substNEWwithIDs[$uid])) {
                 $uid = $dataHandler->substNEWwithIDs[$uid];
             }
@@ -123,7 +123,7 @@ class DataHandler implements Singleton
             $this->logger->debug('Datahandler could not be setup.');
             return false;
         }
-        if (! $this->dataHandler->canHandle($table)) {
+        if (! $this->dataHandler->supportsTable($table)) {
             $this->logger->debug('Table is not allowed.', [$table]);
             return false;
         }