From df3782b2a09ec1f397dd599bcd54e55b309dad97 Mon Sep 17 00:00:00 2001
From: Pablo Largo Mohedano <devnix.code@gmail.com>
Date: Fri, 29 Aug 2025 14:06:50 +0200
Subject: [PATCH 1/4] vive-coded

---
 composer.json                             |  3 +-
 src/DynamicFormBuilder.php                | 89 ++++++++++++++++++++---
 tests/FunctionalTest.php                  | 39 ++++++++++
 tests/fixtures/DynamicFormsTestKernel.php | 19 +++++
 tests/fixtures/server.php                 | 18 +++++
 tests/fixtures/templates/form.html.twig   |  2 +-
 6 files changed, 157 insertions(+), 13 deletions(-)
 create mode 100644 tests/fixtures/server.php

diff --git a/composer.json b/composer.json
index c59cfe9..76b19a2 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
         "symfony/twig-bundle": "^5.4|^6.3|^7.0",
         "twig/twig": "^2.15|^3.0",
         "symfony/options-resolver": "^5.4|^6.3|^7.0",
-        "phpunit/phpunit": "^9.6"
+        "phpunit/phpunit": "^9.6",
+        "symfony/panther": "^2.2"
     },
     "minimum-stability": "dev",
     "autoload": {
diff --git a/src/DynamicFormBuilder.php b/src/DynamicFormBuilder.php
index adf2a73..b22369c 100644
--- a/src/DynamicFormBuilder.php
+++ b/src/DynamicFormBuilder.php
@@ -130,24 +130,91 @@ public function clearDataOnTransformationError(FormEvent $event): void
     }
 
     private function executeReadyCallbacks(array $availableDependencyData, string $eventName): void
