fix phpstan issues

dachcom-digital · Jan 6, 2025 · 4473414 · 4473414
1 parent 617289b
commit 4473414
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 43 deletions.
diff --git a/src/Controller/SearchFrontendController.php b/src/Controller/SearchFrontendController.php
@@ -132,13 +132,6 @@ protected function renderFrontendSearch(Request $request, string $outputChannelN
         $blocks = [];
         if ($outputChannelResult instanceof MultiOutputChannelResultInterface) {
             foreach ($outputChannelResult->getResults() as $resultBlockIdentifier => $resultBlock) {
-                if (!$resultBlock instanceof OutputChannelResultInterface) {
-                    return $this->renderTemplate($viewName, [
-                        'has_error'     => true,
-                        'error_message' => sprintf('output channel "%s" for context "%s" should return OutputChannelResultInterface.', $outputChannelName, $contextName)
-                    ]);
-                }
-
                 $blocks[$resultBlockIdentifier] = $this->prepareQueryVars($resultBlock);
             }
         }

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -206,13 +206,13 @@ private function buildContextOutputChannelsNode(): NodeDefinition
                 ->end()
                 ->beforeNormalization()
                     ->ifTrue(function ($values) {
-                        return isset($values['multiple'], $values['runtime_options_builder']) && $values['multiple'] === true && $values['runtime_options_builder'] !== null;
+                        return isset($values['multiple'], $values['runtime_options_builder']) && $values['multiple'] === true;
                     })
                     ->thenInvalid('Unrecognized multi search option "runtime_options_builder"')
                 ->end()
                 ->beforeNormalization()
                     ->ifTrue(function ($values) {
-                        return isset($values['use_frontend_controller'], $values['view_name']) && $values['use_frontend_controller'] !== true && $values['view_name'] !== null;
+                        return isset($values['use_frontend_controller'], $values['view_name']) && $values['use_frontend_controller'] !== true;
                     })
                     ->thenInvalid('Unrecognized option "view_name" in a non frontend controller based output channel')
                 ->end()
@@ -223,7 +223,7 @@ private function buildContextOutputChannelsNode(): NodeDefinition
                             return $values;
                         }
 
