Merge remote-tracking branch 'origin/1.4'

netgen · Apr 19, 2021 · 23abf49 · 23abf49
2 parents d9755dc + 8d05774
commit 23abf49
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/bundle/DependencyInjection/Compiler/IoStorageAllowListPass.php b/bundle/DependencyInjection/Compiler/IoStorageAllowListPass.php
@@ -9,6 +9,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use function array_merge;
 use function array_search;
+use function array_values;
 
 class IoStorageAllowListPass implements CompilerPassInterface
 {

diff --git a/bundle/EventListener/NoViewTemplateEventListener.php b/bundle/EventListener/NoViewTemplateEventListener.php
@@ -77,8 +77,8 @@ public function getController(ControllerEvent $event): void
         }
 
         if (
-            $view->getControllerReference() instanceof ControllerReference &&
-            mb_strpos($view->getControllerReference()->controller, sprintf('%s::', RedirectController::class)) === 0
+            $view->getControllerReference() instanceof ControllerReference
+            && mb_strpos($view->getControllerReference()->controller, sprintf('%s::', RedirectController::class)) === 0
         ) {
             return;
         }

diff --git a/bundle/Helper/PathHelper.php b/bundle/Helper/PathHelper.php
@@ -53,8 +53,8 @@ public function getPath(int $locationId, array $options = []): array
 
         $excludedContentTypes = [];
         if (
-            !$options['use_all_content_types'] &&
-            $this->configResolver->hasParameter('path_helper.excluded_content_types', 'ngsite')
+            !$options['use_all_content_types']
+            && $this->configResolver->hasParameter('path_helper.excluded_content_types', 'ngsite')
         ) {
             $excludedContentTypes = $this->configResolver->getParameter('path_helper.excluded_content_types', 'ngsite');
             if (!is_array($excludedContentTypes)) {

diff --git a/bundle/Layouts/Query/ContentByTopicHandler.php b/bundle/Layouts/Query/ContentByTopicHandler.php
@@ -31,13 +31,13 @@
 
 class ContentByTopicHandler implements QueryTypeHandlerInterface
 {
+    use Traits\ContentTypeFilterTrait;
+    use Traits\MainLocationFilterTrait;
+    use Traits\ObjectStateFilterTrait;
     use Traits\ParentLocationTrait;
-    use Traits\SortTrait;
     use Traits\QueryTypeFilterTrait;
-    use Traits\MainLocationFilterTrait;
-    use Traits\ContentTypeFilterTrait;
     use Traits\SectionFilterTrait;
-    use Traits\ObjectStateFilterTrait;
+    use Traits\SortTrait;
 
     /**
      * @var \Netgen\EzPlatformSiteApi\API\LoadService
@@ -152,8 +152,8 @@ public function getCount(Query $query): int
     public function isContextual(Query $query): bool
     {
         return
-            $query->getParameter('use_topic_from_current_content')->getValue() === true ||
-            $query->getParameter('use_current_location')->getValue() === true;
+            $query->getParameter('use_topic_from_current_content')->getValue() === true
+            || $query->getParameter('use_current_location')->getValue() === true;
     }
 
     /**