+    {
+        $hasChanges = true;
+        $maxIterations = 10;
+        $iteration = 0;
+
+        while ($hasChanges && $iteration < $maxIterations) {
+            $hasChanges = false;
+            $iteration++;
+
+            // First pass: handle removals and reset dependent callbacks
+            foreach ($this->dependentFieldConfigs as $dependentFieldConfig) {
+                if ($dependentFieldConfig->isReady($availableDependencyData, $eventName)) {
+                    $dynamicField = $dependentFieldConfig->execute($availableDependencyData, $eventName);
+                    $name = $dependentFieldConfig->name;
+                    $fieldExisted = $this->form->has($name);
+
+                    if (!$dynamicField->shouldBeAdded()) {
+                        if ($fieldExisted) {
+                            $this->form->remove($name);
+                            $hasChanges = true;
+
+                            // Reset callbacks for fields that depend on this removed field
+                            $this->resetDependentCallbacks($name, $eventName);
+                        }
+                        continue;
+                    }
+
+                    if (!$fieldExisted) {
+                        $this->builder->add($name, $dynamicField->getType(), $dynamicField->getOptions());
+                        $this->initializeListeners([$name]);
+                        // auto initialize mimics FormBuilder::getForm() behavior
+                        $field = $this->builder->get($name)->setAutoInitialize(false)->getForm();
+                        $this->form->add($field);
+                        $hasChanges = true;
+                    }
+                }
+            }
+
+            // If we had changes, we need to re-evaluate all dependencies that might now be invalid
+            if ($hasChanges) {
+                $this->validateAndRemoveOrphanedFields($eventName);
+            }
+        }
+    }
+
+    /**
+     * Remove fields that should no longer exist because their dependencies are missing
+     */
+    private function validateAndRemoveOrphanedFields(string $eventName): void
     {
         foreach ($this->dependentFieldConfigs as $dependentFieldConfig) {
-            if ($dependentFieldConfig->isReady($availableDependencyData, $eventName)) {
-                $dynamicField = $dependentFieldConfig->execute($availableDependencyData, $eventName);
-                $name = $dependentFieldConfig->name;
+            $name = $dependentFieldConfig->name;
+
+            // If the field exists in the form, check if it should still exist
+            if ($this->form->has($name)) {
+                $hasAllDependencies = true;
+
+                foreach ($dependentFieldConfig->dependencies as $dependency) {
+                    // Check if the dependency field exists and has appropriate data
+                    if (!$this->form->has($dependency)) {
+                        $hasAllDependencies = false;
+                        break;
+                    }
+                }
 
-                if (!$dynamicField->shouldBeAdded()) {
+                // If dependencies are missing, remove the field and reset its callback
+                if (!$hasAllDependencies) {
                     $this->form->remove($name);
+                    $dependentFieldConfig->callbackExecuted[$eventName] = false;
 
-                    continue;
+                    // Reset callbacks for fields that depend on this removed field
+                    $this->resetDependentCallbacks($name, $eventName);
                 }
+            }
+        }
+    }
 
-                $this->builder->add($name, $dynamicField->getType(), $dynamicField->getOptions());
-
-                $this->initializeListeners([$name]);
-                // auto initialize mimics FormBuilder::getForm() behavior
-                $field = $this->builder->get($name)->setAutoInitialize(false)->getForm();
-                $this->form->add($field);
+    /**
+     * Reset callback execution status for fields that depend on a removed field
+     */
+    private function resetDependentCallbacks(string $removedFieldName, string $eventName): void
+    {
+        foreach ($this->dependentFieldConfigs as $dependentFieldConfig) {
+            if (in_array($removedFieldName, $dependentFieldConfig->dependencies)) {
+                $dependentFieldConfig->callbackExecuted[$eventName] = false;
             }
         }
     }
diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php
index 6f065ee..ed8f3ba 100644
--- a/tests/FunctionalTest.php
+++ b/tests/FunctionalTest.php
@@ -82,6 +82,45 @@ public function testDynamicFields()
         ;
     }
 
+    public function testRecursiveDynamicFields()
+    {
+        $browser = $this->pantherBrowser();
+        $browser->visit('/form-pizza-selected')
+            // check for the hidden field
+            ->assertSeeElement('#test_dynamic_form___dynamic_error')
+            ->assertSee('Is Form Valid: no')
+            ->assertSee('Pizza 🍕')
+            ->assertNotContains('<option value="bacon">')
+            ->assertContains('<option value="pizza" selected="selected">')
+            ->assertContains('What size pizza?')
+        ;
+
+        // now change the meal to breakfast
+        $browser->selectFieldOption('Meal', 'Breakfast')
+            ->click('Submit Form')
+            // form is not valid: the mainFood submitted an invalid value
+            ->assertSee('Is Form Valid: no')
+            ->assertContains('<option value="bacon">')
+            ->dump('form')
+            ->assertNotContains('<option value="pizza"')
+            ->assertNotContains('What size pizza?')
+        ;
+
+        // select a valid food for breakfast
+        $browser->selectFieldOption('Main food', 'Bacon')
+            ->click('Submit Form')
+            // form is valid again
+            ->assertSee('Is Form Valid: yes')
+        ;
+
+        // change the meal again
+        $browser->selectFieldOption('Meal', 'Lunch')
+            ->click('Submit Form')
+            // form is not valid: the mainFood=bacon is invalid for lunch
+            ->assertSee('Is Form Valid: no')
+        ;
+    }
+
     protected static function getKernelClass(): string
     {
         return DynamicFormsTestKernel::class;
diff --git a/tests/fixtures/DynamicFormsTestKernel.php b/tests/fixtures/DynamicFormsTestKernel.php
index b9f5a87..975fca4 100644
--- a/tests/fixtures/DynamicFormsTestKernel.php
+++ b/tests/fixtures/DynamicFormsTestKernel.php
@@ -20,6 +20,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+use Symfonycasts\DynamicForms\Tests\fixtures\Enum\DynamicTestFood;
 use Symfonycasts\DynamicForms\Tests\fixtures\Enum\DynamicTestMeal;
 use Twig\Environment;
 
@@ -40,6 +41,23 @@ public function form(Environment $twig, FormFactoryInterface $formFactory, Reque
         ]));
     }
 