-                        if (isset($values['view_name']) && $values['view_name'] !== null) {
+                        if (isset($values['view_name'])) {
                             return $values;
                         }
 

diff --git a/src/Document/Definition/DocumentDefinition.php b/src/Document/Definition/DocumentDefinition.php
@@ -79,7 +79,7 @@ public function addOptionFieldDefinition(array $definition): static
 
     public function getOptionFieldDefinitions(): array
     {
-        return !is_array($this->optionFieldDefinitions) ? [] : $this->optionFieldDefinitions;
+        return $this->optionFieldDefinitions;
     }
 
     public function addSimpleDocumentFieldDefinition(array $definition): static

diff --git a/src/Document/IndexDocument.php b/src/Document/IndexDocument.php
@@ -44,7 +44,7 @@ public function addIndexField(IndexFieldContainerInterface $fieldContainer): voi
 
     public function hasIndexFields(): bool
     {
-        return is_array($this->indexFields) && count($this->indexFields) > 0;
+        return count($this->indexFields) > 0;
     }
 
     /**
@@ -57,7 +57,7 @@ public function getIndexFields(): array
 
     public function hasOptionFields(): bool
     {
-        return is_array($this->optionFields) && count($this->optionFields) > 0;
+        return count($this->optionFields) > 0;
     }
 
     /**

diff --git a/src/EventListener/PimcoreElementListener.php b/src/EventListener/PimcoreElementListener.php
@@ -96,7 +96,7 @@ public function onObjectPostUpdate(DataObjectEvent $event): void
             return;
         }
 
-        /** @var DataObject\Concrete $object */
+        /** @var ElementInterface $object */
         $object = $event->getObject();
 
         // @deprecated since 5.0: published/unpublished must be handled by project-specific resource validation

diff --git a/src/Filter/Definition/FilterDefinition.php b/src/Filter/Definition/FilterDefinition.php
@@ -8,7 +8,7 @@
 
 class FilterDefinition implements FilterDefinitionInterface
 {
-    protected array $filterDefinitions;
+    protected array $filterDefinitions = [];
 
     public function addFilterDefinition(array $definition): static
     {
@@ -36,6 +36,6 @@ public function addFilterDefinition(array $definition): static
 
     public function getFilterDefinitions(): array
     {
-        return !is_array($this->filterDefinitions) ? [] : $this->filterDefinitions;
+        return $this->filterDefinitions;
     }
 }
diff --git a/src/Manager/OutputChannelManager.php b/src/Manager/OutputChannelManager.php
@@ -30,10 +30,6 @@ public function getOutputChannel(ContextDefinitionInterface $contextDefinition,
             return null;
         }
 
-        if (!is_string($outputChannelServiceName)) {
-            throw new ProviderException(sprintf('Invalid requested index output channel service "%s"', $outputChannelName));
-        }
-
         if (!$this->outputChannelRegistry->hasOutputChannelService($outputChannelServiceName)) {
             return null;
         }

diff --git a/src/Paginator/Adapter/DynamicSearchAdapter.php b/src/Paginator/Adapter/DynamicSearchAdapter.php
@@ -11,7 +11,7 @@ class DynamicSearchAdapter implements AdapterInterface
 {
     protected ContextDefinitionInterface $contextDefinition;
     protected string $outputChannelName;
-    protected DocumentNormalizerInterface $documentNormalizer;
+    protected ?DocumentNormalizerInterface $documentNormalizer = null;
     protected RawResultInterface $rawResult;
     protected int $itemCountPerPage;
     protected int $currentPageNumber;

diff --git a/src/Processor/OutputChannelProcessor.php b/src/Processor/OutputChannelProcessor.php
@@ -189,7 +189,7 @@ protected function buildMulti(
             $subOutputChannelIdentifier = $searchContainer->getIdentifier();
 
             $filter = $filters[$subOutputChannelIdentifier];
-            /** @var SubOutputChannelContextInterface $subOutputChannelContext */
+            /** @var OutputChannelContext $subOutputChannelContext */
             $subOutputChannelContext = $subContexts[$subOutputChannelIdentifier];
 
             if (!array_key_exists($subOutputChannelIdentifier, $outputChannelBlocks)) {

diff --git a/src/Processor/ResourceDeletionProcessor.php b/src/Processor/ResourceDeletionProcessor.php
@@ -32,16 +32,6 @@ public function process(ContextDefinitionInterface $contextDefinition, $resource
         }
 
         foreach ($normalizedResourceStack as $normalizedResource) {
-            if (!$normalizedResource instanceof NormalizedDataResourceInterface) {
-                $this->logger->error(
-                    sprintf('Normalized resource needs to be instance of %s. Skipping...', NormalizedDataResourceInterface::class),
-                    $contextDefinition->getDataProviderName(),
-                    $contextDefinition->getName()
-                );
-
-                continue;
-            }
-
             $resourceMeta = $normalizedResource->getResourceMeta();
             if (empty($resourceMeta->getDocumentId())) {
                 $this->logger->error(

diff --git a/src/Processor/ResourceModificationProcessor.php b/src/Processor/ResourceModificationProcessor.php
@@ -41,16 +41,6 @@ public function process(ContextDefinitionInterface $contextDefinition, $resource
         }
 
         foreach ($normalizedResourceStack as $normalizedResource) {
-            if (!$normalizedResource instanceof NormalizedDataResourceInterface) {
-                $this->logger->error(
-                    sprintf('Normalized resource needs to be instance of %s. Skipping...', NormalizedDataResourceInterface::class),
-                    $contextDefinition->getDataProviderName(),
-                    $contextDefinition->getName()
-                );
-
-                continue;
-            }
-
             $resourceMeta = $normalizedResource->getResourceMeta();
             if (empty($resourceMeta->getDocumentId())) {
                 $this->logger->error(

diff --git a/src/Provider/Extension/ProviderBundleLocator.php b/src/Provider/Extension/ProviderBundleLocator.php
@@ -77,7 +77,7 @@ protected function findBundlesInPaths(array $paths): array
 
     protected function processBundleClass(?string $bundle, array &$result): void
     {
-        if (empty($bundle) || !is_string($bundle)) {
+        if (empty($bundle)) {
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,7 +77,7 @@ protected function findBundlesInPaths(array $paths): array @@
         protected function processBundleClass(?string $bundle, array &$result): void
         {
-            if (empty($bundle) || !is_string($bundle)) {
+            if (empty($bundle)) {
                 return;
             }
@@ Expand Down @@