Readability improvements in QueryResultsInjector

ezsystems · Jan 12, 2021 · 1482904 · 1482904
1 parent ce7cda8
commit 1482904
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/eZ/ContentView/QueryResultsInjector.php b/src/eZ/ContentView/QueryResultsInjector.php
@@ -77,13 +77,8 @@ public function injectQueryResults(FilterViewParametersEvent $event)
     private function buildResults(FilterViewParametersEvent $event): iterable
     {
         $view = $event->getView();
-        if ($view instanceof LocationValueView) {
-            $location = $view->getLocation();
-        }
-
-        if ($view instanceof ContentValueView) {
-            $content = $view->getContent();
-        }
+        $location = $view instanceof LocationValueView ? $location = $view->getLocation() : null;
+        $content = $view instanceof ContentValueView ? $view->getContent() : null;
 
         $viewParameters = $event->getBuilderParameters();
         $fieldDefinitionIdentifier = $viewParameters['queryFieldDefinitionIdentifier'];
@@ -118,7 +113,7 @@ private function buildResults(FilterViewParametersEvent $event): iterable
             $pageParam = sprintf('%s_page', $fieldDefinitionIdentifier);
             $page = isset($request) ? $request->get($pageParam, 1) : 1;
 
-            if (isset($location)) {
+            if ($location !== null) {
                 $pager = new Pagerfanta(
                     new QueryResultsWithLocationPagerFantaAdapter(
                         $this->queryFieldService, $location, $fieldDefinitionIdentifier
@@ -137,12 +132,12 @@ private function buildResults(FilterViewParametersEvent $event): iterable
 
             return $pager;
         } else {
-            if ($this->queryFieldService instanceof QueryFieldLocationService && isset($location)) {
+            if ($this->queryFieldService instanceof QueryFieldLocationService && $location !== null) {
                 return $this->queryFieldService->loadContentItemsForLocation(
                     $location,
                     $fieldDefinitionIdentifier
                 );
-            } elseif (isset($content)) {
+            } elseif ($content !== null) {
                 return $this->queryFieldService->loadContentItems(
                     $content,
                     $fieldDefinitionIdentifier