+    /**
+     * Verify that recursive dependencies are checked
+     */
+    public function formPizzaSelected(Environment $twig, FormFactoryInterface $formFactory, Request $request): Response
+    {
+        $form = $formFactory->create(TestDynamicForm::class, [
+            'meal' => DynamicTestMeal::Dinner,
+            'mainFood' => DynamicTestFood::Pizza,
+        ]);
+        $form->handleRequest($request);
+
+        return new Response($twig->render('form.html.twig', [
+            'form' => $form->createView(),
+            'isFormValid' => $form->isSubmitted() && $form->isValid(),
+        ]));
+    }
+
     public function registerBundles(): iterable
     {
         return [
@@ -78,5 +96,6 @@ protected function build(ContainerBuilder $container): void
     protected function configureRoutes(RoutingConfigurator $routes): void
     {
         $routes->add('form', '/form')->controller('kernel::form');
+        $routes->add('form-pizza-selected', '/form-pizza-selected')->controller('kernel::formPizzaSelected');
     }
 }
diff --git a/tests/fixtures/server.php b/tests/fixtures/server.php
new file mode 100644
index 0000000..4e29462
--- /dev/null
+++ b/tests/fixtures/server.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfonycasts\DynamicForms\Tests\fixtures\DynamicFormsTestKernel;
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$kernel = new DynamicFormsTestKernel('test', true);
+$kernel->boot();
+
+$request = Request::createFromGlobals();
+
+$response = $kernel->handle($request);
+$response->send();
+
+$kernel->terminate($request, $response);
diff --git a/tests/fixtures/templates/form.html.twig b/tests/fixtures/templates/form.html.twig
index e47f38c..73497a4 100644
--- a/tests/fixtures/templates/form.html.twig
+++ b/tests/fixtures/templates/form.html.twig
@@ -1,6 +1,6 @@
 Is Form Valid: {{ isFormValid ? 'yes' : 'no' }}
 
-{{ form_start(form) }}
+{{ form_start(form, {attr: {'novalidate': ''}}) }}
     {{ form_widget(form) }}
 
     <button type="submit">Submit Form</button>

From aab1721945a8d711365a4d2ddc451e67653c5cbb Mon Sep 17 00:00:00 2001
From: Pablo Largo Mohedano <devnix.code@gmail.com>
Date: Fri, 29 Aug 2025 14:40:03 +0200
Subject: [PATCH 2/4] fixed replacement of exisiting fields

---
 src/DynamicFormBuilder.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/DynamicFormBuilder.php b/src/DynamicFormBuilder.php
index b22369c..09f3577 100644
--- a/src/DynamicFormBuilder.php
+++ b/src/DynamicFormBuilder.php
@@ -157,12 +157,22 @@ private function executeReadyCallbacks(array $availableDependencyData, string $e
                         continue;
                     }
 
+                    // Field should be added - handle both new and existing fields
+                    if ($fieldExisted) {
+                        // Field exists but may need to be updated with new options
+                        // Remove and re-add to ensure proper configuration
+                        $this->form->remove($name);
+                        $hasChanges = true;
+                    }
+
+                    // Add/re-add the field with current configuration
+                    $this->builder->add($name, $dynamicField->getType(), $dynamicField->getOptions());
+                    $this->initializeListeners([$name]);
+                    // auto initialize mimics FormBuilder::getForm() behavior
+                    $field = $this->builder->get($name)->setAutoInitialize(false)->getForm();
+                    $this->form->add($field);
+
                     if (!$fieldExisted) {
-                        $this->builder->add($name, $dynamicField->getType(), $dynamicField->getOptions());
-                        $this->initializeListeners([$name]);
-                        // auto initialize mimics FormBuilder::getForm() behavior
-                        $field = $this->builder->get($name)->setAutoInitialize(false)->getForm();
-                        $this->form->add($field);
                         $hasChanges = true;
                     }
                 }

From d9db2008017b6211b1a4ee021d8b549c2065d3ef Mon Sep 17 00:00:00 2001
From: Pablo Largo Mohedano <devnix.code@gmail.com>
Date: Fri, 29 Aug 2025 18:02:56 +0200
Subject: [PATCH 3/4] Add Panther to support e2e tests for live
 components/turbo

---
 composer.json                                 |  3 +-
 phpunit.xml.dist                              | 10 +++
 tests/E2ETest.php                             | 62 +++++++++++++++++++
 tests/FunctionalTest.php                      | 39 ------------
 .../fixtures/{server.php => public/index.php} |  4 +-
 5 files changed, 76 insertions(+), 42 deletions(-)
 create mode 100644 tests/E2ETest.php
 rename tests/fixtures/{server.php => public/index.php} (71%)

diff --git a/composer.json b/composer.json
index 76b19a2..f379ff7 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
         "twig/twig": "^2.15|^3.0",
         "symfony/options-resolver": "^5.4|^6.3|^7.0",
         "phpunit/phpunit": "^9.6",
-        "symfony/panther": "^2.2"
+        "symfony/panther": "^2.2",
+        "dbrekelmans/bdi": "dev-main"
     },
     "minimum-stability": "dev",
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 576b574..277c968 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -17,6 +17,12 @@
         <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
         <server name="SYMFONY_PHPUNIT_VERSION" value="9.6" />
         <server name="SYMFONY_DEPRECATIONS_HELPER" value="max[indirect]=11" />
+        <server name="PANTHER_APP_ENV" value="1" force="true" />
+        <server name="PANTHER_WEB_SERVER_DIR" value="./tests/fixtures/public" force="true" />
+        <server name="BROWSER_SOURCE_DIR" value="./tests/fixtures/var/browser/source" force="true" />
+        <server name="BROWSER_SCREENSHOT_DIR" value="./tests/fixtures/var/browser/screenshots" force="true" />
+        <server name="BROWSER_CONSOLE_LOG_DIR" value="./tests/fixtures/var/browser/console-logs" force="true" />
+        <server name="PANTHER_NO_HEADLESS" value="1" force="true" />
     </php>
 
     <testsuites>
