Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TASK] Fix CI 2023.09.11 on release-11.5.x #3777

Merged
merged 1 commit into from
Sep 11, 2023
Merged

[TASK] Fix CI 2023.09.11 on release-11.5.x #3777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Classes/Controller/AbstractBaseController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ protected function buildControllerContext()
/** @var $controllerContext SolrControllerContext */
$controllerContext = $this->objectManager->get(SolrControllerContext::class);
$controllerContext->setRequest($this->request);
// $controllerContext->setResponse($this->response);
if ($this->arguments !== null) {
$controllerContext->setArguments($this->arguments);
}
Expand Down
6 changes: 3 additions & 3 deletions Classes/FrontendEnvironment/Tsfe.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ protected function initializeTsfe(int $pageId, int $language = 0, ?int $rootPage
$reusedCacheIdentifier = $this->getCacheIdentifier($pidToUse, $language, $rootPageId);
$this->serverRequestCache[$cacheIdentifier] = $this->serverRequestCache[$reusedCacheIdentifier];
$this->tsfeCache[$cacheIdentifier] = $this->tsfeCache[$reusedCacheIdentifier];
// if ($rootPageId === null) {
// // @Todo: Resolve and set TSFE object for $rootPageId.
// }
// if ($rootPageId === null) {
// @Todo: Resolve and set TSFE object for $rootPageId.
// }
return;
}

Expand Down
3 changes: 0 additions & 3 deletions Classes/IndexQueue/Indexer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,6 @@ protected function getAccessRootline(Item $item)
*/
protected function processDocuments(Item $item, array $documents): array
{
// // needs to respect the TS settings for the page the item is on, conditions may apply
// $solrConfiguration = $this->frontendEnvironment->getSolrConfigurationFromPageId($item->getRootPageUid());

$siteRepository = GeneralUtility::makeInstance(SiteRepository::class);
$solrConfiguration = $siteRepository->getSiteByPageId($item->getRootPageUid())->getSolrConfiguration();
$fieldProcessingInstructions = $solrConfiguration->getIndexFieldProcessingInstructionsConfiguration();
Expand Down
2 changes: 0 additions & 2 deletions Tests/Integration/IndexQueue/IndexerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,6 @@ public function canIndexMultipleMMRelatedItems()
{
$this->cleanUpSolrServerAndAssertEmpty('core_en');

// $this->writeDefaultSolrTestSiteConfiguration();

// create fake extension database table and TCA
$this->importExtTablesDefinition('fake_extension2_table.sql');
$GLOBALS['TCA']['tx_fakeextension_domain_model_bar'] = include($this->getFixturePathByName('fake_extension2_bar_tca.php'));
Expand Down
25 changes: 13 additions & 12 deletions Tests/Unit/Domain/Search/FrequentSearches/FrequentSearchesServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,19 @@ protected function setUp(): void
$this->configurationMock = $this->getDumbMock(TypoScriptConfiguration::class);

$this->frequentSearchesService = new class($this->configurationMock, $this->cacheMock, $this->tsfeMock, $this->statisticsRepositoryMock) extends FrequentSearchesService {
// protected function getCacheIdentifier(array $frequentSearchConfiguration) : string {
// $identifier = 'frequentSearchesTags';
// if (isset($frequentSearchConfiguration['select.']['checkRootPageId']) && $frequentSearchConfiguration['select.']['checkRootPageId']) {
// $identifier .= '_RP' . 4710;
// }
// if (isset($frequentSearchConfiguration['select.']['checkLanguage']) && $frequentSearchConfiguration['select.']['checkLanguage']) {
// $identifier .= '_L' . 0;
// }
//
// $identifier .= '_' . md5(serialize($frequentSearchConfiguration));
// return $identifier;
// }
protected function getCacheIdentifier(array $frequentSearchConfiguration): string
{
$identifier = 'frequentSearchesTags';
if (isset($frequentSearchConfiguration['select.']['checkRootPageId']) && $frequentSearchConfiguration['select.']['checkRootPageId']) {
$identifier .= '_RP' . 4710;
}
if (isset($frequentSearchConfiguration['select.']['checkLanguage']) && $frequentSearchConfiguration['select.']['checkLanguage']) {
$identifier .= '_L' . 0;
}

$identifier .= '_' . md5(serialize($frequentSearchConfiguration));
return $identifier;
}
};
parent::setUp();
}
Expand Down
1 change: 0 additions & 1 deletion Tests/Unit/SearchTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ class SearchTest extends UnitTest

protected function setUp(): void
{
// $this->solrReadServiceMock = $this->getDumbMock(SolrReadService::class);
$this->solrReadServiceMock = $this->getMockBuilder(SolrReadService::class)
->disableOriginalConstructor()
->onlyMethods(['search'])
Expand Down
Loading