Backport

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.2', '8.3', '8.4']
+        php: ['8.2', '8.3', '8.4', '8.5']
 
     steps:
       - uses: actions/checkout@v4

Documentation/Changelog/2.x.rst

@@ -6,6 +6,9 @@
 Changelog 2.x
 =============
 
+This Changelog lists notable deprecation and breaking changes. The full list of changes is available
+`in the Fluid releases on GitHub <https://github.com/TYPO3/Fluid/releases>`_.
+
 2.15
 ----
 

Documentation/Changelog/4.x.rst

@@ -6,6 +6,38 @@
 Changelog 4.x
 =============
 
+This Changelog lists notable deprecation and breaking changes. The full list of changes is available
+`in the Fluid releases on GitHub <https://github.com/TYPO3/Fluid/releases>`_.
+
+4.5
+---
+
+* Deprecation: Using the `xmlns` namespace syntax with a PHP namespace instead of an url is deprecated
+  and will no longer work in Fluid v5.
+* Deprecation: Method :php:`TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper::validateArguments()`
+  has been marked as deprecated and will be removed in Fluid v5.
+* Deprecation: Custom implementations of the `validateArguments()` methods in ViewHelpers will no longer
+  be called in Fluid v5. Use :php:`TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperArgumentsValidatedEventInterface`
+  instead.
+* Deprecation: Classes, interfaces, methods and constants related to cache warmup are deprecated and will be removed in Fluid v5:
+    * :php:`TYPO3Fluid\Fluid\Core\Cache\FluidCacheInterface::getCacheWarmer()`
+    * :php: `TYPO3Fluid\Fluid\Core\Cache\SimpleFileCache::getCacheWarmer()`
+    * :php:`TYPO3Fluid\Fluid\Core\Cache\FluidCacheWarmerInterface`
+    * :php:`TYPO3Fluid\Fluid\Core\Cache\StandardCacheWarmer`
+    * :php:`TYPO3Fluid\Fluid\Core\Cache\FluidCacheWarmupResult`
+    * :php:`TYPO3Fluid\Fluid\Core\Compiler\FailedCompilingState`
+    * :php:`TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler::MODE_NORMAL`
+    * :php:`TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler::MODE_WARMUP`
+    * :php:`TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler::$mode`
+    * :php:`TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler::enterWarmupMode()`
+    * :php:`TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler::isWarmupMode()`
+* Deprecation: The `<f:cache.warmup>` ViewHelper is deprecated and will be removed in Fluid v5.
+* Deprecation: Fluid variable names can no longer start with an underscore character (`_`). Adding such a variable to a template
+  now emits a E_USER_DEPRECATED level error and will result in an exception in Fluid v5. Note that this doesn't affect array
+  keys or object property names, only the name of the variable itself.
+* Deprecation: Replacing `<![CDATA[]]>` sections by empty lines is deprecated and will be removed in Fluid v5.
+  Method :php:`TYPO3Fluid\Fluid\Core\Parser\TemplateProcessor\NamespaceDetectionTemplateProcessor.php::replaceCdataSectionsByEmptyLines()` now emits a E_USER_DEPRECATED level error.
+
 4.4
 ---
 

Documentation/Changelog/Index.rst

@@ -6,7 +6,8 @@
 Changelog
 =========
 
-The Changelog lists notable deprecation and breaking changes.
+This Changelog lists notable deprecation and breaking changes. The full list of changes is available
+`in the Fluid releases on GitHub <https://github.com/TYPO3/Fluid/releases>`_.
 
 .. toctree::
     :maxdepth: 2

Documentation/Extending/ViewHelpers.rst

@@ -43,12 +43,10 @@ To enable this usage we must then create a ViewHelper class:
      * This ViewHelper takes two arrays and returns
      * the `array_combine`d result.
      */
