Merge branch '5.1-dev' into loader

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();
 

libraries/src/Form/Field/MediaField.php

@@ -254,7 +254,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/MeterField.php

@@ -198,7 +198,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     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/ModalSelectField.php

@@ -213,7 +213,7 @@ protected function getInput()
         }
 
         // Get the layout data
-        $data = $this->getLayoutData();
+        $data = $this->collectLayoutData();
 
         // Load the content title here to avoid a double DB Query
         $data['valueTitle'] = $this->getValueTitle();

libraries/src/Form/Field/ModuleorderField.php

@@ -121,7 +121,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/NumberField.php

@@ -189,7 +189,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/PasswordField.php

@@ -243,7 +243,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     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/RadiobasicField.php

@@ -46,7 +46,7 @@ class RadiobasicField extends ListField
      */
     protected function getInput()
     {
-        return $this->getRenderer($this->layout)->render($this->getLayoutData());
+        return $this->getRenderer($this->layout)->render($this->collectLayoutData());
     }
 
     /**

libraries/src/Form/Field/RangeField.php

@@ -47,7 +47,7 @@ class RangeField extends NumberField
      */
     protected function getInput()
     {
-        return $this->getRenderer($this->layout)->render($this->getLayoutData());
+        return $this->getRenderer($this->layout)->render($this->collectLayoutData());
     }
 
     /**

libraries/src/Form/Field/RulesField.php

@@ -294,7 +294,7 @@ protected function getInput()
         $this->groups = $this->getUserGroups();
 
         // Trim the trailing line in the layout file
-        return trim($this->getRenderer($this->layout)->render($this->getLayoutData()));
+        return trim($this->getRenderer($this->layout)->render($this->collectLayoutData()));
     }
 
     /**

libraries/src/Form/Field/SubformField.php

@@ -229,7 +229,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     protected function getInput()
     {
         // Prepare data for renderer
-        $data    = $this->getLayoutData();
+        $data    = $this->collectLayoutData();
         $tmpl    = null;
         $control = $this->name;
 

libraries/src/Form/Field/TagField.php

@@ -81,7 +81,7 @@ public function __construct()
      */
     protected function getInput()
     {
-        $data = $this->getLayoutData();
+        $data = $this->collectLayoutData();
 
         if (!\is_array($this->value) && !empty($this->value)) {
             if ($this->value instanceof TagsHelper) {

libraries/src/Form/Field/TelephoneField.php

@@ -50,7 +50,7 @@ class TelephoneField 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);
     }
 
     /**

libraries/src/Form/Field/TextField.php

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

libraries/src/Form/Field/TextareaField.php

@@ -161,7 +161,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     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/TimeField.php

@@ -145,7 +145,7 @@ public function __get($name)
      */
     protected function getInput()
     {
-        return $this->getRenderer($this->layout)->render($this->getLayoutData());
+        return $this->getRenderer($this->layout)->render($this->collectLayoutData());
     }
 
     /**

libraries/src/Form/Field/UrlField.php

@@ -49,7 +49,7 @@ class UrlField 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);
     }
 
     /**

libraries/src/Form/Field/UserField.php

@@ -98,7 +98,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/FormField.php

@@ -376,6 +376,14 @@ abstract class FormField implements DatabaseAwareInterface, CurrentUserInterface
      */
     protected $layout;
 
+    /**
+     * Cached data for layout rendering
+     *
+     * @var    array
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $layoutData = [];
+
     /**
      * Layout to render the form field
      *
@@ -768,7 +776,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());
     }
 
     /**
@@ -806,7 +814,7 @@ protected function getLabel()
             return '';
         }
 
-        $data = $this->getLayoutData();
+        $data = $this->collectLayoutData();
 
         // Forcing the Alias field to display the tip below
         $position = ((string) $this->element['name']) === 'alias' ? ' data-bs-placement="bottom" ' : '';
@@ -976,7 +984,7 @@ public function renderDataAttributes()
      */
     public function render($layoutId, $data = [])
     {
-        $data = array_merge($this->getLayoutData(), $data);
+        $data = array_merge($this->collectLayoutData(), $data);
 
         return $this->getRenderer($layoutId)->render($data);
     }
@@ -1047,7 +1055,7 @@ public function renderField($options = [])
             'options' => $options,
         ];
 
-        $data = array_merge($this->getLayoutData(), $data);
+        $data = array_merge($this->collectLayoutData(), $data);
 
         return $this->getRenderer($this->renderLayout)->render($data);
     }
@@ -1331,6 +1339,25 @@ protected function getLayoutData()
         return $options;
     }
 
+    /**
+     * Method to get the data to be passed to the layout for rendering.
+     * The data is cached in memory.
+     *
+     * @return  array
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    protected function collectLayoutData(): array
+    {
+        if ($this->layoutData) {
+            return $this->layoutData;
+        }
+
+        $this->layoutData = $this->getLayoutData();
+
+        return $this->layoutData;
+    }
+
     /**
      * Allow to override renderer include paths in child fields
      *

libraries/src/TUF/DatabaseStorage.php

@@ -15,7 +15,7 @@
 use Tuf\Metadata\StorageBase;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects;
 
 /**

libraries/src/TUF/TufFetcher.php

@@ -24,7 +24,7 @@
 use Tuf\Loader\SizeCheckingLoader;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**

modules/mod_breadcrumbs/tmpl/default.php

@@ -118,7 +118,12 @@
         /** @var WebAssetManager $wa */
         $wa = $app->getDocument()->getWebAssetManager();
         $prettyPrint = JDEBUG ? JSON_PRETTY_PRINT : 0;
-        $wa->addInline('script', json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint), [], ['type' => 'application/ld+json']);
+        $wa->addInline(
+            'script',
+            json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint),
+            ['name' => 'inline.mod_breadcrumbs-schemaorg'],
+            ['type' => 'application/ld+json']
+        );
     }
     ?>
 </nav>