Merge branch 'release/6.0.0'

Author: rhukster

CHANGELOG.md

@@ -1,3 +1,17 @@
+# v6.0.0
+## 03/28/2022
+
+1. [](#improved)
+    * Added log warning when trying to access form by non-unique name
+    * Optimized form caching by not initializing the forms in `onPageProcessed` event anymore
+    * **BACKWARD COMPATIBILITY**: As form initialization has been delayed, logic relaying on `onPageProcessed` with forms may not work anymore
+1. [](#bugfix)
+    * Fixed select field where option is iterable (#558)
+    * Fixed `FormPlugin::getForm()` to properly search the current page first
+    * Fixed `FormPlugin::getForm()` to ignore fallback if the page was given as parameter
+    * Fixed dynamic forms to work with cache turned on
+    * Fix nested `toggleable`: originalValue now checks with `??` instead of `is defined`
+
 # v5.1.7
 ## 03/14/2022
 

README.md

@@ -30,6 +30,8 @@ Note: when using email functionality in your forms, make sure you have configure
 
 # NOTES:
 
+As of version **Form 6.0.0** forms are no longer initialized before caching, but when the form is requested. This has been done to make dynamic forms to work better with caching. There may be some backward compatibility issues for logic that modifies pages with forms as the modification doesn't happen without accessing the form first.
+
 As of version **Form 5.0.0** Grav 1.7+ is required.
 
 As of version **Form 4.0.6**, form labels are now being output with the `|raw` filter.  If you wish to show HTML in your form label, ie `Root Folder <root>`, then you need to escape that in your form definition:

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Form
 slug: form
 type: plugin
-version: 5.1.7
+version: 6.0.0
 description: Enables the forms handling
 icon: check-square
 author:

classes/Form.php

@@ -119,7 +119,7 @@ public function __construct(PageInterface $page, $name = null, $form = null)
             $this->items = $form;
         } else {
             // Otherwise get all forms in the page.
-            $forms = $page->forms();
+            $forms = $page->getForms();
             if ($name) {
                 // If form with given name was found, use that.
                 $this->items = $forms[$name] ?? [];

classes/Forms.php

@@ -113,7 +113,7 @@ public function setActiveForm(FormInterface $form): void
      */
     protected function getPageParameters(PageInterface $page, ?string $name): array
     {
-        $forms = $page->forms();
+        $forms = $page->getForms();
 
         if ($name) {
             // If form with given name was found, use that.