[FEATURE] Elastic 6.x support

.travis.yml

@@ -5,7 +5,7 @@ addons:
     packages:
       - oracle-java8-set-default
 before_install:
-  - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.2.0.deb && sudo dpkg -i --force-confnew elasticsearch-5.2.0.deb && sudo service elasticsearch restart
+  - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.5.4.deb && sudo dpkg -i --force-confnew elasticsearch-6.5.4.deb && sudo service elasticsearch restart
   - mysql -u root -e 'GRANT ALL ON `typo3_ci_ft%`.* TO [email protected];'
 
 language: php
@@ -26,7 +26,6 @@ env:
     - typo3DatabaseUsername="travis"
     - typo3DatabasePassword=""
   matrix:
-    - TYPO3_VERSION="~7.6"
     - TYPO3_VERSION="~8.7"
 
 matrix:

Classes/Command/IndexCommandController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Codappix\SearchCore\Command;
 
 /*
@@ -21,7 +22,9 @@
  */
 
 use Codappix\SearchCore\Domain\Index\IndexerFactory;
+use Codappix\SearchCore\Domain\Index\IndexerInterface;
 use Codappix\SearchCore\Domain\Index\NoMatchingIndexerException;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\CommandController;
 
 /**
@@ -43,32 +46,57 @@ public function injectIndexerFactory(IndexerFactory $factory)
     }
 
     /**
-     * Will index the given identifier.
+     * Will index all documents for the given identifiers.
      *
-     * @param string $identifier
+     * @param string $identifier Comma separated list of identifiers.
      */
-    public function indexCommand(string $identifier)
+    public function indexCommand(string $identifiers)
     {
-        try {
-            $this->indexerFactory->getIndexer($identifier)->indexAllDocuments();
-            $this->outputLine($identifier . ' was indexed.');
-        } catch (NoMatchingIndexerException $e) {
-            $this->outputLine('No indexer found for: ' . $identifier);
-        }
+        $this->executeForIdentifier($identifiers, function (IndexerInterface $indexer) {
+            $indexer->indexAllDocuments();
+            $this->outputLine('Documents in index ' . $indexer->getIdentifier() . ' were indexed.');
+        });
+    }
+
+    /**
+     * Will delete all indexed documents for the given identifiers.
+     *
+     * @param string $identifier Comma separated list of identifiers.
+     */
+    public function deleteDocumentsCommand(string $identifiers)
+    {
+        $this->executeForIdentifier($identifiers, function (IndexerInterface $indexer) {
+            $indexer->deleteAllDocuments();
+            $this->outputLine('Documents in index ' . $indexer->getIdentifier() . ' were deleted.');
+        });
+    }
+
+    /**
+     * Will delete the index for given identifiers.
+     *
+     * @param string $identifier Comma separated list of identifiers.
+     */
+    public function deleteCommand(string $identifiers = 'pages')
+    {
+        $this->executeForIdentifier($identifiers, function (IndexerInterface $indexer) {
+            $indexer->delete();
+            $this->outputLine('Index ' . $indexer->getIdentifier() . ' was deleted.');
+        });
     }
 
     /**
-     * Will delete the given identifier.
+     * Executes the given callback method for each provided identifier.
      *
-     * @param string $identifier
+     * An indexer is created for each identifier, which is provided as first argument to the callback.
      */
-    public function deleteCommand(string $identifier)
+    private function executeForIdentifier(string $identifiers, callable $callback)
     {
-        try {
-            $this->indexerFactory->getIndexer($identifier)->delete();
-            $this->outputLine($identifier . ' was deleted.');
-        } catch (NoMatchingIndexerException $e) {
-            $this->outputLine('No indexer found for: ' . $identifier);
+        foreach (GeneralUtility::trimExplode(',', $identifiers, true) as $identifier) {
+            try {
+                $callback($this->indexerFactory->getIndexer($identifier));
+            } catch (NoMatchingIndexerException $e) {
+                $this->outputLine('No indexer found for: ' . $identifier . '.');
+            }
         }
     }
 }

