fix(queue): Better condition for adding parent forms to queue

Tests/Unit/FactoryTestTrait.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Fp\JsFormValidatorBundle\Tests\Unit;
+
+use Fp\JsFormValidatorBundle\Factory\JsFormValidatorFactory;
+use Fp\JsFormValidatorBundle\Form\Extension\FormExtension;
+use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
+use Symfony\Component\Form\Forms;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Validator\Validation;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+trait FactoryTestTrait
+{
+    private function createFactory(
+        ?ValidatorInterface $validator = null,
+        ?UrlGeneratorInterface $router = null,
+        array $config = array('js_validation' => true)
+    ): JsFormValidatorFactory {
+        if (!$router) {
+            $router = $this->createStub(UrlGeneratorInterface::class);
+            $router
+                ->method('generate')
+                ->willReturn('/generated-route')
+            ;
+        }
+
+        return new JsFormValidatorFactory(
+            $validator ?: Validation::createValidator(),
+            new IdentityTranslator(),
+            $router,
+            $config,
+            'validators'
+        );
+    }
+
+    private function createFormFactory(JsFormValidatorFactory $factory, ?ValidatorInterface $validator = null)
+    {
+        $validator = $validator ?: Validation::createValidator();
+
+        return Forms::createFormFactoryBuilder()
+            ->addExtension(new ValidatorExtension($validator))
+            ->addTypeExtension(new FormExtension($factory))
+            ->getFormFactory()
+        ;
+    }
+}
+
+class IdentityTranslator implements TranslatorInterface
+{
+    public function trans(string $id, array $parameters = array(), ?string $domain = null, ?string $locale = null): string
+    {
+        return strtr($id, $parameters);
+    }
+
+    public function getLocale(): string
+    {
+        return 'en';
+    }
+}

Tests/Unit/JsFormValidatorFactoryTest.php

@@ -2,50 +2,33 @@
 
 namespace Fp\JsFormValidatorBundle\Tests\Unit;
 
-use Fp\JsFormValidatorBundle\Factory\JsFormValidatorFactory;
-use Fp\JsFormValidatorBundle\Form\Extension\FormExtension;
 use Fp\JsFormValidatorBundle\Form\Constraint\UniqueEntity as JsUniqueEntity;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity as SymfonyUniqueEntity;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
