Merge branch 'feature/update-9' of github.com:bergwerk/search_core into feature/update-9

# Conflicts:
#	Classes/Configuration/ConfigurationContainer.php

Classes/Configuration/ConfigurationContainer.php

@@ -23,6 +23,7 @@ namespace Codappix\SearchCore\Configuration;
 use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
+use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
 
 /**
  * Container of all configurations for extension.
@@ -61,12 +62,9 @@ class ConfigurationContainer implements ConfigurationContainerInterface
      */
     public function get(string $path)
     {
-        try
+        $value = ArrayUtility::getValueByPath($this->settings, $path, '.');
-        {
+        
-            return ArrayUtility::getValueByPath($this->settings, $path);
+        if ($value === null) {
-        }
-        catch (MissingArrayPathException $exception)
-        {
             throw new InvalidArgumentException(
                 'The given configuration option "' . $path . '" does not exist.',
                 InvalidArgumentException::OPTION_DOES_NOT_EXIST
@@ -82,7 +80,7 @@ class ConfigurationContainer implements ConfigurationContainerInterface
     {
         try
         {
-            return ArrayUtility::getValueByPath($this->settings, $path);
+            return ArrayUtility::getValueByPath($this->settings, $path, '.');
         }
         catch (\Exception $exception)
         {

Classes/Domain/Index/AbstractIndexer.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Codappix\SearchCore\Domain\Index;
 
 /*
@@ -23,6 +24,8 @@ namespace Codappix\SearchCore\Domain\Index;
 use Codappix\SearchCore\Configuration\ConfigurationContainerInterface;
 use Codappix\SearchCore\Configuration\InvalidArgumentException;
 use Codappix\SearchCore\Connection\ConnectionInterface;
+use TYPO3\CMS\Core\Exception;
+use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 abstract class AbstractIndexer implements IndexerInterface
@@ -31,28 +34,28 @@ abstract class AbstractIndexer implements IndexerInterface
      * @var ConnectionInterface
      */
     protected $connection;
-
+    
     /**
      * @var ConfigurationContainerInterface
      */
     protected $configuration;
-
+    
     /**
      * @var string
      */
     protected $identifier = '';
-
+    
     /**
      * @var \Codappix\SearchCore\DataProcessing\Service
      * @inject
      */
     protected $dataProcessorService;
-
+    
     /**
      * @var \TYPO3\CMS\Core\Log\Logger
      */
     protected $logger;
-
+    
     /**
      * Inject log manager to get concrete logger from it.
      *
@@ -62,18 +65,18 @@ abstract class AbstractIndexer implements IndexerInterface
     {
         $this->logger = $logManager->getLogger(__CLASS__);
     }
-
+    
     public function setIdentifier(string $identifier)
     {
         $this->identifier = $identifier;
     }
-
+    
     public function __construct(ConnectionInterface $connection, ConfigurationContainerInterface $configuration)
     {
         $this->connection = $connection;
         $this->configuration = $configuration;
     }
-
+    
     public function indexAllDocuments()
     {
         $this->logger->info('Start indexing');
@@ -81,24 +84,24 @@ abstract class AbstractIndexer implements IndexerInterface
             if ($records === null) {
                 break;
             }
-
+            
             foreach ($records as &$record) {
                 $this->prepareRecord($record);
             }
-
+            
             $this->logger->debug('Index records.', [$records]);
             $this->connection->addDocuments($this->getDocumentName(), $records);
         }
         $this->logger->info('Finish indexing');
     }
-
+    
     public function indexDocument(string $identifier)
     {
         $this->logger->info('Start indexing single record.', [$identifier]);
         try {
-            $record = $this->getRecord((int) $identifier);
+            $record = $this->getRecord((int)$identifier);
             $this->prepareRecord($record);
-
+            
             $this->connection->addDocument($this->getDocumentName(), $record);
         } catch (NoRecordFoundException $e) {
             $this->logger->info('Could not index document. Try to delete it therefore.', [$e->getMessage()]);
@@ -106,47 +109,70 @@ abstract class AbstractIndexer implements IndexerInterface
         }
         $this->logger->info('Finish indexing');
     }
-
+    
     public function delete()
     {
         $this->logger->info('Start deletion of index.');
         $this->connection->deleteIndex($this->getDocumentName());
         $this->logger->info('Finish deletion.');
     }
-
+    
-    protected function getRecordGenerator() : \Generator
+    protected function getRecordGenerator(): \Generator
     {
         $offset = 0;
         $limit = $this->getLimit();
-
+        
         while (($records = $this->getRecords($offset, $limit)) !== []) {
             yield $records;
             $offset += $limit;
         }
     }
-
+    
+    
+    /**
+     * @param array $record
+     *
+     * @throws \Exception
+     */
     protected function prepareRecord(array &$record)
     {
         try {
-            foreach ($this->configuration->get('indexing.' . $this->identifier . '.dataProcessing') as $configuration) {
+            $indexingConfiguration = $this->configuration->get('indexing.' . $this->identifier . '.dataProcessing');
-                $record = $this->dataProcessorService->executeDataProcessor($configuration, $record, $this->identifier);
+            
+            if (!empty($indexingConfiguration) && is_array($indexingConfiguration)) {
+                foreach ($indexingConfiguration as $configuration) {
+                    $record = $this->dataProcessorService->executeDataProcessor($configuration, $record,
+                        $this->identifier);
+                }
+            }
+        } catch (\Exception $e) {
+            if ($e instanceof InvalidArgumentException) {
+                // Nothing to do
+            } elseif ($e instanceof MissingArrayPathException) {
+                // Nothing to do
+            } else {
+                throw $e;
             }
-        } catch (InvalidArgumentException $e) {
-            // Nothing to do.
         }
-
+        
         $this->handleAbstract($record);
     }
-
+    
+    
+    /**
+     * @param array $record
+     *
+     * @throws \Exception
+     */
     protected function handleAbstract(array &$record)
     {
         $record['search_abstract'] = '';
-
+        
         try {
-            $fieldsToUse = GeneralUtility::trimExplode(
+            
-                ',',
+            $indexConfiguration = $this->configuration->get('indexing.' . $this->identifier . '.abstractFields');
-                $this->configuration->get('indexing.' . $this->identifier . '.abstractFields')
+            
-            );
+            $fieldsToUse = GeneralUtility::trimExplode(',', $indexConfiguration);
             if ($fieldsToUse === []) {
                 return;
             }
@@ -156,29 +182,35 @@ abstract class AbstractIndexer implements IndexerInterface
                     break;
                 }
             }
-        } catch (InvalidArgumentException $e) {
+        } catch (\Exception $e) {
-            return;
+            if ($e instanceof InvalidArgumentException) {
+                return;
+            } elseif ($e instanceof MissingArrayPathException) {
+                return;
+            } else {
+                throw $e;
+            }
         }
     }
-
+    
     /**
      * Returns the limit to use to fetch records.
      */
-    protected function getLimit() : int
+    protected function getLimit(): int
     {
         // TODO: Make configurable.
         return 50;
     }
-
+    
     /**
      * @return array|null
      */
     abstract protected function getRecords(int $offset, int $limit);
-
+    
     /**
      * @throws NoRecordFoundException If record could not be found.
      */
-    abstract protected function getRecord(int $identifier) : array;
+    abstract protected function getRecord(int $identifier): array;
-
+    
-    abstract protected function getDocumentName() : string;
+    abstract protected function getDocumentName(): string;
 }

composer.json

@@ -18,8 +18,7 @@
     "require": {
         "php": ">=7.0.0",
         "typo3/cms-core": ">= 7.6.0 < 10.0.0",
-        "ruflin/elastica": "~3.2",
+        "ruflin/elastica": "~3.2"
-        "friendsoftypo3/typo3db-legacy": "^1.1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.4.4",

ext_localconf.php

@@ -42,12 +42,13 @@ call_user_func(
 
         \Codappix\SearchCore\Compatibility\ImplementationRegistrationService::registerImplementations();
 
+        
         // API does make use of object manager, therefore use GLOBALS
         $extensionConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class)->get($extensionKey);
-
+    
         if ($extensionConfiguration === false
-            || !isset($extensionConfiguration['disable.']['elasticsearch'])
+            || !isset($extensionConfiguration['disable']['elasticsearch'])
-            || $extensionConfiguration['disable.']['elasticsearch'] !== '1'
+            || $extensionConfiguration['disable']['elasticsearch'] !== '1'
         ) {
             \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\Container\Container::class)
                 ->registerImplementation(