Fix static analysis.

yii2-extensions · Nov 29, 2023 · b992bf9 · b992bf9
1 parent ba0325f
commit b992bf9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/UseCase/Contact/ContactController.php b/src/UseCase/Contact/ContactController.php
@@ -20,6 +20,7 @@ public function actions(): array
             [
                 'index' => [
                     'class' => Index\IndexAction::class,
+                    'formModelClass' => $this->formModelClass,
                 ],
                 'captcha' => [
                     'class' => CaptchaAction::class,

diff --git a/src/UseCase/Contact/Index/IndexAction.php b/src/UseCase/Contact/Index/IndexAction.php
@@ -5,7 +5,9 @@
 namespace App\UseCase\Contact\Index;
 
 use App\UseCase\Contact\ContactEvent;
+use App\UseCase\Contact\ContactForm;
 use yii\base\Action;
+use yii\base\InvalidConfigException;
 use yii\symfonymailer\Mailer;
 use yii\web\Controller;
 use yii\web\Request;
@@ -14,6 +16,8 @@
 
 final class IndexAction extends Action
 {
+    public string $formModelClass = '';
+
     public function __construct(
         string $id,
         Controller $controller,
@@ -26,7 +30,11 @@ public function __construct(
 
     public function run(): Response|string
     {
-        $contactForm = new $this->controller->formModelClass();
+        if ($this->formModelClass === '') {
+            throw new InvalidConfigException('The "formModelClass" property must be set.');
+        }
+
+        $contactForm = new $this->formModelClass();
         $contactEvent = new ContactEvent();
 
         if (
@@ -39,8 +47,6 @@ public function run(): Response|string
 
                 $this->trigger(ContactEvent::EVENT_AFTER_SEND, $contactEvent);
             }
-
-            return $this->controller->refresh();
         }
 
         return $this->controller->render(