@@ -34,4 +40,8 @@
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
     </listeners>
+
+    <extensions>
+        <extension class="Zenstruck\Browser\Test\BrowserExtension" />
+    </extensions>
 </phpunit>
diff --git a/tests/E2ETest.php b/tests/E2ETest.php
new file mode 100644
index 0000000..028551d
--- /dev/null
+++ b/tests/E2ETest.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the SymfonyCasts DynamicForms package.
+ * Copyright (c) SymfonyCasts <https://symfonycasts.com/>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfonycasts\DynamicForms\Tests;
+
+use Symfony\Component\Panther\PantherTestCase;
+use Symfonycasts\DynamicForms\Tests\fixtures\DynamicFormsTestKernel;
+use Zenstruck\Browser\Test\HasBrowser;
+
+class E2ETest extends PantherTestCase
+{
+    use HasBrowser;
+
+    public function testRecursiveDynamicFields()
+    {
+        $browser = $this->pantherBrowser();
+        $browser->visit('/form-pizza-selected')
+            // check for the hidden field
+            ->waitUntilSeeIn('//html', 'Is Form Valid: no')
+            ->assertSeeElement('#test_dynamic_form___dynamic_error')
+            ->assertSee('Pizza 🍕')
+            ->assertNotContains('<option value="bacon">')
+            ->assertContains('<option value="pizza" selected="selected">')
+            ->assertContains('What size pizza?')
+        ;
+
+        // now change the meal to breakfast
+        $browser->selectFieldOption('Meal', 'Breakfast')
+            ->click('Submit Form')
+            // form is not valid: the mainFood submitted an invalid value
+            ->waitUntilSeeIn('//html', 'Is Form Valid: no')
+            ->assertContains('<option value="bacon">')
+            ->assertNotContains('<option value="pizza"')
+            ->assertNotContains('What size pizza?')
+        ;
+
+        // select a valid food for breakfast
+        $browser->selectFieldOption('Main food', 'Bacon')
+            ->click('Submit Form')
+            // form is valid again
+            ->waitUntilSeeIn('//html', 'Is Form Valid: yes')
+        ;
+
+        // change the meal again
+        $browser->selectFieldOption('Meal', 'Lunch')
+            ->click('Submit Form')
+            // form is not valid: the mainFood=bacon is invalid for lunch
+            ->waitUntilSeeIn('//html', 'Is Form Valid: no')
+        ;
+    }
+
+    protected static function getKernelClass(): string
+    {
+        return DynamicFormsTestKernel::class;
+    }
+}
diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php
index ed8f3ba..6f065ee 100644
--- a/tests/FunctionalTest.php
+++ b/tests/FunctionalTest.php
@@ -82,45 +82,6 @@ public function testDynamicFields()
         ;
     }
 
