use inline var

cultuurnet · Feb 5, 2025 · 967143c · 967143c
1 parent 352ac36
commit 967143c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/Http/Authentication/AuthenticateRequest.php b/src/Http/Authentication/AuthenticateRequest.php
@@ -165,17 +165,12 @@ private function handleApiKey(
             return (new RemovedApiKey($apiKey))->toResponse();
         }
 
-        $defaultQuery = $this->defaultQueryRepository->getByApiKey($apiKey);
-        if ($defaultQuery === null && !empty($this->consumerResolver->getDefaultQuery($apiKey))) {
-            $defaultQuery = $this->consumerResolver->getDefaultQuery($apiKey);
-        }
-
         $this->container
             ->extend(Consumer::class)
             ->setConcrete(
                 new Consumer(
                     $apiKey,
-                    $defaultQuery
+                    $this->defaultQueryRepository->getByApiKey($apiKey) ?? $this->consumerResolver->getDefaultQuery($apiKey)
                 )
             );
 

diff --git a/tests/Http/Authentication/AuthenticateRequestTest.php b/tests/Http/Authentication/AuthenticateRequestTest.php
@@ -203,7 +203,7 @@ public function it_handles_valid_requests_with_api_key(ServerRequestInterface $r
             ->with('my_active_api_key')
             ->willReturn('ACTIVE');
 
-        $this->consumerResolver->expects($this->exactly(2))
+        $this->consumerResolver->expects($this->once())
             ->method('getDefaultQuery')
             ->with('my_active_api_key')
             ->willReturn('my_default_search_query');