From 9cab935afa9b0f385049ad8909781087ae107f52 Mon Sep 17 00:00:00 2001
From: Claus Due <claus@namelesscoder.net>
Date: Sun, 26 Jan 2025 00:16:46 +0100
Subject: [PATCH] [FEATURE] Add compatibility layer to basically all
 ViewHelpers

Adds a massive number of backwards/cross compatibility
handlers, because Fluid decided to introduce a large number
of completely unnecessary breaking changes in v4, because
"it's cleaner" and apparently nobody cares about devs anymore.
---
 Classes/Traits/ArgumentOverride.php           |  28 +++
 ...pileWithContentArgumentAndRenderStatic.php | 184 ++++++++++++++++++
 Classes/Traits/CompileWithRenderStatic.php    |  40 ++++
 Classes/Traits/TagViewHelperCompatibility.php |  66 +++++++
 Classes/Traits/TagViewHelperTrait.php         |  42 +++-
 Classes/ViewHelpers/Asset/StyleViewHelper.php |   4 +
 Classes/ViewHelpers/AssetViewHelper.php       |   3 +
 Classes/ViewHelpers/CallViewHelper.php        |   2 +-
 Classes/ViewHelpers/ConstViewHelper.php       |   2 +-
 Classes/ViewHelpers/Content/GetViewHelper.php |   3 +
 .../Content/Random/GetViewHelper.php          |   4 +
 .../Content/Random/RenderViewHelper.php       |   3 +
 .../Content/Resources/FalViewHelper.php       |   4 +
 .../Content/ResourcesViewHelper.php           |   2 +
 Classes/ViewHelpers/Context/GetViewHelper.php |   2 +-
 Classes/ViewHelpers/Count/BytesViewHelper.php |   2 +-
 Classes/ViewHelpers/Count/LinesViewHelper.php |   2 +-
 .../ViewHelpers/Count/SubstringViewHelper.php |   2 +-
 Classes/ViewHelpers/Count/WordsViewHelper.php |   2 +-
 .../ViewHelpers/Extension/IconViewHelper.php  |   2 +-
 .../Extension/Path/AbsoluteViewHelper.php     |   2 +-
 .../Extension/Path/RelativeViewHelper.php     |   2 +-
 .../Extension/Path/ResourcesViewHelper.php    |   2 +-
 .../Extension/Path/SiteRelativeViewHelper.php |   2 +-
 .../ViewHelpers/Format/AppendViewHelper.php   |   2 +-
 Classes/ViewHelpers/Format/CaseViewHelper.php |   2 +-
 .../Format/DateRangeViewHelper.php            |   2 +-
 .../Format/EliminateViewHelper.php            |   2 +-
 Classes/ViewHelpers/Format/HashViewHelper.php |   2 +-
 Classes/ViewHelpers/Format/HideViewHelper.php |   2 +-
 .../Format/Json/DecodeViewHelper.php          |   2 +-
 .../Format/Json/EncodeViewHelper.php          |   2 +-
 .../ViewHelpers/Format/MarkdownViewHelper.php |   2 +-
 .../Format/Placeholder/ImageViewHelper.php    |   3 +
 .../Format/Placeholder/LipsumViewHelper.php   |   2 +-
 .../Format/PlaintextViewHelper.php            |   2 +-
 .../Format/PregReplaceViewHelper.php          |   2 +-
 .../ViewHelpers/Format/PrependViewHelper.php  |   2 +-
 .../ViewHelpers/Format/ReplaceViewHelper.php  |   2 +-
 .../Format/SanitizeStringViewHelper.php       |   2 +-
 .../Format/SubstringViewHelper.php            |   2 +-
 Classes/ViewHelpers/Format/TidyViewHelper.php |   2 +-
 Classes/ViewHelpers/Format/TrimViewHelper.php |   2 +-
 .../Format/Url/DecodeViewHelper.php           |   2 +-
 .../Format/Url/EncodeViewHelper.php           |   2 +-
 .../ViewHelpers/Format/WordWrapViewHelper.php |   2 +-
 .../ViewHelpers/Iterator/ChunkViewHelper.php  |   2 +
 .../ViewHelpers/Iterator/ColumnViewHelper.php |   2 +
 .../ViewHelpers/Iterator/DiffViewHelper.php   |   2 +-
 .../Iterator/ExplodeViewHelper.php            |   2 +
 .../Iterator/ExtractViewHelper.php            |   3 +
 .../ViewHelpers/Iterator/FilterViewHelper.php |   3 +
 .../ViewHelpers/Iterator/FirstViewHelper.php  |   3 +
 .../Iterator/ImplodeViewHelper.php            |   2 +
 .../Iterator/IntersectViewHelper.php          |   2 +
 .../ViewHelpers/Iterator/KeysViewHelper.php   |   2 +
 .../ViewHelpers/Iterator/LastViewHelper.php   |   2 +
 .../ViewHelpers/Iterator/MergeViewHelper.php  |   2 +
 .../ViewHelpers/Iterator/PopViewHelper.php    |   2 +
 .../ViewHelpers/Iterator/PushViewHelper.php   |   2 +
 .../ViewHelpers/Iterator/RandomViewHelper.php |   2 +
 .../ViewHelpers/Iterator/RangeViewHelper.php  |   2 +
 .../Iterator/ReverseViewHelper.php            |   2 +
 .../ViewHelpers/Iterator/ShiftViewHelper.php  |   2 +
 .../ViewHelpers/Iterator/SliceViewHelper.php  |   2 +
 .../ViewHelpers/Iterator/SortViewHelper.php   |   2 +
 .../ViewHelpers/Iterator/SplitViewHelper.php  |   2 +
 .../ViewHelpers/Iterator/UniqueViewHelper.php |   2 +
 .../ViewHelpers/Iterator/ValuesViewHelper.php |   2 +
 Classes/ViewHelpers/LViewHelper.php           |   2 +-
 .../Math/AbstractMultipleMathViewHelper.php   |   2 +-
 .../Math/AbstractSingleMathViewHelper.php     |   2 +-
 .../ViewHelpers/Math/AverageViewHelper.php    |   4 +-
 Classes/ViewHelpers/Math/CeilViewHelper.php   |   2 +-
 Classes/ViewHelpers/Math/CubeViewHelper.php   |   2 +-
 .../ViewHelpers/Math/CubicRootViewHelper.php  |   2 +-
 .../ViewHelpers/Math/DivisionViewHelper.php   |   2 +-
 Classes/ViewHelpers/Math/FloorViewHelper.php  |   2 +-
 .../ViewHelpers/Math/MaximumViewHelper.php    |   4 +-
 Classes/ViewHelpers/Math/MedianViewHelper.php |   2 +-
 .../ViewHelpers/Math/MinimumViewHelper.php    |   4 +-
 Classes/ViewHelpers/Math/ModuloViewHelper.php |   2 +-
 Classes/ViewHelpers/Math/PowerViewHelper.php  |   2 +-
 .../ViewHelpers/Math/ProductViewHelper.php    |   2 +-
 Classes/ViewHelpers/Math/RangeViewHelper.php  |   2 +-
 Classes/ViewHelpers/Math/RoundViewHelper.php  |   2 +-
 .../ViewHelpers/Math/SquareRootViewHelper.php |   2 +-
 Classes/ViewHelpers/Math/SquareViewHelper.php |   2 +-
 .../ViewHelpers/Math/SubtractViewHelper.php   |   4 +-
 Classes/ViewHelpers/Math/SumViewHelper.php    |   4 +-
 .../Media/AbstractMediaViewHelper.php         |   3 +
 .../ViewHelpers/Media/ExtensionViewHelper.php |   2 +-
 Classes/ViewHelpers/Media/FilesViewHelper.php |   2 +-
 .../ViewHelpers/Media/GravatarViewHelper.php  |   3 +
 .../ViewHelpers/Media/PictureViewHelper.php   |   3 +
 Classes/ViewHelpers/Media/SizeViewHelper.php  |   2 +-
 .../ViewHelpers/Media/SourceViewHelper.php    |   3 +
 .../ViewHelpers/Media/SpotifyViewHelper.php   |   3 +
 Classes/ViewHelpers/Media/VimeoViewHelper.php |   5 +
 .../ViewHelpers/Media/YoutubeViewHelper.php   |   3 +
 .../ViewHelpers/Menu/DeferredViewHelper.php   |   3 +
 Classes/ViewHelpers/OrViewHelper.php          |   2 +-
 .../Page/AbsoluteUrlViewHelper.php            |   2 +-
 .../ViewHelpers/Page/BreadCrumbViewHelper.php |   3 +
 .../Page/Header/CanonicalViewHelper.php       |   2 +
 .../Page/Header/TitleViewHelper.php           |   2 +-
 Classes/ViewHelpers/Page/InfoViewHelper.php   |   2 +-
 .../Page/LanguageMenuViewHelper.php           |   2 +
 .../ViewHelpers/Page/LanguageViewHelper.php   |   2 +-
 Classes/ViewHelpers/Page/LinkViewHelper.php   |   3 +-
 .../Page/Resources/FalViewHelper.php          |   2 +
 .../ViewHelpers/Page/ResourcesViewHelper.php  |   3 +
 .../ViewHelpers/Page/RootlineViewHelper.php   |   2 +-
 .../Page/StaticPrefixViewHelper.php           |   2 +-
 .../ViewHelpers/Random/NumberViewHelper.php   |   2 +-
 .../ViewHelpers/Random/StringViewHelper.php   |   2 +-
 .../ViewHelpers/Render/AsciiViewHelper.php    |   2 +-
 .../ViewHelpers/Render/CacheViewHelper.php    |   2 +-
 .../ViewHelpers/Render/InlineViewHelper.php   |   2 +-
 .../ViewHelpers/Render/RecordViewHelper.php   |   2 +-
 .../ViewHelpers/Render/RequestViewHelper.php  |   2 +-
 .../ViewHelpers/Render/UncacheViewHelper.php  |   2 +-
 .../Resource/AbstractResourceViewHelper.php   |   3 +
 Classes/ViewHelpers/Site/NameViewHelper.php   |   2 +-
 Classes/ViewHelpers/Site/UrlViewHelper.php    |   2 +-
 .../ViewHelpers/System/DateTimeViewHelper.php |   2 +-
 .../System/TimestampViewHelper.php            |   2 +-
 .../ViewHelpers/System/UniqIdViewHelper.php   |   2 +-
 Classes/ViewHelpers/TagViewHelper.php         |   1 +
 .../ViewHelpers/Uri/GravatarViewHelper.php    |   2 +-
 Classes/ViewHelpers/Uri/RequestViewHelper.php |   2 +-
 .../Variable/ConvertViewHelper.php            |   2 +-
 .../ExtensionConfigurationViewHelper.php      |   2 +-
 .../ViewHelpers/Variable/GetViewHelper.php    |   2 +-
 .../Variable/PregMatchViewHelper.php          |   2 +-
 .../Variable/Register/GetViewHelper.php       |   2 +-
 .../Variable/Register/SetViewHelper.php       |   2 +-
 .../ViewHelpers/Variable/SetViewHelper.php    |   2 +-
 .../Variable/TyposcriptViewHelper.php         |   2 +-
 .../ViewHelpers/Variable/UnsetViewHelper.php  |   5 +-
 140 files changed, 577 insertions(+), 92 deletions(-)
 create mode 100644 Classes/Traits/ArgumentOverride.php
 create mode 100644 Classes/Traits/CompileWithContentArgumentAndRenderStatic.php
 create mode 100644 Classes/Traits/CompileWithRenderStatic.php
 create mode 100644 Classes/Traits/TagViewHelperCompatibility.php