-    class CombineViewHelper extends AbstractViewHelper {
-
-        /**
-         * @return void
-         */
-        public function initializeArguments() {
+    class CombineViewHelper extends AbstractViewHelper
+    {
+        public function initializeArguments(): void
+        {
             $this->registerArgument('values', 'array', 'Values to use in array_combine');
             $this->registerArgument('keys', 'array', 'Keys to use in array_combine', true);
         }
@@ -57,10 +55,9 @@ To enable this usage we must then create a ViewHelper class:
          * Combines two arrays using one for keys and
          * the other for values. If values are not provided
          * in argument it can be provided as tag content.
-         *
-         * @return array
          */
-        public function render() {
+        public function render(): array
+        {
             $values = $this->arguments['values'];
             $keys = $this->arguments['keys'];
             if ($values === null) {

Documentation/Usage/Components.rst

@@ -61,13 +61,19 @@ A basic implementation looks like this:
     }
 
 ..  tip::
-    In the context of TYPO3, it is recommend to put components into `Resources/Private/Components/`
-    in a central extension and to provide that path in your :php:`ComponentCollection` (see code example) via
+    In the context of TYPO3, it is recommend to place your :php:`ComponentCollection` into
+    `EXT:my_sitepackage/Classes/Components/ComponentCollection.php`. Components are usually
+    created in `Resources/Private/Components/` in your sitepackage extension. The path
+    can be specified in your :php:`ComponentCollection` (see code example above) via
 
     ..  code-block:: php
+        :caption: EXT:my_sitepackage/Classes/Components/ComponentCollection.php
+
         use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
-        ExtensionManagementUtility::extPath('my_sitepackage', 'Resources/Private/Components');
+        $templatePaths->setTemplateRootPaths([
+            ExtensionManagementUtility::extPath('my_sitepackage', 'Resources/Private/Components'),
+        ]);
 
 .. _components-definition:
 
@@ -141,6 +147,18 @@ This example would result in the following rendered HTML:
         Button label
     </button>
 
+..  tip::
+    In the context of TYPO3, you can also define a global Fluid namespace, which allows
+    to use your components across the whole project without importing them into
+    each template file manually:
+
+    ..  code-block:: php
+        :caption: EXT:my_sitepackage/ext_localconf.php
+
+        $GLOBALS['TYPO3_CONF_VARS']['SYS']['fluid']['namespaces']['my'] = [
+            \Vendor\MySitepackage\Components\ComponentCollection::class,
+        ];
+
 Combining Components
 --------------------
 

Documentation/Usage/Structure.rst

@@ -99,9 +99,9 @@ rendering templates in an MVC context, some templates might use layouts and
 others might not. Whether or not you use layouts of course depends on the
 design you are trying to convey.
 
-* `An example Template without a Layout <https://github.com/TYPO3/Fluid/blob/main/examples/Resources/Private/Singles/LayoutLess.html>`__
-* `An example Template with a Layout <https://github.com/TYPO3/Fluid/blob/main/examples/Resources/Private/Templates/Default/Default.html>`__ and the
-  `Layout used by that Template <https://github.com/TYPO3/Fluid/blob/main/examples/Resources/Private/Layouts/Default.html>`__
+* `An example Template without a Layout <https://github.com/TYPO3/Fluid/blob/4.5/examples/Resources/Private/Singles/LayoutLess.html>`__
+* `An example Template with a Layout <https://github.com/TYPO3/Fluid/blob/4.5/examples/Resources/Private/Templates/Default/Default.html>`__ and the
+  `Layout used by that Template <https://github.com/TYPO3/Fluid/blob/4.5/examples/Resources/Private/Layouts/Default.html>`__
 
 .. _layouts:
 
@@ -119,8 +119,8 @@ layout renders with `<f:render>`. In application terms, the rendering engine
 switches to the layout when it detects one and renders it while preserving the
 template's context of controller name and action name.
 
-* `An example Layout <https://github.com/TYPO3/Fluid/blob/main/examples/Resources/Private/Layouts/Default.html>`__ and
-  `Template which uses it <https://github.com/TYPO3/Fluid/blob/main/examples/Resources/Private/Templates/Default/Default.html>`__
+* `An example Layout <https://github.com/TYPO3/Fluid/blob/4.5/examples/Resources/Private/Layouts/Default.html>`__ and
+  `Template which uses it <https://github.com/TYPO3/Fluid/blob/4.5/examples/Resources/Private/Templates/Default/Default.html>`__
 
 .. _partials:
 
@@ -155,8 +155,8 @@ including inside the Partial itself, by `<f:render partial="NameOfPartial" secti
 Partials without sections can be rendered by just
 `<f:render partial="NameOfPartial" />` (with or without `arguments`).
 
-* `An example of a partial template without sections <https://github.com/TYPO3/Fluid/blob/main/examples/Resources/Private/Partials/FirstPartial.html>`__
-* `An example of a partial template with sections <https://github.com/TYPO3/Fluid/blob/main/examples/Resources/Private/Partials/Structures.html>`__
+* `An example of a partial template without sections <https://github.com/TYPO3/Fluid/blob/4.5/examples/Resources/Private/Partials/FirstPartial.html>`__
+* `An example of a partial template with sections <https://github.com/TYPO3/Fluid/blob/4.5/examples/Resources/Private/Partials/Structures.html>`__
 
 .. _template-argument-definitions:
 

Documentation/Usage/ViewHelpers.rst

@@ -142,6 +142,8 @@ this would be the result:
 Boolean attributes
 ------------------
 
+..  versionadded:: Fluid 4.0
+
 You can use the boolean literals `{true}` and `{false}` to enable or disable
 attributes of tag-based ViewHelpers:
 

Documentation/ViewHelpers/Fluid/Ceil.rst

@@ -0,0 +1,21 @@
+..  This reStructured text file has been automatically generated, do not change.
+..  Source: https://github.com/TYPO3/Fluid/blob/main/src/ViewHelpers/CeilViewHelper.php
+
+:edit-on-github-link: https://github.com/TYPO3/Fluid/edit/main/src/ViewHelpers/CeilViewHelper.php
+:navigation-title: ceil
+
+..  include:: /Includes.rst.txt
+
+..  _typo3fluid-fluid-ceil:
+
+==========================
+Ceil ViewHelper `<f:ceil>`
+==========================
+
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Ceil>` instead.
+
+..  typo3:viewhelper:: ceil
+    :source: ../Fluid.json

Documentation/ViewHelpers/Fluid/Contains.rst

@@ -0,0 +1,21 @@
+..  This reStructured text file has been automatically generated, do not change.
+..  Source: https://github.com/TYPO3/Fluid/blob/main/src/ViewHelpers/ContainsViewHelper.php
+
+:edit-on-github-link: https://github.com/TYPO3/Fluid/edit/main/src/ViewHelpers/ContainsViewHelper.php
+:navigation-title: contains
+
+..  include:: /Includes.rst.txt
+
+..  _typo3fluid-fluid-contains:
+
+==================================
+Contains ViewHelper `<f:contains>`
+==================================
+
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Contains>` instead.
+
+..  typo3:viewhelper:: contains
+    :source: ../Fluid.json

Documentation/ViewHelpers/Fluid/EndsWith.rst

@@ -0,0 +1,21 @@
+..  This reStructured text file has been automatically generated, do not change.
+..  Source: https://github.com/TYPO3/Fluid/blob/main/src/ViewHelpers/EndsWithViewHelper.php
+
+:edit-on-github-link: https://github.com/TYPO3/Fluid/edit/main/src/ViewHelpers/EndsWithViewHelper.php
+:navigation-title: endsWith
+
+..  include:: /Includes.rst.txt
+
+..  _typo3fluid-fluid-endswith:
+
+==================================
+EndsWith ViewHelper `<f:endsWith>`
+==================================
+
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/EndsWith>` instead.
+
+..  typo3:viewhelper:: endsWith
+    :source: ../Fluid.json

Documentation/ViewHelpers/Fluid/Flatten.rst

@@ -12,10 +12,10 @@
 Flatten ViewHelper `<f:flatten>`
 ================================
 
-.. ..  note::
-..     This reference is part of the documentation of Fluid Standalone.
-..     If you are working with Fluid in TYPO3 CMS, please refer to
-..     :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Flatten>` instead.
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Flatten>` instead.
 
 ..  typo3:viewhelper:: flatten
     :source: ../Fluid.json

Documentation/ViewHelpers/Fluid/Floor.rst

@@ -0,0 +1,21 @@
+..  This reStructured text file has been automatically generated, do not change.
+..  Source: https://github.com/TYPO3/Fluid/blob/main/src/ViewHelpers/FloorViewHelper.php
+
+:edit-on-github-link: https://github.com/TYPO3/Fluid/edit/main/src/ViewHelpers/FloorViewHelper.php
+:navigation-title: floor
+
+..  include:: /Includes.rst.txt
+
+..  _typo3fluid-fluid-floor:
+
+============================
+Floor ViewHelper `<f:floor>`
+============================
+
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Floor>` instead.
+
+..  typo3:viewhelper:: floor
+    :source: ../Fluid.json

Documentation/ViewHelpers/Fluid/Fragment.rst

@@ -12,10 +12,10 @@
 Fragment ViewHelper `<f:fragment>`
 ==================================
 
-.. ..  note::
-..     This reference is part of the documentation of Fluid Standalone.
-..     If you are working with Fluid in TYPO3 CMS, please refer to
-..     :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Fragment>` instead.
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Fragment>` instead.
 
 ..  typo3:viewhelper:: fragment
     :source: ../Fluid.json

Documentation/ViewHelpers/Fluid/Length.rst

@@ -0,0 +1,21 @@
+..  This reStructured text file has been automatically generated, do not change.
+..  Source: https://github.com/TYPO3/Fluid/blob/main/src/ViewHelpers/LengthViewHelper.php
+
+:edit-on-github-link: https://github.com/TYPO3/Fluid/edit/main/src/ViewHelpers/LengthViewHelper.php
+:navigation-title: length
+
+..  include:: /Includes.rst.txt
+
+..  _typo3fluid-fluid-length:
+
+==============================
+Length ViewHelper `<f:length>`
+==============================
+
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Length>` instead.
+
+..  typo3:viewhelper:: length
+    :source: ../Fluid.json

Documentation/ViewHelpers/Fluid/Max.rst

@@ -0,0 +1,21 @@
+..  This reStructured text file has been automatically generated, do not change.
+..  Source: https://github.com/TYPO3/Fluid/blob/main/src/ViewHelpers/MaxViewHelper.php
+
+:edit-on-github-link: https://github.com/TYPO3/Fluid/edit/main/src/ViewHelpers/MaxViewHelper.php
+:navigation-title: max
+
+..  include:: /Includes.rst.txt
+
+..  _typo3fluid-fluid-max:
+
+========================
+Max ViewHelper `<f:max>`
+========================
+
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Max>` instead.
+
+..  typo3:viewhelper:: max
+    :source: ../Fluid.json

Documentation/ViewHelpers/Fluid/Merge.rst

@@ -0,0 +1,21 @@
+..  This reStructured text file has been automatically generated, do not change.
+..  Source: https://github.com/TYPO3/Fluid/blob/main/src/ViewHelpers/MergeViewHelper.php
+
+:edit-on-github-link: https://github.com/TYPO3/Fluid/edit/main/src/ViewHelpers/MergeViewHelper.php
+:navigation-title: merge
+
+..  include:: /Includes.rst.txt
+
+..  _typo3fluid-fluid-merge:
+
+============================
+Merge ViewHelper `<f:merge>`
+============================
+
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Merge>` instead.
+
+..  typo3:viewhelper:: merge
+    :source: ../Fluid.json

Documentation/ViewHelpers/Fluid/Min.rst

@@ -0,0 +1,21 @@
+..  This reStructured text file has been automatically generated, do not change.
+..  Source: https://github.com/TYPO3/Fluid/blob/main/src/ViewHelpers/MinViewHelper.php
+
+:edit-on-github-link: https://github.com/TYPO3/Fluid/edit/main/src/ViewHelpers/MinViewHelper.php
+:navigation-title: min
+
+..  include:: /Includes.rst.txt
+
+..  _typo3fluid-fluid-min:
+
+========================
+Min ViewHelper `<f:min>`
+========================
+
+..  note::
+    This reference is part of the documentation of Fluid Standalone.
+    If you are working with Fluid in TYPO3 CMS, please refer to
+    :doc:`TYPO3's ViewHelper reference <t3viewhelper:Global/Min>` instead.
+
+..  typo3:viewhelper:: min
+    :source: ../Fluid.json