WapplerSystems/meilisearch
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

first commit

Browse Source
This commit is contained in:
Sven Wappler
2021-04-17 21:20:54 +02:00
parent c93ec9492a
commit cadcc8edb4
406 changed files with 4917 additions and 5157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Classes/Widget/AbstractWidgetController.php
View File

@@ -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,

12
Classes/Widget/AbstractWidgetViewHelper.php
View File

@@ -14,8 +14,8 @@ namespace WapplerSystems\Meilisearch\Widget;
* The TYPO3 project - inspiring people to share!
*/
use WapplerSystems\Meilisearch\Mvc\Controller\SolrControllerContext;
use WapplerSystems\Meilisearch\Widget\WidgetRequest as SolrFluidWidgetRequest;
use WapplerSystems\Meilisearch\Mvc\Controller\MeilisearchControllerContext;
use WapplerSystems\Meilisearch\Widget\WidgetRequest as MeilisearchFluidWidgetRequest;
use TYPO3\CMS\Extbase\Mvc\Web\Response;
use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode;
@@ -120,7 +120,7 @@ abstract class AbstractWidgetViewHelper extends AbstractCoreWidgetViewHelper imp
}
/**
* @return SolrControllerContext
* @return MeilisearchControllerContext
* @throws \InvalidArgumentException
*/
protected function getControllerContext()
@@ -130,8 +130,8 @@ abstract class AbstractWidgetViewHelper extends AbstractCoreWidgetViewHelper imp
$controllerContext = $this->renderingContext->getControllerContext();
}
if (!$controllerContext instanceof SolrControllerContext) {
throw new \InvalidArgumentException('No valid SolrControllerContext found', 1512998673);
if (!$controllerContext instanceof MeilisearchControllerContext) {
throw new \InvalidArgumentException('No valid MeilisearchControllerContext found', 1512998673);
}
return $controllerContext;
@@ -204,7 +204,7 @@ abstract class AbstractWidgetViewHelper extends AbstractCoreWidgetViewHelper imp
throw new MissingControllerException('initiateSubRequest() can not be called if there is no controller inside $this->controller. Make sure to add a corresponding injectController method to your WidgetViewHelper class "' . get_class($this) . '".', 1284401632);
}
/** @var $subRequest \WapplerSystems\Meilisearch\Widget\WidgetRequest */
$subRequest = $this->objectManager->get(SolrFluidWidgetRequest::class);
$subRequest = $this->objectManager->get(MeilisearchFluidWidgetRequest::class);
$subRequest->setWidgetContext($this->widgetContext);
$this->passArgumentsToSubRequest($subRequest);