-use Symfony\Component\Form\Forms;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\Validation;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class JsFormValidatorFactoryTest extends TestCase
 {
+    use FactoryTestTrait;
     public function testCreatesModelFromModernSymfonyForm()
     {
-        $validator = Validation::createValidator();
         $router = $this->createMock(UrlGeneratorInterface::class);
         $router
             ->method('generate')
             ->with('fp_js_form_validator.check_unique_entity')
             ->willReturn('/fp_js_form_validator/check_unique_entity')
         ;
 
-        $factory = new JsFormValidatorFactory(
-            $validator,
-            new IdentityTranslator(),
-            $router,
-            array(
-                'js_validation' => true,
-                'routing' => array(
-                    'check_unique_entity' => 'fp_js_form_validator.check_unique_entity',
-                ),
+        $factory = $this->createFactory(null, $router, array(
+            'js_validation' => true,
+            'routing' => array(
+                'check_unique_entity' => 'fp_js_form_validator.check_unique_entity',
             ),
-            'validators'
-        );
-
-        $formFactory = Forms::createFormFactoryBuilder()
-            ->addExtension(new ValidatorExtension($validator))
-            ->addTypeExtension(new FormExtension($factory))
-            ->getFormFactory()
-        ;
+        ));
+        $formFactory = $this->createFormFactory($factory);
 
         $form = $formFactory
             ->createBuilder(FormType::class, null, array('validation_groups' => array('Default')))
@@ -68,21 +51,8 @@ public function testCreatesModelFromModernSymfonyForm()
 
     public function testUniqueEntityConstraintIncludesBoundEntityId()
     {
-        $validator = Validation::createValidator();
-        $router = $this->createMock(UrlGeneratorInterface::class);
-        $factory = new JsFormValidatorFactory(
-            $validator,
-            new IdentityTranslator(),
-            $router,
-            array('js_validation' => true),
-            'validators'
-        );
-
-        $formFactory = Forms::createFormFactoryBuilder()
-            ->addExtension(new ValidatorExtension($validator))
-            ->addTypeExtension(new FormExtension($factory))
-            ->getFormFactory()
-        ;
+        $factory = $this->createFactory();
+        $formFactory = $this->createFormFactory($factory);
 
         $form = $formFactory
             ->createBuilder(
@@ -106,23 +76,6 @@ public function testUniqueEntityConstraintIncludesBoundEntityId()
     }
 }
 
-class IdentityTranslator implements TranslatorInterface
-{
-    public function trans(
-        string $id,
-        array $parameters = array(),
-        ?string $domain = null,
-        ?string $locale = null
-    ): string {
-        return strtr($id, $parameters);
-    }
-
-    public function getLocale(): string
-    {
-        return 'en';
-    }
-}
-
 class UniqueEntityUser
 {
     public $email;

Tests/Unit/SubscriberToQueueTest.php

@@ -0,0 +1,102 @@
+<?php
+
+namespace Fp\JsFormValidatorBundle\Tests\Unit;
+
+use Fp\JsFormValidatorBundle\Factory\JsFormValidatorFactory;
+use Fp\JsFormValidatorBundle\Form\Subscriber\SubscriberToQueue;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class SubscriberToQueueTest extends TestCase
+{
+    use FactoryTestTrait;
+    public function testAddToQueueWhenGlobalDisabledButLocalExplicitlyEnabled()
+    {
+        $factory = $this->createFactory(null, null, array('js_validation' => false));
+        $formFactory = $this->createFormFactory($factory);
+        $subscriber = new SubscriberToQueue($factory);
+
+        $form = $formFactory
+            ->createNamedBuilder('test_form', FormType::class, null, array('js_validation' => true))
+            ->getForm()
+        ;
+
+        $subscriber->onFormSetData(new FormEvent($form, null));
+
+        $this->assertTrue($factory->inQueue($form));
+    }
+
+    public function testDoesNotAddToQueueWhenGlobalDisabledAndLocalNotSet()
+    {
+        $factory = $this->createFactory(null, null, array('js_validation' => false));
+        $formFactory = $this->createFormFactory($factory);
+        $subscriber = new SubscriberToQueue($factory);
+
+        // Form with no explicit js_validation option (defaults to null)
+        $form = $formFactory
+            ->createNamedBuilder('test_form', FormType::class)
+            ->getForm()
+        ;
+
+        $subscriber->onFormSetData(new FormEvent($form, null));
+
+        $this->assertFalse($factory->inQueue($form));
+    }
+
+    public function testAddToQueueWhenGlobalEnabledAndLocalNotSet()
+    {
+        $factory = $this->createFactory(null, null, array('js_validation' => true));
+        $formFactory = $this->createFormFactory($factory);
+        $subscriber = new SubscriberToQueue($factory);
+
+        // Form with no explicit js_validation option (defaults to null, inherits global)
+        $form = $formFactory
+            ->createNamedBuilder('test_form', FormType::class)
+            ->getForm()
+        ;
+
+        $subscriber->onFormSetData(new FormEvent($form, null));
+
+        $this->assertTrue($factory->inQueue($form));
+    }
+
+    public function testDoesNotAddToQueueWhenLocalExplicitlyDisabled()
+    {
+        $factory = $this->createFactory(null, null, array('js_validation' => true));
+        $formFactory = $this->createFormFactory($factory);
+        $subscriber = new SubscriberToQueue($factory);
+
+        $form = $formFactory
+            ->createNamedBuilder('test_form', FormType::class, null, array('js_validation' => false))
+            ->getForm()
+        ;
+
+        $subscriber->onFormSetData(new FormEvent($form, null));
+
+        $this->assertFalse($factory->inQueue($form));
+    }
+
+    public function testChildFieldOptInAddsEntireFormToQueue()
+    {
+        // Global disabled, but a child field explicitly opts in
+        $factory = $this->createFactory(null, null, array('js_validation' => false));
+        $formFactory = $this->createFormFactory($factory);
+        $subscriber = new SubscriberToQueue($factory);
+
+        $form = $formFactory
+            ->createNamedBuilder('test_form', FormType::class)
+            ->add('email', FormType::class, array('js_validation' => true))
+            ->getForm()
+        ;
+
+        // Trigger subscriber on the child field that opts in
+        $child = $form->get('email');
+        $subscriber->onFormSetData(new FormEvent($child, null));
+
+        // The entire parent form should be in the queue
+        $this->assertTrue($factory->inQueue($form));
+        $this->assertArrayHasKey('test_form', $factory->getQueue());
+    }
+}

src/Factory/JsFormValidatorFactory.php

@@ -235,7 +235,8 @@ public function createJsModel(FormInterface $form)
         $this->currentElement = $form;
 
         $conf = $form->getConfig();
-        // If field is disabled or has no any validations
+        // If field is explicitly disabled, skip it
+        // null means "inherit" which is treated as enabled (same as true)
         if (false === $conf->getOption('js_validation')) {
             return null;
         }

src/Form/Extension/FormExtension.php

@@ -42,7 +42,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
      */
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(array('js_validation' => true));
+        $resolver->setDefaults(array('js_validation' => null));
     }
 
     /**

src/Form/Subscriber/SubscriberToQueue.php

@@ -44,11 +44,14 @@ public function onFormSetData(FormEvent $event): void
         $globalSwitch = $this->factory->getConfig('js_validation');
         $localSwitch  = $form->getConfig()->getOption('js_validation');
 
-        // Add only parent forms which are not disabled
-        if ($globalSwitch && $localSwitch) {
+        // If local option is null (not explicitly set), inherit from global
+        $enabled = null === $localSwitch ? $globalSwitch : $localSwitch;
+
+        // Add only parent forms which are enabled
+        if ($enabled) {
             $parent = $this->getParent($form);
             if (!$this->factory->inQueue($parent)) {
-                $this->factory->addToQueue($this->getParent($form));
+                $this->factory->addToQueue($parent);
             }
         }
     }

src/Resources/doc/2_1.md

@@ -1,9 +1,12 @@
-### 2.1 Disabling validation
+### 2.1 Enabling and Disabling validation
 
-You can disable JavaScript validation in three ways.
+JavaScript validation is **enabled by default** for all forms.
+The `js_validation` option can be set at three levels:
 
 #### Globally
 
+Disable validation for all forms:
+
 ```yaml
 # config/packages/fp_js_form_validator.yaml
 fp_js_form_validator:
@@ -12,6 +15,8 @@ fp_js_form_validator:
 
 #### For a form type
 
+Override the global setting for a specific form type:
+
 ```php
 <?php
 
@@ -25,12 +30,20 @@ class UserType extends AbstractType
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'js_validation' => false,
+            'js_validation' => false, // Disable for this form only
         ]);
     }
 }
 ```
 
+When the form option is not explicitly set (i.e., it is `null`), the form
+inherits the global configuration value. This allows you to:
+
+- Disable validation globally (`js_validation: false`) and then enable it
+  **only for selected forms** by setting `'js_validation' => true` on those forms.
+- Enable validation globally (the default) and disable it for specific forms
+  by setting `'js_validation' => false` on those forms.
+
 #### For a field
 
 See [disable validation for a specified field](3_1.md).