first commit
This commit is contained in:
@@ -85,7 +85,7 @@ class SiteRepository
|
||||
* @param TwoLevelCache|null $twoLevelCache
|
||||
* @param Registry|null $registry
|
||||
* @param SiteFinder|null $siteFinder
|
||||
* @param ExtensionConfiguration| null
|
||||
* @param ExtensionConfiguration|null
|
||||
*/
|
||||
public function __construct(
|
||||
RootPageResolver $rootPageResolver = null,
|
||||
@@ -230,8 +230,7 @@ class SiteRepository
|
||||
{
|
||||
/** @var $siteHashService SiteHashService */
|
||||
$siteHashService = GeneralUtility::makeInstance(SiteHashService::class);
|
||||
$siteHash = $siteHashService->getSiteHashForDomain($domain);
|
||||
return $siteHash;
|
||||
return $siteHashService->getSiteHashForDomain($domain);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -272,37 +271,21 @@ class SiteRepository
|
||||
$domain = $typo3Site->getBase()->getHost();
|
||||
|
||||
$siteHash = $this->getSiteHashForDomain($domain);
|
||||
$defaultLanguage = $typo3Site->getDefaultLanguage()->getLanguageId();
|
||||
$pageRepository = GeneralUtility::makeInstance(PagesRepository::class);
|
||||
$availableLanguageIds = array_map(function($language) {
|
||||
return $language->getLanguageId();
|
||||
}, $typo3Site->getLanguages());
|
||||
|
||||
$meilisearchConnectionConfigurations = [];
|
||||
$meilisearchConnectionConfiguration = [];
|
||||
|
||||
foreach ($availableLanguageIds as $languageUid) {
|
||||
$meilisearchEnabled = SiteUtility::getConnectionProperty($typo3Site, 'enabled', $languageUid, 'read', true);
|
||||
if ($meilisearchEnabled) {
|
||||
$meilisearchConnectionConfigurations[$languageUid] = [
|
||||
'connectionKey' => $rootPageRecord['uid'] . '|' . $languageUid,
|
||||
'rootPageTitle' => $rootPageRecord['title'],
|
||||
'rootPageUid' => $rootPageRecord['uid'],
|
||||
'read' => [
|
||||
'scheme' => SiteUtility::getConnectionProperty($typo3Site, 'scheme', $languageUid, 'read', 'http'),
|
||||
'host' => SiteUtility::getConnectionProperty($typo3Site, 'host', $languageUid, 'read', 'localhost'),
|
||||
'port' => (int)SiteUtility::getConnectionProperty($typo3Site, 'port', $languageUid, 'read', 7700),
|
||||
'apiKey' => SiteUtility::getConnectionProperty($typo3Site, 'apiKey', $languageUid, 'read', ''),
|
||||
],
|
||||
'write' => [
|
||||
'scheme' => SiteUtility::getConnectionProperty($typo3Site, 'scheme', $languageUid, 'write', 'http'),
|
||||
'host' => SiteUtility::getConnectionProperty($typo3Site, 'host', $languageUid, 'write', 'localhost'),
|
||||
'port' => (int)SiteUtility::getConnectionProperty($typo3Site, 'port', $languageUid, 'write', 7700),
|
||||
'apiKey' => SiteUtility::getConnectionProperty($typo3Site, 'apiKey', $languageUid, 'write', ''),
|
||||
],
|
||||
|
||||
'language' => $languageUid
|
||||
];
|
||||
}
|
||||
$meilisearchEnabled = SiteUtility::getConnectionProperty($typo3Site, 'enabled', true);
|
||||
if ($meilisearchEnabled) {
|
||||
$meilisearchConnectionConfiguration = [
|
||||
'connectionKey' => $rootPageRecord['uid'] . '|',
|
||||
'rootPageTitle' => $rootPageRecord['title'],
|
||||
'rootPageUid' => $rootPageRecord['uid'],
|
||||
'scheme' => SiteUtility::getConnectionProperty($typo3Site, 'scheme', 'http'),
|
||||
'host' => SiteUtility::getConnectionProperty($typo3Site, 'host', 'localhost'),
|
||||
'port' => (int)SiteUtility::getConnectionProperty($typo3Site, 'port',7700),
|
||||
'apiKey' => SiteUtility::getConnectionProperty($typo3Site, 'apiKey', ''),
|
||||
];
|
||||
}
|
||||
|
||||
return GeneralUtility::makeInstance(
|
||||
@@ -318,11 +301,7 @@ class SiteRepository
|
||||
/** @scrutinizer ignore-type */
|
||||
$pageRepository,
|
||||
/** @scrutinizer ignore-type */
|
||||
$defaultLanguage,
|
||||
/** @scrutinizer ignore-type */
|
||||
$availableLanguageIds,
|
||||
/** @scrutinizer ignore-type */
|
||||
$meilisearchConnectionConfigurations,
|
||||
$meilisearchConnectionConfiguration,
|
||||
/** @scrutinizer ignore-type */
|
||||
$typo3Site
|
||||
);
|
||||
|
Reference in New Issue
Block a user