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

[BUGFIX] Fix EXT:solr route enhancer #3742

Merged
merged 1 commit into from
Sep 11, 2023
Merged

[BUGFIX] Fix EXT:solr route enhancer #3742

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
2 changes: 1 addition & 1 deletion Classes/EventListener/EnhancedRouting/CachedPathVariableModifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function __invoke(BeforeCachedVariablesAreProcessedEvent $event): void

$this->routingService = GeneralUtility::makeInstance(
RoutingService::class,
$enhancerConfiguration['solr'],
$enhancerConfiguration['solr'] ?? [],
(string)$enhancerConfiguration['extensionKey']
);

Expand Down
2 changes: 1 addition & 1 deletion Classes/EventListener/EnhancedRouting/PostEnhancedUriProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function __invoke(AfterUriIsProcessedEvent $event): void
/** @var RoutingService $routingService */
$routingService = GeneralUtility::makeInstance(
RoutingService::class,
$configuration['solr'],
$configuration['solr'] ?? [],
(string)$configuration['extensionKey']
);

Expand Down
71 changes: 34 additions & 37 deletions Classes/Middleware/SolrRoutingMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function injectRoutingService(RoutingService $routingService): void
*/
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{
if (!$request->hasHeader(PageIndexerRequest::SOLR_INDEX_HEADER)) {
if ($request->hasHeader(PageIndexerRequest::SOLR_INDEX_HEADER)) {
return $handler->handle($request);
}

Expand Down Expand Up @@ -128,7 +128,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
/*
* Take slug path segments and argument from incoming URI
*/
[$slug, $parameters] = $this->extractParametersFromUriPath(
[, $parameters] = $this->extractParametersFromUriPath(
$request->getUri(),
$enhancerConfiguration['routePath'],
$page['slug']
Expand Down Expand Up @@ -175,7 +175,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
*/
protected function configure(array $enhancerConfiguration): void
{
$this->settings = $enhancerConfiguration['solr'];
$this->settings = $enhancerConfiguration['solr'] ?? [];
$this->namespace = $enhancerConfiguration['extensionKey'] ?? $this->namespace;
$this->routingService = null;
}
Expand Down Expand Up @@ -287,45 +287,42 @@ protected function retrievePageInformation(UriInterface $uri, Site $site): array
$path,
$this->language
);

if (empty($items)) {
$this->logger
->
error(
vsprintf(
'Could not determine page for slug "%1$s" and language "%2$s". Given path "%3$s"',
[
$path,
$this->language->getLocale()->getLanguageCode(),
$uri->getPath(),
]
)
);
if (empty($path)) {
$message = 'Could not resolve page by path "%3$s" and language "%2$s".';
} else {
$message = 'Could not determine page for slug "%1$s" and language "%2$s". Given path "%3$s"';
}

$this->logger->error(
sprintf(
$message,
$path,
$this->language->getTwoLetterIsoCode(),
$uri->getPath()
)
);
$scan = false;
} elseif (empty($path)) {
$this->logger
->
error(
vsprintf(
'Could not resolve page by path "%1$s" and language "%2$s".',
[
$uri->getPath(),
$this->language->getLocale()->getLanguageCode(),
]
)
);
} elseif (empty($path) && count($items) === 1) {
$page = $items[0];
$this->logger->info(
sprintf(
'Path "%1$s" -> slug "%2$s"',
$uri->getPath(),
$page['slug']
)
);
$scan = false;
} else {
foreach ($items as $item) {
$this->logger
->info(
vsprintf(
'Path "%1$s" -> slug "%2$s"',
[
$path,
$item['slug'],
]
)
);
$this->logger->info(
sprintf(
'Path "%1$s" -> slug "%2$s"',
$path,
$item['slug']
)
);

if ($item['slug'] === $path) {
$page = $item;
Expand Down
2 changes: 1 addition & 1 deletion Classes/Routing/Enhancer/SolrFacetMaskAndCombineEnhancer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ protected function getRoutingService(): RoutingService
/** @var RoutingService $routingService */
$routingService = GeneralUtility::makeInstance(
RoutingService::class,
$this->configuration['solr'],
$this->configuration['solr'] ?? [],
(string)$this->configuration['extensionKey']
);
return $routingService->withPathArguments($this->configuration['_arguments']);
Expand Down
27 changes: 24 additions & 3 deletions Tests/Unit/Middleware/SolrRoutingMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ public function missingEnhancerHasNoEffectTest(): void
$serverRequest = new ServerRequest(
'GET',
'https://domain.example/facet/bar,buz,foo',
[
PageIndexerRequest::SOLR_INDEX_HEADER => '1',
]
);
$siteMatcherMock = $this->getMockBuilder(SiteMatcher::class)
->disableOriginalConstructor()
Expand Down Expand Up @@ -132,4 +129,28 @@ public function missingEnhancerHasNoEffectTest(): void
$uri->getPath()
);
}

/**
* @test
* @covers \ApacheSolrForTypo3\Solr\Middleware\SolrRoutingMiddleware::process
*/
public function enhancerInactiveDuringIndexingTest(): void
{
$serverRequest = new ServerRequest(
'GET',
'https://domain.example/',
[
PageIndexerRequest::SOLR_INDEX_HEADER => '1',
]
);

$this->routingServiceMock->expects(self::never())->method('getSiteMatcher');
$solrRoutingMiddleware = new SolrRoutingMiddleware();
$solrRoutingMiddleware->setLogger(new NullLogger());
$solrRoutingMiddleware->injectRoutingService($this->routingServiceMock);
$solrRoutingMiddleware->process(
$serverRequest,
$this->responseOutputHandler
);
}
}