Classes/Configuration/ConfigurationContainer.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Codappix\SearchCore\Configuration;
 
 /*
@@ -20,12 +21,12 @@
  * 02110-1301, USA.
  */
 
+use Codappix\SearchCore\Utility\ArrayUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
-use TYPO3\CMS\Extbase\Utility\ArrayUtility;
 
 /**
  * Container of all configurations for extension.
- * Always inject this to have a single place for configuration and parsing only once.
+ * Always inject this to have a single place for configuration.
  */
 class ConfigurationContainer implements ConfigurationContainerInterface
 {
@@ -59,7 +60,7 @@ public function injectConfigurationManager(ConfigurationManagerInterface $config
      */
     public function get(string $path)
     {
-        $value = ArrayUtility::getValueByPath($this->settings, $path);
+        $value = $this->getValueByPath($path);
 
         if ($value === null) {
             throw new InvalidArgumentException(
@@ -77,6 +78,20 @@ public function get(string $path)
      */
     public function getIfExists(string $path)
     {
-        return ArrayUtility::getValueByPath($this->settings, $path);
+        return $this->getValueByPath($path);
+    }
+
+    /**
+     * @param string $path In dot notation.
+     * @return mixed|null Null if no entry was found.
+     */
+    protected function getValueByPath(string $path)
+    {
+        try {
+            return ArrayUtility::getValueByPath($this->settings, $path, '.');
+        } catch (\Exception $e) {
+            // Catch all exceptions to safely handle path retrieval
+        }
+        return null;
     }
 }

Classes/Configuration/ConfigurationContainerInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Codappix\SearchCore\Configuration;
 
 /*
@@ -41,7 +42,7 @@ public function get(string $path);
      * Same as get but will not throw an exception but return null.
      *
      * @param string $path In dot notation.
-     * @return mixed|null
+     * @return mixed|null Null if it does not exist.
      */
     public function getIfExists(string $path);
 }

Classes/Configuration/ConfigurationUtility.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Codappix\SearchCore\Configuration;
 
 /*
@@ -28,7 +29,7 @@ class ConfigurationUtility
     /**
      * Will parse all entries, recursive as fluid template, with request variable set to $searchRequest.
      */
-    public function replaceArrayValuesWithRequestContent(SearchRequestInterface $searchRequest, array $array) : array
+    public function replaceArrayValuesWithRequestContent(SearchRequestInterface $searchRequest, array $array): array
     {
         array_walk_recursive($array, function (&$value, $key, SearchRequestInterface $searchRequest) {
             $template = new StandaloneView();
@@ -38,7 +39,7 @@ public function replaceArrayValuesWithRequestContent(SearchRequestInterface $sea
 
             // As elasticsearch does need some doubles to be send as doubles.
             if (is_numeric($value)) {
-                $value = (float) $value;
+                $value = (float)$value;
             }
         }, $searchRequest);
 
@@ -49,13 +50,12 @@ public function replaceArrayValuesWithRequestContent(SearchRequestInterface $sea
      * Will check all entries, whether they have a condition and filter entries out, where condition is false.
      * Also will remove condition in the end.
      */
-    public function filterByCondition(array $entries) : array
+    public function filterByCondition(array $entries): array
     {
         $entries = array_filter($entries, function ($entry) {
             return !is_array($entry)
                 || !array_key_exists('condition', $entry)
-                || (bool) $entry['condition'] === true
-                ;
+                || (bool)$entry['condition'] === true;
         });
 
         foreach ($entries as $key => $entry) {

Classes/Configuration/InvalidArgumentException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Codappix\SearchCore\Configuration;
 
 /*

Classes/Configuration/NoConfigurationException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Codappix\SearchCore\Configuration;
 
 /*