Test fixes

Author: aleksandr.shelestov

src/FieldTypes/Validators/RegExpValidator.php

@@ -5,17 +5,18 @@
 
     public function __construct(
         private ?string $pattern = null
-    ) {
-    }
+    ) {}
 
-    public function validate($value): bool {
+    public function validate($value): bool
+    {
         if ($this->pattern === null) {
             return true;
         }
         return preg_match('!' . $this->pattern . '!u', $value) === 1;
     }
 
-    public function getErrorMessage(): string {
+    public function getErrorMessage(): string
+    {
         return "The value does not match the required pattern.";
     }
 }

src/Service/FormSubmissionService.php

@@ -51,7 +51,9 @@ public function submit(int $formId, array $data): ?array
 
         if (count($errors) === 0) {
             $submission = $this->submissionRepository->create($formId, $data);
-            $this->eventDispatcher->dispatch(new NewSubmissionEvent($submission), 'submission.new');
+            if ($submission) {
+                $this->eventDispatcher->dispatch(new NewSubmissionEvent($submission), 'submission.new');
+            }
         }
 
         return [

tests/Unit/FieldTypes/Validators/RegExpValidatorTest.php

@@ -10,7 +10,7 @@ class RegExpValidatorTest extends TestCase
     public function testValidRegExp()
     {
         // Example with an email pattern
-        $validator = new RegExpValidator('/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/');
+        $validator = new RegExpValidator('^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$');
 
         $this->assertTrue($validator->validate('test@example.com'));
         $this->assertTrue($validator->validate('user.name+tag@domain.co.uk'));
@@ -19,7 +19,7 @@ public function testValidRegExp()
     public function testInvalidRegExp()
     {
         // Example with an email pattern
-        $validator = new RegExpValidator('/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+\.[a-zA-Z]{2,4}$/');
+        $validator = new RegExpValidator('^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+\.[a-zA-Z]{2,4}$');
 
         $this->assertFalse($validator->validate('plainaddress'));
         $this->assertFalse($validator->validate('@no-local-part.com'));
@@ -29,12 +29,12 @@ public function testInvalidRegExp()
     public function testDifferentPatterns()
     {
         // Example with a numeric pattern
-        $numericValidator = new RegExpValidator('/^\d+$/');
+        $numericValidator = new RegExpValidator('^\d+$');
         $this->assertTrue($numericValidator->validate('12345'));
         $this->assertFalse($numericValidator->validate('abc123'));
 
         // Example with a specific format (e.g., date in YYYY-MM-DD)
-        $dateValidator = new RegExpValidator('/^\d{4}-\d{2}-\d{2}$/');
+        $dateValidator = new RegExpValidator('^\d{4}-\d{2}-\d{2}$');
         $this->assertTrue($dateValidator->validate('2022-01-01'));
         $this->assertFalse($dateValidator->validate('01-01-2022'));
     }

tests/Unit/Service/FormSubmissionServiceTest.php

@@ -8,6 +8,7 @@
 use App\Service\FormFieldTypeService;
 use App\Service\FormSubmissionService;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class FormSubmissionServiceTest extends TestCase 
 {
@@ -322,6 +323,7 @@ public function testUrlFieldTypeValidation()
       $formFieldService,
       new FormFieldTypeService(new FieldTypesFabric()),
       $this->mockSubmissionRepository(),
+      $this->mockEventDispatcher(),
     );
 
     $tests = [
@@ -357,12 +359,21 @@ private function mockSubmissionRepository()
     return $submissionRepository;
   }
 
+  private function mockEventDispatcher()
+  {
+    $mock = $this->createMock(EventDispatcher::class);
+    $mock->method('dispatch')->willReturn((object)[]);
+
+    return $mock;
+  }
+
   private function createSubmissionService(array $formFields): FormSubmissionService
   {
     return new FormSubmissionService(
       $this->mockFormFieldService($formFields),
       new FormFieldTypeService(new FieldTypesFabric()),
       $this->mockSubmissionRepository(),
+      $this->mockEventDispatcher(),
     );
   }
 }