-    public function testRecursiveDynamicFields()
-    {
-        $browser = $this->pantherBrowser();
-        $browser->visit('/form-pizza-selected')
-            // check for the hidden field
-            ->assertSeeElement('#test_dynamic_form___dynamic_error')
-            ->assertSee('Is Form Valid: no')
-            ->assertSee('Pizza 🍕')
-            ->assertNotContains('<option value="bacon">')
-            ->assertContains('<option value="pizza" selected="selected">')
-            ->assertContains('What size pizza?')
-        ;
-
-        // now change the meal to breakfast
-        $browser->selectFieldOption('Meal', 'Breakfast')
-            ->click('Submit Form')
-            // form is not valid: the mainFood submitted an invalid value
-            ->assertSee('Is Form Valid: no')
-            ->assertContains('<option value="bacon">')
-            ->dump('form')
-            ->assertNotContains('<option value="pizza"')
-            ->assertNotContains('What size pizza?')
-        ;
-
-        // select a valid food for breakfast
-        $browser->selectFieldOption('Main food', 'Bacon')
-            ->click('Submit Form')
-            // form is valid again
-            ->assertSee('Is Form Valid: yes')
-        ;
-
-        // change the meal again
-        $browser->selectFieldOption('Meal', 'Lunch')
-            ->click('Submit Form')
-            // form is not valid: the mainFood=bacon is invalid for lunch
-            ->assertSee('Is Form Valid: no')
-        ;
-    }
-
     protected static function getKernelClass(): string
     {
         return DynamicFormsTestKernel::class;
diff --git a/tests/fixtures/server.php b/tests/fixtures/public/index.php
similarity index 71%
rename from tests/fixtures/server.php
rename to tests/fixtures/public/index.php
index 4e29462..5bd60c8 100644
--- a/tests/fixtures/server.php
+++ b/tests/fixtures/public/index.php
@@ -5,9 +5,9 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfonycasts\DynamicForms\Tests\fixtures\DynamicFormsTestKernel;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require dirname(__DIR__, 3).'/vendor/autoload.php';
 
-$kernel = new DynamicFormsTestKernel('test', true);
+$kernel = new DynamicFormsTestKernel($_SERVER['APP_ENV'] ?? 'dev', true);
 $kernel->boot();
 
 $request = Request::createFromGlobals();

From 8afd13d743e5efad0e160c47185f899907732dac Mon Sep 17 00:00:00 2001
From: Pablo Largo Mohedano <devnix.code@gmail.com>
Date: Fri, 29 Aug 2025 18:06:23 +0200
Subject: [PATCH 4/4] Add Panther to support e2e tests for live
 components/turbo

---
 .php-cs-fixer.dist.php                    | 1 +
 src/DynamicFormBuilder.php                | 8 ++++----
 tests/fixtures/DynamicFormsTestKernel.php | 2 +-
 tests/fixtures/public/index.php           | 7 +++++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 7379d28..b529b95 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -6,6 +6,7 @@
 
 $finder = (new \PhpCsFixer\Finder())
     ->in([__DIR__.'/src', __DIR__.'/tests'])
+    ->exclude('tests/fixtures/var')
 ;
 
 return (new \PhpCsFixer\Config())
diff --git a/src/DynamicFormBuilder.php b/src/DynamicFormBuilder.php
index 09f3577..c99bd9d 100644
--- a/src/DynamicFormBuilder.php
+++ b/src/DynamicFormBuilder.php
@@ -137,7 +137,7 @@ private function executeReadyCallbacks(array $availableDependencyData, string $e
 
         while ($hasChanges && $iteration < $maxIterations) {
             $hasChanges = false;
-            $iteration++;
+            ++$iteration;
 
             // First pass: handle removals and reset dependent callbacks
             foreach ($this->dependentFieldConfigs as $dependentFieldConfig) {
@@ -186,7 +186,7 @@ private function executeReadyCallbacks(array $availableDependencyData, string $e
     }
 
     /**
-     * Remove fields that should no longer exist because their dependencies are missing
+     * Remove fields that should no longer exist because their dependencies are missing.
      */
     private function validateAndRemoveOrphanedFields(string $eventName): void
     {
@@ -218,12 +218,12 @@ private function validateAndRemoveOrphanedFields(string $eventName): void
     }
 
     /**
-     * Reset callback execution status for fields that depend on a removed field
+     * Reset callback execution status for fields that depend on a removed field.
      */
     private function resetDependentCallbacks(string $removedFieldName, string $eventName): void
     {
         foreach ($this->dependentFieldConfigs as $dependentFieldConfig) {
-            if (in_array($removedFieldName, $dependentFieldConfig->dependencies)) {
+            if (\in_array($removedFieldName, $dependentFieldConfig->dependencies)) {
                 $dependentFieldConfig->callbackExecuted[$eventName] = false;
             }
         }
diff --git a/tests/fixtures/DynamicFormsTestKernel.php b/tests/fixtures/DynamicFormsTestKernel.php
index 975fca4..bca66a2 100644
--- a/tests/fixtures/DynamicFormsTestKernel.php
+++ b/tests/fixtures/DynamicFormsTestKernel.php
@@ -42,7 +42,7 @@ public function form(Environment $twig, FormFactoryInterface $formFactory, Reque
     }
 
     /**
-     * Verify that recursive dependencies are checked
+     * Verify that recursive dependencies are checked.
      */
     public function formPizzaSelected(Environment $twig, FormFactoryInterface $formFactory, Request $request): Response
     {
diff --git a/tests/fixtures/public/index.php b/tests/fixtures/public/index.php
index 5bd60c8..f4d6e2a 100644
--- a/tests/fixtures/public/index.php
+++ b/tests/fixtures/public/index.php
@@ -2,6 +2,13 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of the SymfonyCasts DynamicForms package.
+ * Copyright (c) SymfonyCasts <https://symfonycasts.com/>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Symfony\Component\HttpFoundation\Request;
 use Symfonycasts\DynamicForms\Tests\fixtures\DynamicFormsTestKernel;