first commit
This commit is contained in:
@@ -18,7 +18,7 @@ use WapplerSystems\Meilisearch\ConnectionManager;
|
||||
use WapplerSystems\Meilisearch\Domain\Search\ResultSet\SearchResultSetService;
|
||||
use WapplerSystems\Meilisearch\Search;
|
||||
use WapplerSystems\Meilisearch\System\Configuration\ConfigurationManager;
|
||||
use WapplerSystems\Meilisearch\Mvc\Controller\SolrControllerContext;
|
||||
use WapplerSystems\Meilisearch\Mvc\Controller\MeilisearchControllerContext;
|
||||
use WapplerSystems\Meilisearch\System\Configuration\TypoScriptConfiguration;
|
||||
use WapplerSystems\Meilisearch\Util;
|
||||
use WapplerSystems\Meilisearch\Widget\WidgetRequest;
|
||||
@@ -42,38 +42,38 @@ class AbstractWidgetController extends CoreAbstractWidgetController
|
||||
/**
|
||||
* @var ConfigurationManager
|
||||
*/
|
||||
private $solrConfigurationManager;
|
||||
private $meilisearchConfigurationManager;
|
||||
|
||||
/**
|
||||
* @var \WapplerSystems\Meilisearch\Mvc\Controller\SolrControllerContext
|
||||
* @var \WapplerSystems\Meilisearch\Mvc\Controller\MeilisearchControllerContext
|
||||
*/
|
||||
protected $controllerContext;
|
||||
|
||||
/**
|
||||
* @param \WapplerSystems\Meilisearch\System\Configuration\ConfigurationManager
|
||||
*/
|
||||
public function injectSolrConfigurationManager(ConfigurationManager $configurationManager)
|
||||
public function injectMeilisearchConfigurationManager(ConfigurationManager $configurationManager)
|
||||
{
|
||||
$this->solrConfigurationManager = $configurationManager;
|
||||
$this->meilisearchConfigurationManager = $configurationManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize the controller context
|
||||
*
|
||||
* @return \WapplerSystems\Meilisearch\Mvc\Controller\SolrControllerContext ControllerContext to be passed to the view
|
||||
* @return \WapplerSystems\Meilisearch\Mvc\Controller\MeilisearchControllerContext ControllerContext to be passed to the view
|
||||
* @api
|
||||
*/
|
||||
protected function buildControllerContext()
|
||||
{
|
||||
/** @var $controllerContext \WapplerSystems\Meilisearch\Mvc\Controller\SolrControllerContext */
|
||||
$controllerContext = $this->objectManager->get(SolrControllerContext::class);
|
||||
/** @var $controllerContext \WapplerSystems\Meilisearch\Mvc\Controller\MeilisearchControllerContext */
|
||||
$controllerContext = $this->objectManager->get(MeilisearchControllerContext::class);
|
||||
$controllerContext->setRequest($this->request);
|
||||
$controllerContext->setResponse($this->response);
|
||||
if ($this->arguments !== null) {
|
||||
$controllerContext->setArguments($this->arguments);
|
||||
}
|
||||
$controllerContext->setUriBuilder($this->uriBuilder);
|
||||
$typoScriptConfiguration = $this->solrConfigurationManager->getTypoScriptConfiguration();
|
||||
$typoScriptConfiguration = $this->meilisearchConfigurationManager->getTypoScriptConfiguration();
|
||||
$controllerContext->setTypoScriptConfiguration($typoScriptConfiguration);
|
||||
|
||||
$this->setActiveSearchResultSet($controllerContext);
|
||||
@@ -82,8 +82,8 @@ class AbstractWidgetController extends CoreAbstractWidgetController
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \WapplerSystems\Meilisearch\Mvc\Controller\SolrControllerContext $controllerContext
|
||||
* @return \WapplerSystems\Meilisearch\Mvc\Controller\SolrControllerContext
|
||||
* @param \WapplerSystems\Meilisearch\Mvc\Controller\MeilisearchControllerContext $controllerContext
|
||||
* @return \WapplerSystems\Meilisearch\Mvc\Controller\MeilisearchControllerContext
|
||||
*/
|
||||
protected function setActiveSearchResultSet($controllerContext)
|
||||
{
|
||||
@@ -102,9 +102,9 @@ class AbstractWidgetController extends CoreAbstractWidgetController
|
||||
*/
|
||||
protected function initializeSearch(TypoScriptConfiguration $typoScriptConfiguration)
|
||||
{
|
||||
/** @var \WapplerSystems\Meilisearch\ConnectionManager $solrConnection */
|
||||
$solrConnection = GeneralUtility::makeInstance(ConnectionManager::class)->getConnectionByPageId($GLOBALS['TSFE']->id, Util::getLanguageUid(), $GLOBALS['TSFE']->MP);
|
||||
$search = GeneralUtility::makeInstance(Search::class, /** @scrutinizer ignore-type */ $solrConnection);
|
||||
/** @var \WapplerSystems\Meilisearch\ConnectionManager $meilisearchConnection */
|
||||
$meilisearchConnection = GeneralUtility::makeInstance(ConnectionManager::class)->getConnectionByPageId($GLOBALS['TSFE']->id, Util::getLanguageUid(), $GLOBALS['TSFE']->MP);
|
||||
$search = GeneralUtility::makeInstance(Search::class, /** @scrutinizer ignore-type */ $meilisearchConnection);
|
||||
|
||||
return GeneralUtility::makeInstance(
|
||||
SearchResultSetService::class,
|
||||
|
Reference in New Issue
Block a user