[TASK] Avoid Fluid compile trait

FluidTYPO3 · Dec 9, 2024 · e2eb596 · e2eb596
1 parent 8610fcd
commit e2eb596
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git a/Classes/ViewHelpers/Content/GetViewHelper.php b/Classes/ViewHelpers/Content/GetViewHelper.php
@@ -25,7 +25,6 @@
 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;
 
 /**
  * Gets all child content of a record based on area.
@@ -55,8 +54,6 @@
  */
 class GetViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     /**
      * @var boolean
      */
@@ -88,6 +85,11 @@ public function initializeArguments(): void
         $this->registerArgument('hideUntranslated', 'boolean', 'Exclude untranslated records', false, false);
     }
 
+    public function render()
+    {
+        return self::renderStatic($this->arguments, $this->buildRenderChildrenClosure(), $this->renderingContext);
+    }
+
     /**
      * @return string|array|null
      */

diff --git a/Classes/ViewHelpers/Form/DataViewHelper.php b/Classes/ViewHelpers/Form/DataViewHelper.php
@@ -19,7 +19,6 @@
 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;
 
 /**
  * Converts raw flexform xml into an associative array, and applies any
@@ -47,8 +46,6 @@
  */
 class DataViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     /**
      * @var boolean
      */
@@ -67,6 +64,11 @@ public function initializeArguments(): void
         $this->registerArgument('as', 'string', 'Optional name of variable to assign in tag content rendering');
     }
 
+    public function render()
+    {
+        return self::renderStatic($this->arguments, $this->buildRenderChildrenClosure(), $this->renderingContext);
+    }
+
     /**
      * @return mixed
      */

diff --git a/Classes/ViewHelpers/Form/OptionViewHelper.php b/Classes/ViewHelpers/Form/OptionViewHelper.php
@@ -12,15 +12,12 @@
 use FluidTYPO3\Flux\Form\OptionCarryingInterface;
 use FluidTYPO3\Flux\ViewHelpers\AbstractFormViewHelper;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Form option ViewHelper
  */
 class OptionViewHelper extends AbstractFormViewHelper
 {
-    use CompileWithContentArgumentAndRenderStatic;
-
     public static string $option = '';
 
     public function initializeArguments(): void
@@ -29,6 +26,11 @@ public function initializeArguments(): void
         $this->registerArgument('name', 'string', 'Name of the option to be set', true);
     }
 
+    public function render()
+    {
+        return self::renderStatic($this->arguments, $this->buildRenderChildrenClosure(), $this->renderingContext);
+    }
+
     public static function renderStatic(
         array $arguments,
         \Closure $renderChildrenClosure,
@@ -54,4 +56,9 @@ public static function renderStatic(
             1602693000
         );
     }
+
+    public function getContentArgumentName(): ?string
+    {
+        return 'value';
+    }
 }
diff --git a/Classes/ViewHelpers/Form/RenderViewHelper.php b/Classes/ViewHelpers/Form/RenderViewHelper.php
@@ -15,7 +15,6 @@
 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;
 
 /**
  * ## Main form rendering ViewHelper
@@ -24,8 +23,6 @@
  */
 class RenderViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     /**
      * @var boolean
      */
@@ -36,6 +33,11 @@ public function initializeArguments(): void
         $this->registerArgument('form', Form::class, 'Form instance to render as HTML', true);
     }
 
+    public function render()
+    {
+        return self::renderStatic($this->arguments, $this->buildRenderChildrenClosure(), $this->renderingContext);
+    }
+
     public static function renderStatic(
         array $arguments,
         \Closure $renderChildrenClosure,

diff --git a/Classes/ViewHelpers/Form/VariableViewHelper.php b/Classes/ViewHelpers/Form/VariableViewHelper.php
@@ -11,15 +11,12 @@
 
 use FluidTYPO3\Flux\ViewHelpers\AbstractFormViewHelper;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
  * Sets an option in the Form instance
  */
 class VariableViewHelper extends AbstractFormViewHelper
 {
-    use CompileWithContentArgumentAndRenderStatic;
-
     public function initializeArguments(): void
     {
         $this->registerArgument('value', 'mixed', 'Value of the option');
@@ -32,6 +29,11 @@ public function initializeArguments(): void
         );
     }
 
+    public function render()
+    {
+        return self::renderStatic($this->arguments, $this->buildRenderChildrenClosure(), $this->renderingContext);
+    }
+
     public static function renderStatic(
         array $arguments,
         \Closure $renderChildrenClosure,
@@ -43,4 +45,9 @@ public static function renderStatic(
             ->setVariable($variableName, $renderChildrenClosure());
         return '';
     }
+
+    public function getContentArgumentName(): ?string
+    {
+        return 'value';
+    }
 }