fix phpstan issues

dachcom-digital · Jan 13, 2025 · ed009f8 · ed009f8
1 parent d6c1cc1
commit ed009f8
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 41 deletions.
diff --git a/src/Builder/FrontendFormBuilder.php b/src/Builder/FrontendFormBuilder.php
@@ -95,9 +95,7 @@ public function buildForm(
             'form_template' => null
         ];
 
-        if (is_array($formRuntimeData)) {
-            $formRuntimeData = array_merge($defaults, $formRuntimeData);
-        }
+        $formRuntimeData = array_merge($defaults, $formRuntimeData);
 
         /** @var Request $request */
         $request = $this->requestStack->getCurrentRequest();

diff --git a/src/Controller/Admin/OutputWorkflowController.php b/src/Controller/Admin/OutputWorkflowController.php
@@ -200,7 +200,7 @@ public function saveOutputWorkflowAction(Request $request, int $outputWorkflowId
         if ($form->isValid()) {
             $this->outputWorkflowManager->saveRawEntity($outputWorkflow);
         } else {
-            /** @var FormError $e */
+
             foreach ($form->getErrors(true, true) as $e) {
                 $errorMessageTemplate = $e->getMessageTemplate();
                 foreach ($e->getMessageParameters() as $key => $value) {

diff --git a/src/Doctrine/Type/FormBuilderFieldsType.php b/src/Doctrine/Type/FormBuilderFieldsType.php
@@ -70,7 +70,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): array
             if ($field['type'] === 'container') {
                 $formField = $this->formDefinitionFactory->createFormFieldContainerDefinition();
                 $this->populateFormField($formField, $field);
-                if ($formField instanceof SubFieldsAwareInterface && isset($field['fields']) && is_array($field['fields'])) {
+                if (isset($field['fields']) && is_array($field['fields'])) {
                     $subFields = [];
                     foreach ($field['fields'] as $subField) {
                         $subFormField = $this->formDefinitionFactory->createFormFieldDefinition();

diff --git a/src/Event/FormAssembleEvent.php b/src/Event/FormAssembleEvent.php
@@ -24,7 +24,7 @@ public function getFormOptionsResolver(): FormOptionsResolver
         return $this->formOptionsResolver;
     }
 
-    public function getForm(): FormInterface
+    public function getForm(): ?FormInterface
     {
         return $this->form;
     }

diff --git a/src/EventSubscriber/SignalStorage/FormDataSignalStorage.php b/src/EventSubscriber/SignalStorage/FormDataSignalStorage.php
@@ -41,10 +41,6 @@ public function storeSignal(OutputWorkflowSignalEvent $signal): void
         $storageToken = $this->funnelData->getStorageToken();
         $formStorageData = $this->funnelData->getFormStorageData();
 
-        if (!$formStorageData instanceof FormStorageData) {
-            throw new \Exception('Cannot store signal without valid FormStorageData');
-        }
-
         if ($signal->getName() !== AttachmentStream::SIGNAL_CLEAN_UP) {
             throw new \Exception(sprintf('FormDataSignalStorage only supports signal events of type "%s"', AttachmentStream::SIGNAL_CLEAN_UP));
         }
@@ -62,10 +58,6 @@ public function getSignals(): array
     {
         $formStorageData = $this->funnelData->getFormStorageData();
 
-        if (!$formStorageData instanceof FormStorageData) {
-            return [];
-        }
-
         $restoredAttachmentSignalEvents = [];
         /** @var FileStack $fileStack */
         foreach ($formStorageData->getAttachmentSignals() as $fileStack) {

diff --git a/src/Migrations/Version20230830183642.php b/src/Migrations/Version20230830183642.php
@@ -98,7 +98,7 @@ private function migrateMailLayout(array $configuration): ?array
         return $configuration;
     }
 
-    protected function parseSquareBracketsTag(array $tag): ?string
+    protected function parseSquareBracketsTag(array $tag): string
     {
         $type = $tag[1];
         $config = $this->parseSquareBracketsAttributes($tag[2]);

diff --git a/src/Model/FormDefinition.php b/src/Model/FormDefinition.php
@@ -47,7 +47,7 @@ public function getName(): string
 
     public function setGroup(?string $groupName = null): void
     {
-        $this->group = !empty($groupName) && is_string($groupName) ? $groupName : null;
+        $this->group = !empty($groupName) ? $groupName : null;
     }
 
     public function getGroup(): ?string

diff --git a/src/OutputWorkflow/Channel/Object/AbstractObjectResolver.php b/src/OutputWorkflow/Channel/Object/AbstractObjectResolver.php
@@ -152,10 +152,6 @@ protected function processObject(DataObject\Concrete $object): void
 
         $formData = $this->formValuesOutputApplier->applyForChannel($this->getForm(), [], 'object', $this->getLocale());
 
-        if (!is_array($formData)) {
-            return;
-        }
-
         $this->processObjectData($object, $formData);
     }
 
@@ -447,15 +443,11 @@ protected function dispatchGuardEvent(mixed $subject): DataObject\Fieldcollectio
     protected function getObjectFieldDefinition(mixed $object, string $fieldName): ?DataObject\ClassDefinition\Data
     {
         if ($object instanceof DataObject\Concrete) {
-            $classDefinition = $object->getClass();
-            if ($classDefinition instanceof DataObject\ClassDefinition) {
-                return $classDefinition->getFieldDefinition($fieldName);
-            }
-        } elseif ($object instanceof DataObject\Fieldcollection\Data\AbstractData) {
-            $classDefinition = $object->getDefinition();
-            if ($classDefinition instanceof DataObject\Fieldcollection\Definition) {
-                return $classDefinition->getFieldDefinition($fieldName);
-            }
+            return $object->getClass()->getFieldDefinition($fieldName);
+        }
+
+        if ($object instanceof DataObject\Fieldcollection\Data\AbstractData) {
+            return $object->getDefinition()->getFieldDefinition($fieldName);
         }
 
         return null;

diff --git a/src/OutputWorkflow/FunnelWorker.php b/src/OutputWorkflow/FunnelWorker.php
@@ -103,10 +103,6 @@ public function processFunnel(OutputWorkflowInterface $outputWorkflow, Request $
     {
         $funnelData = $this->funnelDataResolver->getFunnelData($request);
 
-        if (!$funnelData instanceof FunnelData) {
-            throw new \Exception($request, 'Invalid Funnel Data');
-        }
-
         if (!$outputWorkflow->isFunnelWorkflow()) {
             throw new \Exception(sprintf('Funnel with id %d is not a valid funnel', $outputWorkflow->getId()));
         }
@@ -121,10 +117,6 @@ public function processFunnel(OutputWorkflowInterface $outputWorkflow, Request $
 
         $formStorageData = $funnelData->getFormStorageData();
 
-        if (!$formStorageData instanceof FormStorageData) {
-            throw new \Exception(sprintf('No storage data for token "%s" found', $storageToken));
-        }
-
         // restore submission event to allow seamless output workflow channel processing
         $submissionEvent = $this->buildSubmissionEvent($request, $outputWorkflow, $formStorageData);
 

diff --git a/src/Validation/ConditionalLogic/Processor/ConditionalLogicProcessor.php b/src/Validation/ConditionalLogic/Processor/ConditionalLogicProcessor.php
@@ -85,10 +85,6 @@ protected function applyActions(bool $validationState, array $actions, array $fo
 
             $appliedData = $this->conditionalLogicRegistry->getAction($action['type'])->setValues($action)->apply($validationState, $formData, $ruleId);
 
-            if (!$appliedData instanceof ReturnStackInterface) {
-                continue;
-            }
-
             //If field is available: only add affected field data to return container!
             if (!$field instanceof FieldDefinitionInterface) {
                 $returnContainer[] = $appliedData;