diff --git a/Classes/Traits/ArgumentOverride.php b/Classes/Traits/ArgumentOverride.php
new file mode 100644
index 000000000..ee425ba07
--- /dev/null
+++ b/Classes/Traits/ArgumentOverride.php
@@ -0,0 +1,28 @@
+<?php
+namespace FluidTYPO3\Vhs\Traits;
+
+/*
+ * This file is part of the FluidTYPO3/Vhs project under GPLv2 or later.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.md file that was distributed with this source code.
+ */
+
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
+
+trait ArgumentOverride
+{
+    protected function overrideArgument(
+        $name,
+        $type,
+        $description,
+        $required = false,
+        $defaultValue = null,
+        $escape = null
+    ) {
+        if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '13.4', '>=')) {
+            return parent::registerArgument($name, $type, $description, $required, $defaultValue, $escape);
+        }
+        return parent::overrideArgument($name, $type, $description, $required, $defaultValue, $escape);
+    }
+}
diff --git a/Classes/Traits/CompileWithContentArgumentAndRenderStatic.php b/Classes/Traits/CompileWithContentArgumentAndRenderStatic.php
new file mode 100644
index 000000000..a6024ed47
--- /dev/null
+++ b/Classes/Traits/CompileWithContentArgumentAndRenderStatic.php
@@ -0,0 +1,184 @@
+<?php
+namespace FluidTYPO3\Vhs\Traits;
+
+/*
+ * This file is part of the FluidTYPO3/Vhs project under GPLv2 or later.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.md file that was distributed with this source code.
+ */
+
+use TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler;
+use TYPO3Fluid\Fluid\Core\Compiler\ViewHelperCompiler;
+use TYPO3Fluid\Fluid\Core\Exception;
+use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode;
+
+/**
+ * Class CompilableWithContentArgumentAndRenderStatic
+ *
+ * Provides default methods for rendering and compiling
+ * any ViewHelper that conforms to the `renderStatic`
+ * method pattern but has the added common use case that
+ * an argument value must be checked and used instead of
+ * the normal render children closure, if that named
+ * argument is specified and not empty.
+ */
+trait CompileWithContentArgumentAndRenderStatic
+{
+    /**
+     * Name of variable that contains the value to use
+     * instead of render children closure, if specified.
+     * If no name is provided here, the first variable
+     * registered in `initializeArguments` of the ViewHelper
+     * will be used.
+     *
+     * Note: it is significantly better practice defining
+     * this property in your ViewHelper class and so fix it
+     * to one particular argument instead of resolving,
+     * especially when your ViewHelper is called multiple
+     * times within an uncompiled template!
+     *
+     * This property cannot be directly set in consuming
+     * ViewHelper, instead set the property in ViewHelper
+     * constructor '__construct()', for example with
+     * $this->contentArgumentName = 'explicitlyToUseArgumentName';
+     *
+     * Another possible way would be to override the method
+     * 'resolveContentArgumentName()' and return the name.
+     *
+     * public function resolveContentArgumentName()
+     * {
+     *     return 'explicitlyToUseArgumentName';
+     * }
+     *
+     * Note: Setting this through 'initializeArguments()' will
+     *       not work as expected, and other methods should be
+     *       avoided to override this.
+     *
+     * Following test ViewHelpers are tested and demonstrates
+     * that the setting posibillities works.
+     *
+     * @var string
+     */
+    protected $contentArgumentName;
+
+    /**
+     * Default render method to render ViewHelper with
+     * first defined optional argument as content.
+     *
+     * @return mixed Rendered result
+     * @api
+     */
+    public function render()
+    {
+        return static::renderStatic(
+            $this->arguments,
+            $this->buildRenderChildrenClosure(),
+            $this->renderingContext,
+        );
+    }
+
+    /**
+     * @param string $argumentsName
+     * @param string $closureName
+     * @param string $initializationPhpCode
+     * @param ViewHelperNode $node
+     * @param TemplateCompiler $compiler
+     * @return string
+     */
+    public function compile(
+        $argumentsName,
+        $closureName,
+        &$initializationPhpCode,
+        ViewHelperNode $node,
+        TemplateCompiler $compiler
+    ) {
+        [$initialization, $execution] = ViewHelperCompiler::getInstance()->compileWithCallToStaticMethod(
+            $this,
+            $argumentsName,
+            $closureName,
+            ViewHelperCompiler::RENDER_STATIC,
+            static::class
+        );
+        $contentArgumentName = $this->resolveContentArgumentName();
+        $initializationPhpCode .= sprintf(
+            '%s = (%s[\'%s\'] !== null) ? function() use (%s) { return %s[\'%s\']; } : %s;',
+            $closureName,
+            $argumentsName,
+            $contentArgumentName,
+            $argumentsName,
+            $argumentsName,
+            $contentArgumentName,
+            $closureName
+        );
+        $initializationPhpCode .= $initialization;
+        return $execution;
+    }
+
+    /**
+     * Helper which is mostly needed when calling renderStatic() from within
+     * render().
+     *
+     * No public API yet.
+     *
+     * @return \Closure
+     */
+    protected function buildRenderChildrenClosure()
+    {
+        $argumentName = $this->resolveContentArgumentName();
+        $arguments = $this->arguments;
+        if (!empty($argumentName) && isset($arguments[$argumentName])) {
+            $renderChildrenClosure = function () use ($arguments, $argumentName) {
+                return $arguments[$argumentName];
+            };
+        } else {
+            $self = clone $this;
+            $renderChildrenClosure = function () use ($self) {
+                return $self->renderChildren();
+            };
+        }
+        return $renderChildrenClosure;
+    }
+
+    /**
+     * Helper method which triggers the rendering of everything between the
+     * opening and the closing tag.
+     *
+     * @return mixed The finally rendered child nodes.
+     * @api
+     */
+    public function renderChildren()
+    {
+        if ($this->renderChildrenClosure !== null) {
+            $closure = $this->renderChildrenClosure;
+            return $closure();
+        }
+        return $this->viewHelperNode->evaluateChildNodes($this->renderingContext);
+    }
+
+    /**
+     * @return string
+     */
+    public function resolveContentArgumentName()
+    {
+        if (empty($this->contentArgumentName)) {
+            $registeredArguments = $this->prepareArguments();
+            foreach ($registeredArguments as $registeredArgument) {
+                if (!$registeredArgument->isRequired()) {
+                    $this->contentArgumentName = $registeredArgument->getName();
+                    return $this->contentArgumentName;
+                }
+            }
+            throw new Exception(
+                sprintf('Attempting to compile %s failed. Chosen compile method requires that ViewHelper has ' .
+                    'at least one registered and optional argument', __CLASS__)
+            );
+        }
+        return $this->contentArgumentName;
+    }
+
+    public function getContentArgumentName(): ?string
+    {
+        return $this->resolveContentArgumentName();
+    }
+}
diff --git a/Classes/Traits/CompileWithRenderStatic.php b/Classes/Traits/CompileWithRenderStatic.php
new file mode 100644
index 000000000..aec174bfe
--- /dev/null
+++ b/Classes/Traits/CompileWithRenderStatic.php
@@ -0,0 +1,40 @@
+<?php
+namespace FluidTYPO3\Vhs\Traits;
+
+/*
+ * This file is part of the FluidTYPO3/Vhs project under GPLv2 or later.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.md file that was distributed with this source code.
+ */
+
+/**
+ * Class CompilableWithRenderStatic
+ *
+ * Provides default methods for rendering and compiling
+ * any ViewHelper that conforms to the `renderStatic`
+ * method pattern.
+ */
+trait CompileWithRenderStatic
+{
+    /**
+     * Default render method - simply calls renderStatic() with a
+     * prepared set of arguments.
+     *
+     * @return mixed Rendered result
+     * @api
+     */
+    public function render()
+    {
+        return static::renderStatic(
+            $this->arguments,
+            $this->buildRenderChildrenClosure(),
+            $this->renderingContext,
+        );
+    }
+
+    /**
+     * @return \Closure
+     */
+    abstract protected function buildRenderChildrenClosure();
+}
diff --git a/Classes/Traits/TagViewHelperCompatibility.php b/Classes/Traits/TagViewHelperCompatibility.php
new file mode 100644
index 000000000..1063c5c23
--- /dev/null
+++ b/Classes/Traits/TagViewHelperCompatibility.php
@@ -0,0 +1,66 @@
+<?php
+namespace FluidTYPO3\Vhs\Traits;
+
+/*
+ * This file is part of the FluidTYPO3/Vhs project under GPLv2 or later.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.md file that was distributed with this source code.
+ */
+
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
+
+trait TagViewHelperCompatibility
+{
+    /**
+     * Register a new tag attribute. Tag attributes are all arguments which will be directly appended to a tag if you
+     * call $this->initializeTag()
+     *
+     * @param string $name Name of tag attribute
+     * @param string $type Type of the tag attribute
+     * @param string $description Description of tag attribute
+     * @param bool $required set to true if tag attribute is required. Defaults to false.
+     * @param mixed $defaultValue Optional, default value of attribute if one applies
+     * @return void
+     * @api
+     */
+    protected function registerTagAttribute($name, $type, $description, $required = false, $defaultValue = null)
+    {
+        if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '13.4', '>=')) {
+            $this->registerArgument($name, $type, $description, $required, $defaultValue);
+            return;
+        }
+        parent::registerTagAttribute($name, $type, $description, $required, $defaultValue);
+    }
+
+    /**
+     * Registers all standard HTML universal attributes.
+     * Should be used inside registerArguments();
+     *
+     * @return void
+     * @api
+     */
+    protected function registerUniversalTagAttributes()
+    {
+        if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '13.4', '>=')) {
+            return;
+        }
+        $this->registerTagAttribute('class', 'string', 'CSS class(es) for this element');
+        $this->registerTagAttribute(
+            'dir',
+            'string',
+            'Text direction for this HTML element. Allowed strings: "ltr" (left to right), "rtl" (right to left)'
+        );
+        $this->registerTagAttribute('id', 'string', 'Unique (in this file) identifier for this HTML element.');
+        $this->registerTagAttribute(
+            'lang',
+            'string',
+            'Language for this element. Use short names specified in RFC 1766'
+        );
+        $this->registerTagAttribute('style', 'string', 'Individual CSS styles for this element');
+        $this->registerTagAttribute('title', 'string', 'Tooltip text of element');
+        $this->registerTagAttribute('accesskey', 'string', 'Keyboard shortcut to access this element');
+        $this->registerTagAttribute('tabindex', 'integer', 'Specifies the tab order of this element');
+        $this->registerTagAttribute('onclick', 'string', 'JavaScript evaluated for the onclick event');
+    }
+}
diff --git a/Classes/Traits/TagViewHelperTrait.php b/Classes/Traits/TagViewHelperTrait.php
index 86ae6abb2..aa5b66e5a 100644
--- a/Classes/Traits/TagViewHelperTrait.php
+++ b/Classes/Traits/TagViewHelperTrait.php
@@ -8,6 +8,8 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
+
 /**
  * Class TagViewHelperTrait
  *
@@ -31,13 +33,51 @@ public function registerArguments(): void
         $this->registerUniversalTagAttributes();
     }
 
+    /**
+     * Register a new tag attribute. Tag attributes are all arguments which will be directly appended to a tag if you
+     * call $this->initializeTag()
+     *
+     * @param string $name Name of tag attribute
+     * @param string $type Type of the tag attribute
+     * @param string $description Description of tag attribute
+     * @param bool $required set to true if tag attribute is required. Defaults to false.
+     * @param mixed $defaultValue Optional, default value of attribute if one applies
+     * @return void
+     * @api
+     */
+    protected function registerTagAttribute($name, $type, $description, $required = false, $defaultValue = null)
+    {
+        if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '13.4', '>=')) {
+            $this->registerArgument($name, $type, $description, $required, $defaultValue);
+            return;
+        }
+        parent::registerTagAttribute($name, $type, $description, $required, $defaultValue);
+    }
+
     /**
      * Registers all standard and HTML5 universal attributes.
      * Should be used inside registerArguments();
      */
     protected function registerUniversalTagAttributes(): void
     {
-        parent::registerUniversalTagAttributes();
+        $this->registerTagAttribute('class', 'string', 'CSS class(es) for this element');
+        $this->registerTagAttribute(
+            'dir',
+            'string',
+            'Text direction for this HTML element. Allowed strings: "ltr" (left to right), "rtl" (right to left)'
+        );
+        $this->registerTagAttribute('id', 'string', 'Unique (in this file) identifier for this HTML element.');
+        $this->registerTagAttribute(
+            'lang',
+            'string',
+            'Language for this element. Use short names specified in RFC 1766'
+        );
+        $this->registerTagAttribute('style', 'string', 'Individual CSS styles for this element');
+        $this->registerTagAttribute('title', 'string', 'Tooltip text of element');
+        $this->registerTagAttribute('accesskey', 'string', 'Keyboard shortcut to access this element');
+        $this->registerTagAttribute('tabindex', 'integer', 'Specifies the tab order of this element');
+        $this->registerTagAttribute('onclick', 'string', 'JavaScript evaluated for the onclick event');
+
         $this->registerArgument(
             'forceClosingTag',
             'boolean',
diff --git a/Classes/ViewHelpers/Asset/StyleViewHelper.php b/Classes/ViewHelpers/Asset/StyleViewHelper.php
index 6e052af3b..c071fbd4c 100644
--- a/Classes/ViewHelpers/Asset/StyleViewHelper.php
+++ b/Classes/ViewHelpers/Asset/StyleViewHelper.php
@@ -8,6 +8,8 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
+
 /**
  * ### Basic Style ViewHelper
  *
@@ -16,6 +18,8 @@
  */
 class StyleViewHelper extends AbstractAssetViewHelper
 {
+    use ArgumentOverride;
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
diff --git a/Classes/ViewHelpers/AssetViewHelper.php b/Classes/ViewHelpers/AssetViewHelper.php
index 33105c726..2a1705e3b 100644
--- a/Classes/ViewHelpers/AssetViewHelper.php
+++ b/Classes/ViewHelpers/AssetViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\ViewHelpers\Asset\AbstractAssetViewHelper;
 
 /**
@@ -49,6 +50,8 @@
  */
 class AssetViewHelper extends AbstractAssetViewHelper
 {
+    use ArgumentOverride;
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
diff --git a/Classes/ViewHelpers/CallViewHelper.php b/Classes/ViewHelpers/CallViewHelper.php
index 30b7b1cc6..70480ad70 100644
--- a/Classes/ViewHelpers/CallViewHelper.php
+++ b/Classes/ViewHelpers/CallViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Call ViewHelper
diff --git a/Classes/ViewHelpers/ConstViewHelper.php b/Classes/ViewHelpers/ConstViewHelper.php
index 71709ea56..5e65cbdb0 100644
--- a/Classes/ViewHelpers/ConstViewHelper.php
+++ b/Classes/ViewHelpers/ConstViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Const ViewHelper
diff --git a/Classes/ViewHelpers/Content/GetViewHelper.php b/Classes/ViewHelpers/Content/GetViewHelper.php
index 3827bb28d..d1b43e71b 100644
--- a/Classes/ViewHelpers/Content/GetViewHelper.php
+++ b/Classes/ViewHelpers/Content/GetViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\Utility\ContextUtility;
 
 /**
@@ -17,6 +18,8 @@
  */
 class GetViewHelper extends AbstractContentViewHelper
 {
+    use ArgumentOverride;
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
diff --git a/Classes/ViewHelpers/Content/Random/GetViewHelper.php b/Classes/ViewHelpers/Content/Random/GetViewHelper.php
index cc079b55f..e2bc7171a 100644
--- a/Classes/ViewHelpers/Content/Random/GetViewHelper.php
+++ b/Classes/ViewHelpers/Content/Random/GetViewHelper.php
@@ -8,11 +8,15 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
+
 /**
  * ViewHelper for fetching a random content element in Fluid page templates.
  */
 class GetViewHelper extends RenderViewHelper
 {
+    use ArgumentOverride;
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
diff --git a/Classes/ViewHelpers/Content/Random/RenderViewHelper.php b/Classes/ViewHelpers/Content/Random/RenderViewHelper.php
index 7003fd550..75448235c 100644
--- a/Classes/ViewHelpers/Content/Random/RenderViewHelper.php
+++ b/Classes/ViewHelpers/Content/Random/RenderViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\Utility\ContextUtility;
 use FluidTYPO3\Vhs\ViewHelpers\Content\AbstractContentViewHelper;
 
@@ -16,6 +17,8 @@
  */
 class RenderViewHelper extends AbstractContentViewHelper
 {
+    use ArgumentOverride;
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
diff --git a/Classes/ViewHelpers/Content/Resources/FalViewHelper.php b/Classes/ViewHelpers/Content/Resources/FalViewHelper.php
index eedbd7c6d..231282cd8 100644
--- a/Classes/ViewHelpers/Content/Resources/FalViewHelper.php
+++ b/Classes/ViewHelpers/Content/Resources/FalViewHelper.php
@@ -8,6 +8,8 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
+
 /**
  * Content FAL relations ViewHelper
  *
@@ -39,6 +41,8 @@
  */
 class FalViewHelper extends \FluidTYPO3\Vhs\ViewHelpers\Resource\Record\FalViewHelper
 {
+    use ArgumentOverride;
+
     const DEFAULT_TABLE = 'tt_content';
     const DEFAULT_FIELD = 'image';
 
diff --git a/Classes/ViewHelpers/Content/ResourcesViewHelper.php b/Classes/ViewHelpers/Content/ResourcesViewHelper.php
index 3cde77f33..15ca4ae6c 100644
--- a/Classes/ViewHelpers/Content/ResourcesViewHelper.php
+++ b/Classes/ViewHelpers/Content/ResourcesViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\ViewHelpers\Resource\RecordViewHelper;
 
 /**
@@ -17,6 +18,7 @@
  */
 class ResourcesViewHelper extends RecordViewHelper
 {
+    use ArgumentOverride;
 
     const DEFAULT_TABLE = 'tt_content';
     const DEFAULT_FIELD = 'image';
diff --git a/Classes/ViewHelpers/Context/GetViewHelper.php b/Classes/ViewHelpers/Context/GetViewHelper.php
index 9f7120d0c..6f36de39d 100755
--- a/Classes/ViewHelpers/Context/GetViewHelper.php
+++ b/Classes/ViewHelpers/Context/GetViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Context: Get
diff --git a/Classes/ViewHelpers/Count/BytesViewHelper.php b/Classes/ViewHelpers/Count/BytesViewHelper.php
index d31842c3d..511d0a529 100644
--- a/Classes/ViewHelpers/Count/BytesViewHelper.php
+++ b/Classes/ViewHelpers/Count/BytesViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Counts bytes (multibyte-safe) in a string.
diff --git a/Classes/ViewHelpers/Count/LinesViewHelper.php b/Classes/ViewHelpers/Count/LinesViewHelper.php
index 9d7de6798..5f0539588 100644
--- a/Classes/ViewHelpers/Count/LinesViewHelper.php
+++ b/Classes/ViewHelpers/Count/LinesViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Counts number of lines in a string.
diff --git a/Classes/ViewHelpers/Count/SubstringViewHelper.php b/Classes/ViewHelpers/Count/SubstringViewHelper.php
index 85cb35f71..982bf9d84 100644
--- a/Classes/ViewHelpers/Count/SubstringViewHelper.php
+++ b/Classes/ViewHelpers/Count/SubstringViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Counts number of lines in a string.
diff --git a/Classes/ViewHelpers/Count/WordsViewHelper.php b/Classes/ViewHelpers/Count/WordsViewHelper.php
index c2ba97c4e..a2115e991 100644
--- a/Classes/ViewHelpers/Count/WordsViewHelper.php
+++ b/Classes/ViewHelpers/Count/WordsViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Counts words in a string.
diff --git a/Classes/ViewHelpers/Extension/IconViewHelper.php b/Classes/ViewHelpers/Extension/IconViewHelper.php
index cd44302a3..dabbf930c 100644
--- a/Classes/ViewHelpers/Extension/IconViewHelper.php
+++ b/Classes/ViewHelpers/Extension/IconViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Extension: Icon ViewHelper
diff --git a/Classes/ViewHelpers/Extension/Path/AbsoluteViewHelper.php b/Classes/ViewHelpers/Extension/Path/AbsoluteViewHelper.php
index 56f7c9c5e..a155c13c2 100644
--- a/Classes/ViewHelpers/Extension/Path/AbsoluteViewHelper.php
+++ b/Classes/ViewHelpers/Extension/Path/AbsoluteViewHelper.php
@@ -11,7 +11,7 @@
 use FluidTYPO3\Vhs\ViewHelpers\Extension\AbstractExtensionViewHelper;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Path: Absolute Extension Folder Path
diff --git a/Classes/ViewHelpers/Extension/Path/RelativeViewHelper.php b/Classes/ViewHelpers/Extension/Path/RelativeViewHelper.php
index 022e6ad52..a53ab0eac 100644
--- a/Classes/ViewHelpers/Extension/Path/RelativeViewHelper.php
+++ b/Classes/ViewHelpers/Extension/Path/RelativeViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Path: Relative Extension Folder Path
diff --git a/Classes/ViewHelpers/Extension/Path/ResourcesViewHelper.php b/Classes/ViewHelpers/Extension/Path/ResourcesViewHelper.php
index 446ed58ab..812c8769b 100644
--- a/Classes/ViewHelpers/Extension/Path/ResourcesViewHelper.php
+++ b/Classes/ViewHelpers/Extension/Path/ResourcesViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Path: Relative Extension Resource Path
diff --git a/Classes/ViewHelpers/Extension/Path/SiteRelativeViewHelper.php b/Classes/ViewHelpers/Extension/Path/SiteRelativeViewHelper.php
index 67cec5129..b1f186876 100644
--- a/Classes/ViewHelpers/Extension/Path/SiteRelativeViewHelper.php
+++ b/Classes/ViewHelpers/Extension/Path/SiteRelativeViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Path: Relative Extension Folder Path
diff --git a/Classes/ViewHelpers/Format/AppendViewHelper.php b/Classes/ViewHelpers/Format/AppendViewHelper.php
index ecbc1ac29..6c3fe80c5 100644
--- a/Classes/ViewHelpers/Format/AppendViewHelper.php
+++ b/Classes/ViewHelpers/Format/AppendViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Format: Append string content
diff --git a/Classes/ViewHelpers/Format/CaseViewHelper.php b/Classes/ViewHelpers/Format/CaseViewHelper.php
index 77cb752b9..7c4500eaa 100644
--- a/Classes/ViewHelpers/Format/CaseViewHelper.php
+++ b/Classes/ViewHelpers/Format/CaseViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Case Formatting ViewHelper
diff --git a/Classes/ViewHelpers/Format/DateRangeViewHelper.php b/Classes/ViewHelpers/Format/DateRangeViewHelper.php
index a98d4e7b0..a66f25eae 100644
--- a/Classes/ViewHelpers/Format/DateRangeViewHelper.php
+++ b/Classes/ViewHelpers/Format/DateRangeViewHelper.php
@@ -11,7 +11,7 @@
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Date range calculation/formatting ViewHelper
diff --git a/Classes/ViewHelpers/Format/EliminateViewHelper.php b/Classes/ViewHelpers/Format/EliminateViewHelper.php
index 82edf0823..aa567b886 100644
--- a/Classes/ViewHelpers/Format/EliminateViewHelper.php
+++ b/Classes/ViewHelpers/Format/EliminateViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Character/string/whitespace elimination ViewHelper
diff --git a/Classes/ViewHelpers/Format/HashViewHelper.php b/Classes/ViewHelpers/Format/HashViewHelper.php
index 744c67c45..e83299634 100644
--- a/Classes/ViewHelpers/Format/HashViewHelper.php
+++ b/Classes/ViewHelpers/Format/HashViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Hashes a string.
diff --git a/Classes/ViewHelpers/Format/HideViewHelper.php b/Classes/ViewHelpers/Format/HideViewHelper.php
index eee46d313..f7c58de8b 100644
--- a/Classes/ViewHelpers/Format/HideViewHelper.php
+++ b/Classes/ViewHelpers/Format/HideViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * Hides output from browser, but still renders tag content
diff --git a/Classes/ViewHelpers/Format/Json/DecodeViewHelper.php b/Classes/ViewHelpers/Format/Json/DecodeViewHelper.php
index 635fa34c9..c77a5ad57 100644
--- a/Classes/ViewHelpers/Format/Json/DecodeViewHelper.php
+++ b/Classes/ViewHelpers/Format/Json/DecodeViewHelper.php
@@ -11,7 +11,7 @@
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Converts the JSON encoded argument into a PHP variable.
diff --git a/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php b/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php
index fe297e0c3..37a1f33db 100644
--- a/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php
+++ b/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php
@@ -13,7 +13,7 @@
 use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### JSON Encoding ViewHelper
diff --git a/Classes/ViewHelpers/Format/MarkdownViewHelper.php b/Classes/ViewHelpers/Format/MarkdownViewHelper.php
index 665b4eedf..180664b28 100644
--- a/Classes/ViewHelpers/Format/MarkdownViewHelper.php
+++ b/Classes/ViewHelpers/Format/MarkdownViewHelper.php
@@ -15,7 +15,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Markdown Transformation ViewHelper
diff --git a/Classes/ViewHelpers/Format/Placeholder/ImageViewHelper.php b/Classes/ViewHelpers/Format/Placeholder/ImageViewHelper.php
index c4fc3cbdf..3be4282fa 100644
--- a/Classes/ViewHelpers/Format/Placeholder/ImageViewHelper.php
+++ b/Classes/ViewHelpers/Format/Placeholder/ImageViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
 /**
@@ -17,6 +18,8 @@
  */
 class ImageViewHelper extends AbstractTagBasedViewHelper
 {
+    use TagViewHelperCompatibility;
+
     /**
      * @var string
      */
diff --git a/Classes/ViewHelpers/Format/Placeholder/LipsumViewHelper.php b/Classes/ViewHelpers/Format/Placeholder/LipsumViewHelper.php
index 7d974c02f..45b5a74e5 100644
--- a/Classes/ViewHelpers/Format/Placeholder/LipsumViewHelper.php
+++ b/Classes/ViewHelpers/Format/Placeholder/LipsumViewHelper.php
@@ -15,7 +15,7 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * Lipsum ViewHelper
diff --git a/Classes/ViewHelpers/Format/PlaintextViewHelper.php b/Classes/ViewHelpers/Format/PlaintextViewHelper.php
index 86f8a3e95..e2bf5ede9 100644
--- a/Classes/ViewHelpers/Format/PlaintextViewHelper.php
+++ b/Classes/ViewHelpers/Format/PlaintextViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Processes output as plaintext. Will trim whitespace off
diff --git a/Classes/ViewHelpers/Format/PregReplaceViewHelper.php b/Classes/ViewHelpers/Format/PregReplaceViewHelper.php
index 1bb633d8b..1514de76c 100644
--- a/Classes/ViewHelpers/Format/PregReplaceViewHelper.php
+++ b/Classes/ViewHelpers/Format/PregReplaceViewHelper.php
@@ -11,7 +11,7 @@
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### PregReplace regular expression ViewHelper
diff --git a/Classes/ViewHelpers/Format/PrependViewHelper.php b/Classes/ViewHelpers/Format/PrependViewHelper.php
index ea8fdca6d..788245baf 100644
--- a/Classes/ViewHelpers/Format/PrependViewHelper.php
+++ b/Classes/ViewHelpers/Format/PrependViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Format: Prepend string content
diff --git a/Classes/ViewHelpers/Format/ReplaceViewHelper.php b/Classes/ViewHelpers/Format/ReplaceViewHelper.php
index b59ad7135..4c56fefe7 100644
--- a/Classes/ViewHelpers/Format/ReplaceViewHelper.php
+++ b/Classes/ViewHelpers/Format/ReplaceViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Replaces $substring in $content with $replacement.
diff --git a/Classes/ViewHelpers/Format/SanitizeStringViewHelper.php b/Classes/ViewHelpers/Format/SanitizeStringViewHelper.php
index 73705ecc8..6e12e6517 100644
--- a/Classes/ViewHelpers/Format/SanitizeStringViewHelper.php
+++ b/Classes/ViewHelpers/Format/SanitizeStringViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * URL text segment sanitizer. Sanitizes the content into a
diff --git a/Classes/ViewHelpers/Format/SubstringViewHelper.php b/Classes/ViewHelpers/Format/SubstringViewHelper.php
index ea561e85d..299ebe2c8 100644
--- a/Classes/ViewHelpers/Format/SubstringViewHelper.php
+++ b/Classes/ViewHelpers/Format/SubstringViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Gets a substring from a string or string-compatible value.
diff --git a/Classes/ViewHelpers/Format/TidyViewHelper.php b/Classes/ViewHelpers/Format/TidyViewHelper.php
index d9b8a38ea..925e52e4c 100644
--- a/Classes/ViewHelpers/Format/TidyViewHelper.php
+++ b/Classes/ViewHelpers/Format/TidyViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Tidy-processes a string (HTML source), applying proper
diff --git a/Classes/ViewHelpers/Format/TrimViewHelper.php b/Classes/ViewHelpers/Format/TrimViewHelper.php
index fa6552b25..9632eb6d5 100644
--- a/Classes/ViewHelpers/Format/TrimViewHelper.php
+++ b/Classes/ViewHelpers/Format/TrimViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Trims $content by stripping off $characters (string list
diff --git a/Classes/ViewHelpers/Format/Url/DecodeViewHelper.php b/Classes/ViewHelpers/Format/Url/DecodeViewHelper.php
index 71e0d0618..d595b42d3 100644
--- a/Classes/ViewHelpers/Format/Url/DecodeViewHelper.php
+++ b/Classes/ViewHelpers/Format/Url/DecodeViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Urldecodes the provided string.
diff --git a/Classes/ViewHelpers/Format/Url/EncodeViewHelper.php b/Classes/ViewHelpers/Format/Url/EncodeViewHelper.php
index 119d8828f..a975fe7de 100644
--- a/Classes/ViewHelpers/Format/Url/EncodeViewHelper.php
+++ b/Classes/ViewHelpers/Format/Url/EncodeViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Urlencodes the provided string
diff --git a/Classes/ViewHelpers/Format/WordWrapViewHelper.php b/Classes/ViewHelpers/Format/WordWrapViewHelper.php
index dd9561d07..3f7d79026 100644
--- a/Classes/ViewHelpers/Format/WordWrapViewHelper.php
+++ b/Classes/ViewHelpers/Format/WordWrapViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Wordwrap: Wrap a string at provided character count
diff --git a/Classes/ViewHelpers/Iterator/ChunkViewHelper.php b/Classes/ViewHelpers/Iterator/ChunkViewHelper.php
index 99c9ac3d8..8238c36fd 100644
--- a/Classes/ViewHelpers/Iterator/ChunkViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/ChunkViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -20,6 +21,7 @@ class ChunkViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/ColumnViewHelper.php b/Classes/ViewHelpers/Iterator/ColumnViewHelper.php
index a2402c9e3..e751adbbb 100644
--- a/Classes/ViewHelpers/Iterator/ColumnViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/ColumnViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -75,6 +76,7 @@ class ColumnViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/DiffViewHelper.php b/Classes/ViewHelpers/Iterator/DiffViewHelper.php
index 84ee8d3ee..017d0ca53 100644
--- a/Classes/ViewHelpers/Iterator/DiffViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/DiffViewHelper.php
@@ -11,7 +11,7 @@
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Computes the difference of arrays.
diff --git a/Classes/ViewHelpers/Iterator/ExplodeViewHelper.php b/Classes/ViewHelpers/Iterator/ExplodeViewHelper.php
index 5fc1af809..8eb415db6 100644
--- a/Classes/ViewHelpers/Iterator/ExplodeViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/ExplodeViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -22,6 +23,7 @@ class ExplodeViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/ExtractViewHelper.php b/Classes/ViewHelpers/Iterator/ExtractViewHelper.php
index 417eec847..1d063567d 100644
--- a/Classes/ViewHelpers/Iterator/ExtractViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/ExtractViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use TYPO3\CMS\Core\Log\LogManager;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
@@ -94,6 +95,8 @@
  */
 class ExtractViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
      * @var boolean
      */
diff --git a/Classes/ViewHelpers/Iterator/FilterViewHelper.php b/Classes/ViewHelpers/Iterator/FilterViewHelper.php
index d999c84dd..77dd0baea 100644
--- a/Classes/ViewHelpers/Iterator/FilterViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/FilterViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -24,6 +25,8 @@
  */
 class FilterViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
      * @var boolean
      */
diff --git a/Classes/ViewHelpers/Iterator/FirstViewHelper.php b/Classes/ViewHelpers/Iterator/FirstViewHelper.php
index 162b5a594..0331ad15e 100644
--- a/Classes/ViewHelpers/Iterator/FirstViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/FirstViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -17,6 +18,8 @@
  */
 class FirstViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
      * @var boolean
      */
diff --git a/Classes/ViewHelpers/Iterator/ImplodeViewHelper.php b/Classes/ViewHelpers/Iterator/ImplodeViewHelper.php
index bd5f2ac5d..51c9e3d6f 100644
--- a/Classes/ViewHelpers/Iterator/ImplodeViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/ImplodeViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -22,6 +23,7 @@ class ImplodeViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/IntersectViewHelper.php b/Classes/ViewHelpers/Iterator/IntersectViewHelper.php
index 44e5eb49f..126aad244 100644
--- a/Classes/ViewHelpers/Iterator/IntersectViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/IntersectViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -18,6 +19,7 @@
 class IntersectViewHelper extends AbstractViewHelper
 {
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/KeysViewHelper.php b/Classes/ViewHelpers/Iterator/KeysViewHelper.php
index e749f8598..238e1b65e 100644
--- a/Classes/ViewHelpers/Iterator/KeysViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/KeysViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -20,6 +21,7 @@ class KeysViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/LastViewHelper.php b/Classes/ViewHelpers/Iterator/LastViewHelper.php
index bd76766fd..5551f3547 100644
--- a/Classes/ViewHelpers/Iterator/LastViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/LastViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -18,6 +19,7 @@
 class LastViewHelper extends AbstractViewHelper
 {
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/MergeViewHelper.php b/Classes/ViewHelpers/Iterator/MergeViewHelper.php
index 1b63c4b97..793626bc5 100644
--- a/Classes/ViewHelpers/Iterator/MergeViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/MergeViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -18,6 +19,7 @@
 class MergeViewHelper extends AbstractViewHelper
 {
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/PopViewHelper.php b/Classes/ViewHelpers/Iterator/PopViewHelper.php
index 806b9ec02..91750afe9 100644
--- a/Classes/ViewHelpers/Iterator/PopViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/PopViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -20,6 +21,7 @@ class PopViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/PushViewHelper.php b/Classes/ViewHelpers/Iterator/PushViewHelper.php
index c60ad2329..281a51c7e 100644
--- a/Classes/ViewHelpers/Iterator/PushViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/PushViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -28,6 +29,7 @@ class PushViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/RandomViewHelper.php b/Classes/ViewHelpers/Iterator/RandomViewHelper.php
index e76607f9d..5f151045d 100644
--- a/Classes/ViewHelpers/Iterator/RandomViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/RandomViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -20,6 +21,7 @@ class RandomViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/RangeViewHelper.php b/Classes/ViewHelpers/Iterator/RangeViewHelper.php
index d58314194..8c7913220 100644
--- a/Classes/ViewHelpers/Iterator/RangeViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/RangeViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -30,6 +31,7 @@
 class RangeViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/ReverseViewHelper.php b/Classes/ViewHelpers/Iterator/ReverseViewHelper.php
index b1a72e186..1c95280b3 100644
--- a/Classes/ViewHelpers/Iterator/ReverseViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/ReverseViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -23,6 +24,7 @@ class ReverseViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/ShiftViewHelper.php b/Classes/ViewHelpers/Iterator/ShiftViewHelper.php
index 43e834b91..1426d6cdf 100644
--- a/Classes/ViewHelpers/Iterator/ShiftViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/ShiftViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -20,6 +21,7 @@ class ShiftViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/SliceViewHelper.php b/Classes/ViewHelpers/Iterator/SliceViewHelper.php
index 4dd08d2e0..919619b8d 100644
--- a/Classes/ViewHelpers/Iterator/SliceViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/SliceViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -20,6 +21,7 @@ class SliceViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/SortViewHelper.php b/Classes/ViewHelpers/Iterator/SortViewHelper.php
index b350469c0..54cfcc866 100644
--- a/Classes/ViewHelpers/Iterator/SortViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/SortViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -35,6 +36,7 @@ class SortViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/SplitViewHelper.php b/Classes/ViewHelpers/Iterator/SplitViewHelper.php
index b6fcb2510..81f7914b0 100644
--- a/Classes/ViewHelpers/Iterator/SplitViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/SplitViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -19,6 +20,7 @@
 class SplitViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/UniqueViewHelper.php b/Classes/ViewHelpers/Iterator/UniqueViewHelper.php
index 097d095a9..f8cff66b0 100644
--- a/Classes/ViewHelpers/Iterator/UniqueViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/UniqueViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -61,6 +62,7 @@ class UniqueViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/Iterator/ValuesViewHelper.php b/Classes/ViewHelpers/Iterator/ValuesViewHelper.php
index f331e0bfd..15c3201bb 100644
--- a/Classes/ViewHelpers/Iterator/ValuesViewHelper.php
+++ b/Classes/ViewHelpers/Iterator/ValuesViewHelper.php
@@ -26,6 +26,7 @@
  ***************************************************************/
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -37,6 +38,7 @@ class ValuesViewHelper extends AbstractViewHelper
 {
     use TemplateVariableViewHelperTrait;
     use ArrayConsumingViewHelperTrait;
+    use CompileWithRenderStatic;
 
     /**
      * @var boolean
diff --git a/Classes/ViewHelpers/LViewHelper.php b/Classes/ViewHelpers/LViewHelper.php
index e61a1aa22..a71836962 100644
--- a/Classes/ViewHelpers/LViewHelper.php
+++ b/Classes/ViewHelpers/LViewHelper.php
@@ -13,7 +13,7 @@
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### L (localisation) ViewHelper
diff --git a/Classes/ViewHelpers/Math/AbstractMultipleMathViewHelper.php b/Classes/ViewHelpers/Math/AbstractMultipleMathViewHelper.php
index 2da39e109..2e1ef8d74 100644
--- a/Classes/ViewHelpers/Math/AbstractMultipleMathViewHelper.php
+++ b/Classes/ViewHelpers/Math/AbstractMultipleMathViewHelper.php
@@ -13,7 +13,7 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Base class: Math ViewHelpers operating on one number or an
diff --git a/Classes/ViewHelpers/Math/AbstractSingleMathViewHelper.php b/Classes/ViewHelpers/Math/AbstractSingleMathViewHelper.php
index ef111d178..844bc562d 100644
--- a/Classes/ViewHelpers/Math/AbstractSingleMathViewHelper.php
+++ b/Classes/ViewHelpers/Math/AbstractSingleMathViewHelper.php
@@ -12,7 +12,7 @@
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Base class: Math ViewHelpers operating on one number or an
diff --git a/Classes/ViewHelpers/Math/AverageViewHelper.php b/Classes/ViewHelpers/Math/AverageViewHelper.php
index 2e479455e..c2f18138a 100644
--- a/Classes/ViewHelpers/Math/AverageViewHelper.php
+++ b/Classes/ViewHelpers/Math/AverageViewHelper.php
@@ -8,8 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Average
@@ -26,6 +27,7 @@ class AverageViewHelper extends AbstractMultipleMathViewHelper
 {
     use CompileWithContentArgumentAndRenderStatic;
     use ArrayConsumingViewHelperTrait;
+    use ArgumentOverride;
 
     public function initializeArguments(): void
     {
diff --git a/Classes/ViewHelpers/Math/CeilViewHelper.php b/Classes/ViewHelpers/Math/CeilViewHelper.php
index 41e04ae14..393ab2432 100644
--- a/Classes/ViewHelpers/Math/CeilViewHelper.php
+++ b/Classes/ViewHelpers/Math/CeilViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Ceil
diff --git a/Classes/ViewHelpers/Math/CubeViewHelper.php b/Classes/ViewHelpers/Math/CubeViewHelper.php
index ddc76b68f..6b41da776 100644
--- a/Classes/ViewHelpers/Math/CubeViewHelper.php
+++ b/Classes/ViewHelpers/Math/CubeViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Square
diff --git a/Classes/ViewHelpers/Math/CubicRootViewHelper.php b/Classes/ViewHelpers/Math/CubicRootViewHelper.php
index 5950e5c36..e85982734 100644
--- a/Classes/ViewHelpers/Math/CubicRootViewHelper.php
+++ b/Classes/ViewHelpers/Math/CubicRootViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: CubicRoot
diff --git a/Classes/ViewHelpers/Math/DivisionViewHelper.php b/Classes/ViewHelpers/Math/DivisionViewHelper.php
index 9361956ab..a3dba9f35 100644
--- a/Classes/ViewHelpers/Math/DivisionViewHelper.php
+++ b/Classes/ViewHelpers/Math/DivisionViewHelper.php
@@ -9,7 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Division
diff --git a/Classes/ViewHelpers/Math/FloorViewHelper.php b/Classes/ViewHelpers/Math/FloorViewHelper.php
index 2b285e3df..abaf49fd4 100644
--- a/Classes/ViewHelpers/Math/FloorViewHelper.php
+++ b/Classes/ViewHelpers/Math/FloorViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Floor
diff --git a/Classes/ViewHelpers/Math/MaximumViewHelper.php b/Classes/ViewHelpers/Math/MaximumViewHelper.php
index 2bd0cfcd4..5409c224b 100644
--- a/Classes/ViewHelpers/Math/MaximumViewHelper.php
+++ b/Classes/ViewHelpers/Math/MaximumViewHelper.php
@@ -8,9 +8,10 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Maximum
@@ -22,6 +23,7 @@ class MaximumViewHelper extends AbstractMultipleMathViewHelper
 {
     use CompileWithContentArgumentAndRenderStatic;
     use ArrayConsumingViewHelperTrait;
+    use ArgumentOverride;
 
     public function initializeArguments(): void
     {
diff --git a/Classes/ViewHelpers/Math/MedianViewHelper.php b/Classes/ViewHelpers/Math/MedianViewHelper.php
index dcccf9e62..701ca16c3 100644
--- a/Classes/ViewHelpers/Math/MedianViewHelper.php
+++ b/Classes/ViewHelpers/Math/MedianViewHelper.php
@@ -9,7 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Median
diff --git a/Classes/ViewHelpers/Math/MinimumViewHelper.php b/Classes/ViewHelpers/Math/MinimumViewHelper.php
index 3140d08d8..77efd85d1 100644
--- a/Classes/ViewHelpers/Math/MinimumViewHelper.php
+++ b/Classes/ViewHelpers/Math/MinimumViewHelper.php
@@ -8,9 +8,10 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Minimum
@@ -22,6 +23,7 @@ class MinimumViewHelper extends AbstractMultipleMathViewHelper
 {
     use CompileWithContentArgumentAndRenderStatic;
     use ArrayConsumingViewHelperTrait;
+    use ArgumentOverride;
 
     public function initializeArguments(): void
     {
diff --git a/Classes/ViewHelpers/Math/ModuloViewHelper.php b/Classes/ViewHelpers/Math/ModuloViewHelper.php
index f74935e25..a07bbc1f4 100644
--- a/Classes/ViewHelpers/Math/ModuloViewHelper.php
+++ b/Classes/ViewHelpers/Math/ModuloViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Modulo
diff --git a/Classes/ViewHelpers/Math/PowerViewHelper.php b/Classes/ViewHelpers/Math/PowerViewHelper.php
index 424a34d2e..3cf238be3 100644
--- a/Classes/ViewHelpers/Math/PowerViewHelper.php
+++ b/Classes/ViewHelpers/Math/PowerViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Power
diff --git a/Classes/ViewHelpers/Math/ProductViewHelper.php b/Classes/ViewHelpers/Math/ProductViewHelper.php
index c526494b8..9a7499ed9 100644
--- a/Classes/ViewHelpers/Math/ProductViewHelper.php
+++ b/Classes/ViewHelpers/Math/ProductViewHelper.php
@@ -10,7 +10,7 @@
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Math: Product (multiplication)
diff --git a/Classes/ViewHelpers/Math/RangeViewHelper.php b/Classes/ViewHelpers/Math/RangeViewHelper.php
index ed74629f3..3d7998c39 100644
--- a/Classes/ViewHelpers/Math/RangeViewHelper.php
+++ b/Classes/ViewHelpers/Math/RangeViewHelper.php
@@ -9,7 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Range
diff --git a/Classes/ViewHelpers/Math/RoundViewHelper.php b/Classes/ViewHelpers/Math/RoundViewHelper.php
index b9611aa1e..6a2317237 100644
--- a/Classes/ViewHelpers/Math/RoundViewHelper.php
+++ b/Classes/ViewHelpers/Math/RoundViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Round
diff --git a/Classes/ViewHelpers/Math/SquareRootViewHelper.php b/Classes/ViewHelpers/Math/SquareRootViewHelper.php
index 30cbd4673..226bca611 100644
--- a/Classes/ViewHelpers/Math/SquareRootViewHelper.php
+++ b/Classes/ViewHelpers/Math/SquareRootViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: SquareRoot
diff --git a/Classes/ViewHelpers/Math/SquareViewHelper.php b/Classes/ViewHelpers/Math/SquareViewHelper.php
index 93ef72a5c..8ae2ccba6 100644
--- a/Classes/ViewHelpers/Math/SquareViewHelper.php
+++ b/Classes/ViewHelpers/Math/SquareViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Square
diff --git a/Classes/ViewHelpers/Math/SubtractViewHelper.php b/Classes/ViewHelpers/Math/SubtractViewHelper.php
index 5cd247099..f63d3362f 100644
--- a/Classes/ViewHelpers/Math/SubtractViewHelper.php
+++ b/Classes/ViewHelpers/Math/SubtractViewHelper.php
@@ -8,9 +8,10 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Subtract
@@ -26,6 +27,7 @@ class SubtractViewHelper extends AbstractMultipleMathViewHelper
 {
     use CompileWithContentArgumentAndRenderStatic;
     use ArrayConsumingViewHelperTrait;
+    use ArgumentOverride;
 
     public function initializeArguments(): void
     {
diff --git a/Classes/ViewHelpers/Math/SumViewHelper.php b/Classes/ViewHelpers/Math/SumViewHelper.php
index ddc394fc6..e64442dc4 100644
--- a/Classes/ViewHelpers/Math/SumViewHelper.php
+++ b/Classes/ViewHelpers/Math/SumViewHelper.php
@@ -8,9 +8,10 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Math: Sum
@@ -26,6 +27,7 @@ class SumViewHelper extends AbstractMultipleMathViewHelper
 {
     use CompileWithContentArgumentAndRenderStatic;
     use ArrayConsumingViewHelperTrait;
+    use ArgumentOverride;
 
     public function initializeArguments(): void
     {
diff --git a/Classes/ViewHelpers/Media/AbstractMediaViewHelper.php b/Classes/ViewHelpers/Media/AbstractMediaViewHelper.php
index a78a25388..8405ea0fb 100755
--- a/Classes/ViewHelpers/Media/AbstractMediaViewHelper.php
+++ b/Classes/ViewHelpers/Media/AbstractMediaViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use FluidTYPO3\Vhs\Utility\ContextUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
@@ -18,6 +19,8 @@
  */
 abstract class AbstractMediaViewHelper extends AbstractTagBasedViewHelper
 {
+    use TagViewHelperCompatibility;
+
     protected string $mediaSource = '';
 
     public function initializeArguments(): void
diff --git a/Classes/ViewHelpers/Media/ExtensionViewHelper.php b/Classes/ViewHelpers/Media/ExtensionViewHelper.php
index 9be2c1121..5930a2c27 100644
--- a/Classes/ViewHelpers/Media/ExtensionViewHelper.php
+++ b/Classes/ViewHelpers/Media/ExtensionViewHelper.php
@@ -11,7 +11,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Returns the extension of the provided file.
diff --git a/Classes/ViewHelpers/Media/FilesViewHelper.php b/Classes/ViewHelpers/Media/FilesViewHelper.php
index 48e9d80dc..049af95b1 100644
--- a/Classes/ViewHelpers/Media/FilesViewHelper.php
+++ b/Classes/ViewHelpers/Media/FilesViewHelper.php
@@ -11,7 +11,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Returns an array of files found in the provided path.
diff --git a/Classes/ViewHelpers/Media/GravatarViewHelper.php b/Classes/ViewHelpers/Media/GravatarViewHelper.php
index 767558b02..f8c050088 100644
--- a/Classes/ViewHelpers/Media/GravatarViewHelper.php
+++ b/Classes/ViewHelpers/Media/GravatarViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
 /**
@@ -15,6 +16,8 @@
  */
 class GravatarViewHelper extends AbstractTagBasedViewHelper
 {
+    use TagViewHelperCompatibility;
+
     /**
      * Base url
      *
diff --git a/Classes/ViewHelpers/Media/PictureViewHelper.php b/Classes/ViewHelpers/Media/PictureViewHelper.php
index c656f3c8b..494af2515 100644
--- a/Classes/ViewHelpers/Media/PictureViewHelper.php
+++ b/Classes/ViewHelpers/Media/PictureViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
@@ -35,6 +36,8 @@
  */
 class PictureViewHelper extends AbstractTagBasedViewHelper
 {
+    use TagViewHelperCompatibility;
+
     const SCOPE = 'FluidTYPO3\Vhs\ViewHelpers\Media\PictureViewHelper';
     const SCOPE_VARIABLE_SRC = 'src';
     const SCOPE_VARIABLE_ID = 'treatIdAsReference';
diff --git a/Classes/ViewHelpers/Media/SizeViewHelper.php b/Classes/ViewHelpers/Media/SizeViewHelper.php
index fec2866e7..483ce59d3 100644
--- a/Classes/ViewHelpers/Media/SizeViewHelper.php
+++ b/Classes/ViewHelpers/Media/SizeViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Returns the size of the provided file in bytes.
diff --git a/Classes/ViewHelpers/Media/SourceViewHelper.php b/Classes/ViewHelpers/Media/SourceViewHelper.php
index 73be48bfd..a9d88d031 100644
--- a/Classes/ViewHelpers/Media/SourceViewHelper.php
+++ b/Classes/ViewHelpers/Media/SourceViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use FluidTYPO3\Vhs\Utility\ContextUtility;
 use FluidTYPO3\Vhs\Utility\FrontendSimulationUtility;
@@ -26,6 +27,8 @@
  */
 class SourceViewHelper extends AbstractTagBasedViewHelper
 {
+    use TagViewHelperCompatibility;
+
     const SCOPE = 'FluidTYPO3\Vhs\ViewHelpers\Media\PictureViewHelper';
     const SCOPE_VARIABLE_SRC = 'src';
     const SCOPE_VARIABLE_ID = 'treatIdAsReference';
diff --git a/Classes/ViewHelpers/Media/SpotifyViewHelper.php b/Classes/ViewHelpers/Media/SpotifyViewHelper.php
index d9a065896..711fa9567 100644
--- a/Classes/ViewHelpers/Media/SpotifyViewHelper.php
+++ b/Classes/ViewHelpers/Media/SpotifyViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
 /**
@@ -15,6 +16,8 @@
  */
 class SpotifyViewHelper extends AbstractTagBasedViewHelper
 {
+    use TagViewHelperCompatibility;
+
     /**
      * Play button base url
      */
diff --git a/Classes/ViewHelpers/Media/VimeoViewHelper.php b/Classes/ViewHelpers/Media/VimeoViewHelper.php
index 586fd2532..ade0b18e9 100644
--- a/Classes/ViewHelpers/Media/VimeoViewHelper.php
+++ b/Classes/ViewHelpers/Media/VimeoViewHelper.php
@@ -8,6 +8,8 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
 /**
@@ -15,6 +17,9 @@
  */
 class VimeoViewHelper extends AbstractTagBasedViewHelper
 {
+    use ArgumentOverride;
+    use TagViewHelperCompatibility;
+
     /**
      * Base URL for Vimeo video player
      */
diff --git a/Classes/ViewHelpers/Media/YoutubeViewHelper.php b/Classes/ViewHelpers/Media/YoutubeViewHelper.php
index 68760055a..aa60ba623 100644
--- a/Classes/ViewHelpers/Media/YoutubeViewHelper.php
+++ b/Classes/ViewHelpers/Media/YoutubeViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
 /**
@@ -15,6 +16,8 @@
  */
 class YoutubeViewHelper extends AbstractTagBasedViewHelper
 {
+    use TagViewHelperCompatibility;
+
     /**
      * Base url
      *
diff --git a/Classes/ViewHelpers/Menu/DeferredViewHelper.php b/Classes/ViewHelpers/Menu/DeferredViewHelper.php
index cd2a0faa6..ba05f8da3 100644
--- a/Classes/ViewHelpers/Menu/DeferredViewHelper.php
+++ b/Classes/ViewHelpers/Menu/DeferredViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
@@ -20,6 +21,8 @@
  */
 class DeferredViewHelper extends AbstractMenuViewHelper
 {
+    use ArgumentOverride;
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
diff --git a/Classes/ViewHelpers/OrViewHelper.php b/Classes/ViewHelpers/OrViewHelper.php
index cd6926a4c..8db794a7f 100644
--- a/Classes/ViewHelpers/OrViewHelper.php
+++ b/Classes/ViewHelpers/OrViewHelper.php
@@ -13,7 +13,7 @@
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * If content is empty use alternative text (can also be LLL:labelname shortcut or LLL:EXT: file paths).
diff --git a/Classes/ViewHelpers/Page/AbsoluteUrlViewHelper.php b/Classes/ViewHelpers/Page/AbsoluteUrlViewHelper.php
index b2a82f093..6334cd8b3 100644
--- a/Classes/ViewHelpers/Page/AbsoluteUrlViewHelper.php
+++ b/Classes/ViewHelpers/Page/AbsoluteUrlViewHelper.php
@@ -11,7 +11,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * Returns a full, absolute URL to this page with all arguments.
diff --git a/Classes/ViewHelpers/Page/BreadCrumbViewHelper.php b/Classes/ViewHelpers/Page/BreadCrumbViewHelper.php
index f5780328b..7595844c6 100644
--- a/Classes/ViewHelpers/Page/BreadCrumbViewHelper.php
+++ b/Classes/ViewHelpers/Page/BreadCrumbViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\ViewHelpers\Menu\AbstractMenuViewHelper;
 use TYPO3\CMS\Core\Domain\Repository\PageRepository;
 
@@ -16,6 +17,8 @@
  */
 class BreadCrumbViewHelper extends AbstractMenuViewHelper
 {
+    use ArgumentOverride;
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
diff --git a/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php b/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php
index 72cc73f99..e5239fefa 100644
--- a/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php
+++ b/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\PageRendererTrait;
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use FluidTYPO3\Vhs\Utility\ContextUtility;
 use FluidTYPO3\Vhs\Utility\RequestResolver;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -21,6 +22,7 @@
 class CanonicalViewHelper extends AbstractTagBasedViewHelper
 {
     use PageRendererTrait;
+    use TagViewHelperCompatibility;
 
     /**
      * @var string
diff --git a/Classes/ViewHelpers/Page/Header/TitleViewHelper.php b/Classes/ViewHelpers/Page/Header/TitleViewHelper.php
index 5ac22bc3d..69050f977 100644
--- a/Classes/ViewHelpers/Page/Header/TitleViewHelper.php
+++ b/Classes/ViewHelpers/Page/Header/TitleViewHelper.php
@@ -12,7 +12,7 @@
 use FluidTYPO3\Vhs\Utility\ContextUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### ViewHelper used to override page title
diff --git a/Classes/ViewHelpers/Page/InfoViewHelper.php b/Classes/ViewHelpers/Page/InfoViewHelper.php
index b282388d3..a2a85cfa5 100644
--- a/Classes/ViewHelpers/Page/InfoViewHelper.php
+++ b/Classes/ViewHelpers/Page/InfoViewHelper.php
@@ -13,7 +13,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ViewHelper to access data of the current page record.
diff --git a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
index 634176823..c406bdff3 100644
--- a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
+++ b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use FluidTYPO3\Vhs\Utility\CoreUtility;
 use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
@@ -33,6 +34,7 @@
 class LanguageMenuViewHelper extends AbstractTagBasedViewHelper
 {
     use ArrayConsumingViewHelperTrait;
+    use TagViewHelperCompatibility;
 
     protected array $languageMenu = [];
     protected int $defaultLangUid = 0;
diff --git a/Classes/ViewHelpers/Page/LanguageViewHelper.php b/Classes/ViewHelpers/Page/LanguageViewHelper.php
index 8025121df..5dc3e6894 100644
--- a/Classes/ViewHelpers/Page/LanguageViewHelper.php
+++ b/Classes/ViewHelpers/Page/LanguageViewHelper.php
@@ -15,7 +15,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * Returns the current language from languages depending on l18n settings.
diff --git a/Classes/ViewHelpers/Page/LinkViewHelper.php b/Classes/ViewHelpers/Page/LinkViewHelper.php
index 8c661119b..39fbb9022 100644
--- a/Classes/ViewHelpers/Page/LinkViewHelper.php
+++ b/Classes/ViewHelpers/Page/LinkViewHelper.php
@@ -10,6 +10,7 @@
 
 use FluidTYPO3\Vhs\Service\PageService;
 use FluidTYPO3\Vhs\Traits\PageRecordViewHelperTrait;
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\RequestResolver;
 use TYPO3\CMS\Core\Context\Context;
@@ -36,9 +37,9 @@
  */
 class LinkViewHelper extends AbstractTagBasedViewHelper
 {
-
     use PageRecordViewHelperTrait;
     use TemplateVariableViewHelperTrait;
+    use TagViewHelperCompatibility;
 
     /**
      * @var PageService
diff --git a/Classes/ViewHelpers/Page/Resources/FalViewHelper.php b/Classes/ViewHelpers/Page/Resources/FalViewHelper.php
index 0f53957b4..24408d2a0 100644
--- a/Classes/ViewHelpers/Page/Resources/FalViewHelper.php
+++ b/Classes/ViewHelpers/Page/Resources/FalViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Service\PageService;
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\Traits\SlideViewHelperTrait;
 use FluidTYPO3\Vhs\ViewHelpers\Resource\Record\FalViewHelper as ResourcesFalViewHelper;
 use TYPO3\CMS\Core\Context\Context;
@@ -27,6 +28,7 @@
 class FalViewHelper extends ResourcesFalViewHelper
 {
     use SlideViewHelperTrait;
+    use ArgumentOverride;
 
     const DEFAULT_TABLE = 'pages';
     const DEFAULT_FIELD = 'media';
diff --git a/Classes/ViewHelpers/Page/ResourcesViewHelper.php b/Classes/ViewHelpers/Page/ResourcesViewHelper.php
index c086094eb..769363952 100644
--- a/Classes/ViewHelpers/Page/ResourcesViewHelper.php
+++ b/Classes/ViewHelpers/Page/ResourcesViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\ArgumentOverride;
 use FluidTYPO3\Vhs\ViewHelpers\Resource\RecordViewHelper;
 
 /**
@@ -15,6 +16,8 @@
  */
 class ResourcesViewHelper extends RecordViewHelper
 {
+    use ArgumentOverride;
+
     const DEFAULT_TABLE = 'pages';
     const DEFAULT_FIELD = 'media';
 
diff --git a/Classes/ViewHelpers/Page/RootlineViewHelper.php b/Classes/ViewHelpers/Page/RootlineViewHelper.php
index 696be6005..f83ac62a3 100644
--- a/Classes/ViewHelpers/Page/RootlineViewHelper.php
+++ b/Classes/ViewHelpers/Page/RootlineViewHelper.php
@@ -13,7 +13,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ViewHelper to get the rootline of a page.
diff --git a/Classes/ViewHelpers/Page/StaticPrefixViewHelper.php b/Classes/ViewHelpers/Page/StaticPrefixViewHelper.php
index 288b99291..a857cd7d1 100644
--- a/Classes/ViewHelpers/Page/StaticPrefixViewHelper.php
+++ b/Classes/ViewHelpers/Page/StaticPrefixViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Page: Static Prefix
diff --git a/Classes/ViewHelpers/Random/NumberViewHelper.php b/Classes/ViewHelpers/Random/NumberViewHelper.php
index dfa204bdc..1ebde7779 100644
--- a/Classes/ViewHelpers/Random/NumberViewHelper.php
+++ b/Classes/ViewHelpers/Random/NumberViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Random: Number Generator
diff --git a/Classes/ViewHelpers/Random/StringViewHelper.php b/Classes/ViewHelpers/Random/StringViewHelper.php
index 975f4c868..b3ed91e62 100644
--- a/Classes/ViewHelpers/Random/StringViewHelper.php
+++ b/Classes/ViewHelpers/Random/StringViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Random: String Generator
diff --git a/Classes/ViewHelpers/Render/AsciiViewHelper.php b/Classes/ViewHelpers/Render/AsciiViewHelper.php
index ee6b4af8d..6822db0b0 100644
--- a/Classes/ViewHelpers/Render/AsciiViewHelper.php
+++ b/Classes/ViewHelpers/Render/AsciiViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Render: ASCII Character
diff --git a/Classes/ViewHelpers/Render/CacheViewHelper.php b/Classes/ViewHelpers/Render/CacheViewHelper.php
index cfe3fc80a..6fb0fbd5d 100644
--- a/Classes/ViewHelpers/Render/CacheViewHelper.php
+++ b/Classes/ViewHelpers/Render/CacheViewHelper.php
@@ -13,7 +13,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Cache Rendering ViewHelper
diff --git a/Classes/ViewHelpers/Render/InlineViewHelper.php b/Classes/ViewHelpers/Render/InlineViewHelper.php
index 60724f24b..df8af7c1f 100644
--- a/Classes/ViewHelpers/Render/InlineViewHelper.php
+++ b/Classes/ViewHelpers/Render/InlineViewHelper.php
@@ -9,7 +9,7 @@
  */
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Render: Inline
diff --git a/Classes/ViewHelpers/Render/RecordViewHelper.php b/Classes/ViewHelpers/Render/RecordViewHelper.php
index 5235044f8..f32cc54a2 100644
--- a/Classes/ViewHelpers/Render/RecordViewHelper.php
+++ b/Classes/ViewHelpers/Render/RecordViewHelper.php
@@ -10,7 +10,7 @@
 
 use FluidTYPO3\Vhs\ViewHelpers\Content\AbstractContentViewHelper;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ViewHelper used to render raw content records typically fetched
diff --git a/Classes/ViewHelpers/Render/RequestViewHelper.php b/Classes/ViewHelpers/Render/RequestViewHelper.php
index 70c372a37..2a60aee5e 100644
--- a/Classes/ViewHelpers/Render/RequestViewHelper.php
+++ b/Classes/ViewHelpers/Render/RequestViewHelper.php
@@ -22,7 +22,7 @@
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Render: Request
diff --git a/Classes/ViewHelpers/Render/UncacheViewHelper.php b/Classes/ViewHelpers/Render/UncacheViewHelper.php
index 356b96e50..dc82040a3 100644
--- a/Classes/ViewHelpers/Render/UncacheViewHelper.php
+++ b/Classes/ViewHelpers/Render/UncacheViewHelper.php
@@ -20,7 +20,7 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * Uncaches partials. Use like ``f:render``.
diff --git a/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php b/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php
index 020d20f12..94c732ce9 100644
--- a/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php
+++ b/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Utility\ResourceUtility;
 use TYPO3\CMS\Core\Database\Connection;
@@ -23,6 +24,8 @@
  */
 abstract class AbstractResourceViewHelper extends AbstractTagBasedViewHelper
 {
+    use TagViewHelperCompatibility;
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
diff --git a/Classes/ViewHelpers/Site/NameViewHelper.php b/Classes/ViewHelpers/Site/NameViewHelper.php
index 1ab71a81e..3a36e4b9f 100644
--- a/Classes/ViewHelpers/Site/NameViewHelper.php
+++ b/Classes/ViewHelpers/Site/NameViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Site: Name
diff --git a/Classes/ViewHelpers/Site/UrlViewHelper.php b/Classes/ViewHelpers/Site/UrlViewHelper.php
index 6eb61c95d..899455dc8 100644
--- a/Classes/ViewHelpers/Site/UrlViewHelper.php
+++ b/Classes/ViewHelpers/Site/UrlViewHelper.php
@@ -11,7 +11,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Site: URL
diff --git a/Classes/ViewHelpers/System/DateTimeViewHelper.php b/Classes/ViewHelpers/System/DateTimeViewHelper.php
index 17a2577bf..bfac0c698 100644
--- a/Classes/ViewHelpers/System/DateTimeViewHelper.php
+++ b/Classes/ViewHelpers/System/DateTimeViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### System: DateTime
diff --git a/Classes/ViewHelpers/System/TimestampViewHelper.php b/Classes/ViewHelpers/System/TimestampViewHelper.php
index 768a53418..a9a953c9f 100644
--- a/Classes/ViewHelpers/System/TimestampViewHelper.php
+++ b/Classes/ViewHelpers/System/TimestampViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### System: UNIX Timestamp
diff --git a/Classes/ViewHelpers/System/UniqIdViewHelper.php b/Classes/ViewHelpers/System/UniqIdViewHelper.php
index 3c79f4552..68f047db3 100644
--- a/Classes/ViewHelpers/System/UniqIdViewHelper.php
+++ b/Classes/ViewHelpers/System/UniqIdViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### System: Unique ID
diff --git a/Classes/ViewHelpers/TagViewHelper.php b/Classes/ViewHelpers/TagViewHelper.php
index 74567e993..5ba89f3f5 100644
--- a/Classes/ViewHelpers/TagViewHelper.php
+++ b/Classes/ViewHelpers/TagViewHelper.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use FluidTYPO3\Vhs\Traits\TagViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
diff --git a/Classes/ViewHelpers/Uri/GravatarViewHelper.php b/Classes/ViewHelpers/Uri/GravatarViewHelper.php
index 1c67ae292..db531b889 100644
--- a/Classes/ViewHelpers/Uri/GravatarViewHelper.php
+++ b/Classes/ViewHelpers/Uri/GravatarViewHelper.php
@@ -11,7 +11,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * Renders Gravatar URI.
diff --git a/Classes/ViewHelpers/Uri/RequestViewHelper.php b/Classes/ViewHelpers/Uri/RequestViewHelper.php
index 76599bc88..c5e386f70 100644
--- a/Classes/ViewHelpers/Uri/RequestViewHelper.php
+++ b/Classes/ViewHelpers/Uri/RequestViewHelper.php
@@ -11,7 +11,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Uri: Request
diff --git a/Classes/ViewHelpers/Variable/ConvertViewHelper.php b/Classes/ViewHelpers/Variable/ConvertViewHelper.php
index f4b628143..8fecb21d7 100644
--- a/Classes/ViewHelpers/Variable/ConvertViewHelper.php
+++ b/Classes/ViewHelpers/Variable/ConvertViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Convert ViewHelper
diff --git a/Classes/ViewHelpers/Variable/ExtensionConfigurationViewHelper.php b/Classes/ViewHelpers/Variable/ExtensionConfigurationViewHelper.php
index e2ff4917c..d69847f4c 100644
--- a/Classes/ViewHelpers/Variable/ExtensionConfigurationViewHelper.php
+++ b/Classes/ViewHelpers/Variable/ExtensionConfigurationViewHelper.php
@@ -15,7 +15,7 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### ExtConf ViewHelper
diff --git a/Classes/ViewHelpers/Variable/GetViewHelper.php b/Classes/ViewHelpers/Variable/GetViewHelper.php
index 3df239894..7f8eb7ea4 100644
--- a/Classes/ViewHelpers/Variable/GetViewHelper.php
+++ b/Classes/ViewHelpers/Variable/GetViewHelper.php
@@ -11,7 +11,7 @@
 use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Variable: Get
diff --git a/Classes/ViewHelpers/Variable/PregMatchViewHelper.php b/Classes/ViewHelpers/Variable/PregMatchViewHelper.php
index 765f92ba0..9b68ef252 100644
--- a/Classes/ViewHelpers/Variable/PregMatchViewHelper.php
+++ b/Classes/ViewHelpers/Variable/PregMatchViewHelper.php
@@ -11,7 +11,7 @@
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### PregMatch regular expression ViewHelper
diff --git a/Classes/ViewHelpers/Variable/Register/GetViewHelper.php b/Classes/ViewHelpers/Variable/Register/GetViewHelper.php
index 6ceadcbea..6087b2b50 100644
--- a/Classes/ViewHelpers/Variable/Register/GetViewHelper.php
+++ b/Classes/ViewHelpers/Variable/Register/GetViewHelper.php
@@ -11,7 +11,7 @@
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Variable\Register: Get
diff --git a/Classes/ViewHelpers/Variable/Register/SetViewHelper.php b/Classes/ViewHelpers/Variable/Register/SetViewHelper.php
index 6bbd94d71..4a00ffef1 100644
--- a/Classes/ViewHelpers/Variable/Register/SetViewHelper.php
+++ b/Classes/ViewHelpers/Variable/Register/SetViewHelper.php
@@ -11,7 +11,7 @@
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Variable\Register: Set
diff --git a/Classes/ViewHelpers/Variable/SetViewHelper.php b/Classes/ViewHelpers/Variable/SetViewHelper.php
index 705225806..c2cd4c2d2 100644
--- a/Classes/ViewHelpers/Variable/SetViewHelper.php
+++ b/Classes/ViewHelpers/Variable/SetViewHelper.php
@@ -11,7 +11,7 @@
 use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Variable: Set
diff --git a/Classes/ViewHelpers/Variable/TyposcriptViewHelper.php b/Classes/ViewHelpers/Variable/TyposcriptViewHelper.php
index 12e912dc1..365fe162b 100644
--- a/Classes/ViewHelpers/Variable/TyposcriptViewHelper.php
+++ b/Classes/ViewHelpers/Variable/TyposcriptViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * ### Variable: TypoScript
diff --git a/Classes/ViewHelpers/Variable/UnsetViewHelper.php b/Classes/ViewHelpers/Variable/UnsetViewHelper.php
index 9b614c245..7717d4081 100644
--- a/Classes/ViewHelpers/Variable/UnsetViewHelper.php
+++ b/Classes/ViewHelpers/Variable/UnsetViewHelper.php
@@ -10,7 +10,7 @@
 
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Variable: Unset
@@ -48,7 +48,7 @@ public function initializeArguments(): void
     }
 
     /**
-     * @return void
+     * @return null
      */
     public static function renderStatic(
         array $arguments,
@@ -61,5 +61,6 @@ public static function renderStatic(
         if ($variableProvider->exists($name)) {
             $variableProvider->remove($name);
         }
+        return null;
     }
 }