fix phpstan issues

dachcom-digital · Aug 30, 2023 · 62270df · 62270df
1 parent 9acfa1f
commit 62270df
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 43 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,8 @@
     "require": {
         "php": "^8.2",
         "pimcore/pimcore": "^11.0",
-        "symfony/form": "^6.0",
+        "symfony/form": "^6.2",
+        "symfony/intl": "^6.2",
         "doctrine/orm": "^2.7"
     },
     "require-dev": {

diff --git a/src/OutputWorkflow/Channel/Api/ApiOutputChannelWorker.php b/src/OutputWorkflow/Channel/Api/ApiOutputChannelWorker.php
@@ -15,21 +15,12 @@
 
 class ApiOutputChannelWorker
 {
-    protected FormValuesOutputApplierInterface $formValuesOutputApplier;
-    protected ApiProviderRegistry $apiProviderRegistry;
-    protected FieldTransformerRegistry $fieldTransformerRegistry;
-    protected EventDispatcherInterface $eventDispatcher;
-
     public function __construct(
-        FormValuesOutputApplierInterface $formValuesOutputApplier,
-        ApiProviderRegistry $apiProviderRegistry,
-        FieldTransformerRegistry $fieldTransformerRegistry,
-        EventDispatcherInterface $eventDispatcher
+        protected FormValuesOutputApplierInterface $formValuesOutputApplier,
+        protected ApiProviderRegistry $apiProviderRegistry,
+        protected FieldTransformerRegistry $fieldTransformerRegistry,
+        protected EventDispatcherInterface $eventDispatcher
     ) {
-        $this->formValuesOutputApplier = $formValuesOutputApplier;
-        $this->apiProviderRegistry = $apiProviderRegistry;
-        $this->fieldTransformerRegistry = $fieldTransformerRegistry;
-        $this->eventDispatcher = $eventDispatcher;
     }
 
     public function process(SubmissionEvent $submissionEvent, string $workflowName, array $channelConfiguration): void

diff --git a/src/OutputWorkflow/Channel/Email/EmailOutputChannel.php b/src/OutputWorkflow/Channel/Email/EmailOutputChannel.php
@@ -9,13 +9,10 @@
 
 class EmailOutputChannel implements ChannelInterface
 {
-    protected EmailOutputChannelWorker $channelWorker;
-    protected LocaleDataMapper $localeDataMapper;
-
-    public function __construct(EmailOutputChannelWorker $channelWorker, LocaleDataMapper $localeDataMapper)
-    {
-        $this->channelWorker = $channelWorker;
-        $this->localeDataMapper = $localeDataMapper;
+    public function __construct(
+        protected EmailOutputChannelWorker $channelWorker,
+        protected LocaleDataMapper $localeDataMapper
+    ) {
     }
 
     public function getFormType(): string

diff --git a/src/OutputWorkflow/Channel/Email/EmailOutputChannelWorker.php b/src/OutputWorkflow/Channel/Email/EmailOutputChannelWorker.php
@@ -17,18 +17,11 @@
 
 class EmailOutputChannelWorker
 {
-    protected Configuration $configuration;
-    protected MailParser $mailParser;
-    protected EventDispatcherInterface $eventDispatcher;
-
     public function __construct(
-        Configuration $configuration,
-        MailParser $mailParser,
-        EventDispatcherInterface $eventDispatcher
+        protected Configuration $configuration,
+        protected MailParser $mailParser,
+        protected EventDispatcherInterface $eventDispatcher
     ) {
-        $this->configuration = $configuration;
-        $this->mailParser = $mailParser;
-        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
@@ -89,7 +82,7 @@ public function process(FormInterface $form, array $channelConfiguration, array
      */
     protected function sendPlainTextOnly(Mail $mail): void
     {
-        $mail->setSubject($mail->getSubjectRendered());
+        $mail->subject($mail->getSubjectRendered());
         $bodyTextRendered = $mail->getBodyTextRendered();
 
         if ($bodyTextRendered) {

diff --git a/src/OutputWorkflow/Channel/Funnel/Action/ChannelAction.php b/src/OutputWorkflow/Channel/Funnel/Action/ChannelAction.php
@@ -9,11 +9,8 @@
 
 class ChannelAction implements FunnelActionInterface
 {
-    protected UrlGeneratorInterface $router;
-
-    public function __construct(UrlGeneratorInterface $router)
+    public function __construct(protected UrlGeneratorInterface $router)
     {
-        $this->router = $router;
     }
 
     public function getName(): string

diff --git a/src/Validation/ConditionalLogic/Dispatcher/Module/Constraints.php b/src/Validation/ConditionalLogic/Dispatcher/Module/Constraints.php
@@ -94,7 +94,7 @@ private function checkConditionalLogicConstraints(array $defaultFieldConstraints
                     $defaultFieldConstraints = [];
                 } else {
                     foreach ($returnStack->getData() as $constraint) {
-                        $defaultFieldConstraints = array_filter($defaultFieldConstraints, function ($val) use ($constraint) {
+                        $defaultFieldConstraints = array_filter($defaultFieldConstraints, static function ($val) use ($constraint) {
                             return $val['type'] !== $constraint;
                         });
                     }

diff --git a/src/Validation/ConditionalLogic/ReturnStack/FieldReturnStack.php b/src/Validation/ConditionalLogic/ReturnStack/FieldReturnStack.php
@@ -9,7 +9,7 @@ class FieldReturnStack implements ReturnStackInterface
      */
     public function __construct(
         protected string $actionType,
-        protected array $data = []
+        protected mixed $data
     ) {
         if (!$this->isAssoc($this->data)) {
             throw new \Exception('FieldReturnStack: Wrong data structure: data keys must contain form field names!');
@@ -21,12 +21,12 @@ public function getActionType(): string
         return $this->actionType;
     }
 
-    public function getData(): array
+    public function getData(): mixed
     {
         return $this->data;
     }
 
-    public function updateData(array $data): void
+    public function updateData(mixed $data): void
     {
         $this->data = $data;
     }

diff --git a/src/Validation/ConditionalLogic/ReturnStack/SimpleReturnStack.php b/src/Validation/ConditionalLogic/ReturnStack/SimpleReturnStack.php
@@ -6,7 +6,7 @@ class SimpleReturnStack implements ReturnStackInterface
 {
     public function __construct(
         protected string $actionType,
-        protected array $data = []
+        protected mixed $data
     ) {
     }
 
@@ -15,7 +15,7 @@ public function getActionType(): string
         return $this->actionType;
     }
 
-    public function getData(): array
+    public function getData(): mixed
     {
         return $this->data;
     }

diff --git a/src/Validator/Constraints/Recaptcha3Validator.php b/src/Validator/Constraints/Recaptcha3Validator.php
@@ -38,6 +38,6 @@ private function validateCaptcha(string $value): bool
             return false;
         }
 
-        return $this->reCaptchaProcessor->verify($value);
+        return $this->reCaptchaProcessor->verify($value)->isSuccess();
     }
 }