[TASK] Fix ViewHelpers

Author: georgringer

Classes/ViewHelpers/Clean/DomainViewHelper.php

@@ -12,28 +12,21 @@
  */
 
 use FriendsOfTYPO3\TtAddress\Utility\PropertyModification;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class DomainViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
-    /**
-     * Initialize arguments
-     */
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         $this->registerArgument('value', 'string', 'value');
     }
 
     /**
      * @return string
      */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+    public function render()
     {
-        $value = $arguments['value'] ?: $renderChildrenClosure();
+        $value = $this->arguments['value'] ?: $this->renderChildren();
         return PropertyModification::getCleanedDomain($value);
     }
 }

Classes/ViewHelpers/Clean/PhoneNumberViewHelper.php

@@ -12,28 +12,21 @@
  */
 
 use FriendsOfTYPO3\TtAddress\Utility\PropertyModification;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class PhoneNumberViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
-    /**
-     * Initialize arguments
-     */
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         $this->registerArgument('value', 'string', 'value');
     }
 
     /**
      * @return string
      */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+    public function render()
     {
-        $value = $arguments['value'] ?: $renderChildrenClosure();
+        $value = $this->arguments['value'] ?: $this->renderChildren();
         return PropertyModification::getCleanedNumber($value);
     }
 }

Classes/ViewHelpers/MetaTagViewHelper.php

@@ -13,18 +13,14 @@
 
 use TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry;
 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;
 
 class MetaTagViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     /**
      * Initialize arguments
      */
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         $this->registerArgument('property', 'string', 'Property to be set', true);
         $this->registerArgument('value', 'string', 'value');
@@ -33,11 +29,11 @@ public function initializeArguments()
     /**
      * @return string
      */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+    public function render()
     {
-        $value = trim($arguments['value'] ?: $renderChildrenClosure());
+        $value = trim($this->arguments['value'] ?: $this->renderChildren());
         if ($value) {
-            $property = $arguments['property'];
+            $property = $this->arguments['property'];
             $metaTagManager = GeneralUtility::makeInstance(MetaTagManagerRegistry::class)->getManagerForProperty($property);
             // @extensionScannerIgnoreLine
             $metaTagManager->addProperty($property, $value);

Classes/ViewHelpers/RemoveSpacesViewHelper.php

@@ -10,28 +10,21 @@
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
  */
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class RemoveSpacesViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
-    /**
-     * Initialize arguments
-     */
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         $this->registerArgument('value', 'string', 'value');
     }
 
     /**
      * @return string
      */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+    public function render()
     {
-        $value = $arguments['value'] ?: $renderChildrenClosure();
+        $value = $this->arguments['value'] ?: $this->renderChildren();
         return str_replace(' ', '', $value);
     }
 }

Classes/ViewHelpers/StaticGoogleMapsViewHelper.php

@@ -13,17 +13,10 @@
 
 use FriendsOfTYPO3\TtAddress\Domain\Model\Address;
 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;
 
 class StaticGoogleMapsViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
-    /**
-     * Initialize arguments
-     */
     public function initializeArguments(): void
     {
         $this->registerArgument('addresses', 'mixed', 'Addresses', true);
@@ -33,12 +26,12 @@ public function initializeArguments(): void
     /**
      * @return string
      */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+    public function render()
     {
-        $mapArguments = $arguments['parameters'];
+        $mapArguments = $this->arguments['parameters'];
 
         $markers = [];
-        foreach ($arguments['addresses'] as $address) {
+        foreach ($this->arguments['addresses'] as $address) {
             /* @var Address $address */
             $markers[] = '&markers=' . $address->getLatitude() . ',' . $address->getLongitude();
         }