Simplified use of settings in indexer and querier.

Author: Daniel Berthereau

src/Api/Representation/SearchConfigRepresentation.php

@@ -161,14 +161,12 @@ public function settings(): array
 
     public function setting(string $name, $default = null)
     {
-        $settings = $this->resource->getSettings();
-        return $settings[$name] ?? $default;
+        return $this->resource->getSettings()[$name] ?? $default;
     }
 
     public function subSetting(string $mainName, string $name, $default = null)
     {
-        $settings = $this->resource->getSettings();
-        return $settings[$mainName][$name] ?? $default;
+        return $this->resource->getSettings()[$mainName][$name] ?? $default;
     }
 
     public function created(): \DateTime

src/Api/Representation/SearchEngineRepresentation.php

@@ -107,20 +107,17 @@ public function settings(): array
 
     public function setting(string $name, $default = null)
     {
-        $settings = $this->resource->getSettings();
-        return $settings[$name] ?? $default;
+        return $this->resource->getSettings()[$name] ?? $default;
     }
 
     public function subSetting(string $mainName, string $name, $default = null)
     {
-        $settings = $this->resource->getSettings();
-        return $settings[$mainName][$name] ?? $default;
+        return $this->resource->getSettings()[$mainName][$name] ?? $default;
     }
 
     public function settingAdapter(string $name, $default = null)
     {
-        $settings = $this->resource->getSettings();
-        return $settings['adapter'][$name] ?? $default;
+        return $this->resource->getSettings()['adapter'][$name] ?? $default;
     }
 
     public function created(): \DateTime

src/Indexer/AbstractIndexer.php

@@ -64,30 +64,4 @@ public function setSearchEngine(SearchEngineRepresentation $engine): IndexerInte
         $this->engine = $engine;
         return $this;
     }
-
-    /**
-     * Get a setting of the search engine.
-     *
-     * @param string $name
-     * @param mixed $default
-     * @return mixed
-     */
-    protected function getSetting(string $name, $default = null)
-    {
-        $settings = $this->engine->settings();
-        return $settings[$name] ?? $default;
-    }
-
-    /**
-     * Get a setting of the search adapter.
-     *
-     * @param string $name
-     * @param mixed $default
-     * @return mixed
-     */
-    protected function getAdapterSetting(string $name, $default = null)
-    {
-        $adapterSettings = $this->getSetting('adapter', []);
-        return $adapterSettings[$name] ?? $default;
-    }
 }

src/Querier/AbstractQuerier.php

@@ -78,30 +78,4 @@ abstract public function query(): Response;
     abstract public function querySuggestions(): Response;
 
     abstract public function getPreparedQuery();
-
-    /**
-     * Get a setting of the search engine.
-     *
-     * @param string $name
-     * @param mixed $default
-     * @return mixed
-     */
-    protected function getSetting(string $name, $default = null)
-    {
-        $settings = $this->engine->settings();
-        return $settings[$name] ?? $default;
-    }
-
-    /**
-     * Get a setting of the search adapter.
-     *
-     * @param string $name
-     * @param mixed $default
-     * @return mixed
-     */
-    protected function getAdapterSetting(string $name, $default = null)
-    {
-        $adapterSettings = $this->getSetting('adapter', []);
-        return $adapterSettings[$name] ?? $default;
-    }
 }

src/Querier/InternalQuerier.php

@@ -385,7 +385,7 @@ public function getPreparedQuery()
 
         // TODO Normalize search url arguments. Here, the ones from default form, adapted from Solr, are taken.
 
-        $indexerResourceTypes = $this->getSetting('resources', []);
+        $indexerResourceTypes = $this->engine->setting('resources', []);
         $this->resourceTypes = $this->query->getResources() ?: $indexerResourceTypes;
         $this->resourceTypes = array_intersect($this->resourceTypes, $indexerResourceTypes);
         if (empty($this->resourceTypes)) {