[5.1] Fix Form::renderField() can cause duplicate database queries (#42709)

* FormField collect layout data

Author: Fedik

libraries/src/Form/Field/CalendarField.php

@@ -327,7 +327,7 @@ protected function getInput()
             $this->value = '';
         }
 
-        return $this->getRenderer($this->layout)->render($this->getLayoutData());
+        return $this->getRenderer($this->layout)->render($this->collectLayoutData());
     }
 
     /**

libraries/src/Form/Field/CheckboxesField.php

@@ -110,7 +110,7 @@ protected function getInput()
             throw new \UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
         }
 
-        return $this->getRenderer($this->layout)->render($this->getLayoutData());
+        return $this->getRenderer($this->layout)->render($this->collectLayoutData());
     }
 
     /**

libraries/src/Form/Field/ColorField.php

@@ -232,7 +232,7 @@ protected function getInput()
         }
 
         // Trim the trailing line in the layout file
-        return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+        return rtrim($this->getRenderer($this->layout)->render($this->collectLayoutData()), PHP_EOL);
     }
 
     /**

libraries/src/Form/Field/ComboField.php

@@ -50,7 +50,7 @@ protected function getInput()
             throw new \UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
         }
 
-        return $this->getRenderer($this->layout)->render($this->getLayoutData());
+        return $this->getRenderer($this->layout)->render($this->collectLayoutData());
     }
 
     /**

libraries/src/Form/Field/ContenthistoryField.php

@@ -77,6 +77,6 @@ protected function getInput()
             throw new \UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
         }
 
-        return $this->getRenderer($this->layout)->render($this->getLayoutData());
+        return $this->getRenderer($this->layout)->render($this->collectLayoutData());
     }
 }

libraries/src/Form/Field/EmailField.php

@@ -49,7 +49,7 @@ class EmailField extends TextField
     protected function getInput()
     {
         // Trim the trailing line in the layout file
-        return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+        return rtrim($this->getRenderer($this->layout)->render($this->collectLayoutData()), PHP_EOL);
     }
     /**
      * Method to get the data to be passed to the layout for rendering.

libraries/src/Form/Field/FileField.php

@@ -126,7 +126,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
      */
     protected function getInput()
     {
-        return $this->getRenderer($this->layout)->render($this->getLayoutData());
+        return $this->getRenderer($this->layout)->render($this->collectLayoutData());
     }
 
     /**

libraries/src/Form/Field/GroupedlistField.php

@@ -154,7 +154,7 @@ protected function getGroups()
      */
     protected function getInput()
     {
-        $data = $this->getLayoutData();
+        $data = $this->collectLayoutData();
 
         // Get the field groups.
         $data['groups'] = (array) $this->getGroups();

libraries/src/Form/Field/HiddenField.php

@@ -39,29 +39,4 @@ class HiddenField extends FormField
      * @since  3.7
      */
     protected $layout = 'joomla.form.field.hidden';
-
-    /**
-     * Method to get the field input markup.
-     *
-     * @return  string  The field input markup.
-     *
-     * @since   1.7.0
-     */
-    protected function getInput()
-    {
-        // Trim the trailing line in the layout file
-        return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
-    }
-
-    /**
-     * Method to get the data to be passed to the layout for rendering.
-     *
-     * @return  array
-     *
-     * @since 3.7
-     */
-    protected function getLayoutData()
-    {
-        return parent::getLayoutData();
-    }
 }

libraries/src/Form/Field/ListField.php

@@ -58,7 +58,7 @@ class ListField extends FormField
      */
     protected function getInput()
     {
-        $data = $this->getLayoutData();
+        $data = $this->collectLayoutData();
 
         $data['options'] = (array) $this->getOptions();