🐛 fix TYPO3 13.4

andersundsehr · Oct 28, 2024 · 0a48d0e · 0a48d0e
1 parent c094f18
commit 0a48d0e
Show file tree

Hide file tree

Showing 4 changed files with 666 additions and 680 deletions.
diff --git a/Classes/UnleashFactory.php b/Classes/UnleashFactory.php
@@ -25,7 +25,7 @@ public function __construct(
     public function getConfig(string $key): string
     {
         return $this->extensionConfiguration->get('unleash', $key)
-            ?: throw new RuntimeException('Missing ' . $key . ' in configuration');
+            ?: throw new RuntimeException('Missing ' . $key . ' in configuration', 1132011323);
     }
 
     public function __invoke(): Unleash

diff --git a/Classes/ViewHelpers/GetVariantViewHelper.php b/Classes/ViewHelpers/GetVariantViewHelper.php
@@ -4,29 +4,24 @@
 
 namespace Andersundsehr\Unleash\ViewHelpers;
 
-use Closure;
 use Override;
-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 Unleash\Client\Unleash;
 
 final class GetVariantViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
+    public function __construct(private readonly Unleash $unleash)
+    {
+    }
 
     #[Override]
     public function initializeArguments(): void
     {
         $this->registerArgument('feature', 'string', 'Feature name', true);
     }
 
-    #[Override]
-    public static function renderStatic(array $arguments, Closure $renderChildrenClosure, RenderingContextInterface $renderingContext): ?string
+    public function render(): ?string
     {
-        $unleash = GeneralUtility::makeInstance(Unleash::class);
-        assert($unleash instanceof Unleash);
-        return $unleash->getVariant($arguments['feature'])->getPayload()?->getValue() ?: null;
+        return $this->unleash->getVariant($this->arguments['feature'])->getPayload()?->getValue() ?: null;
     }
 }
diff --git a/Classes/ViewHelpers/IsEnabledViewHelper.php b/Classes/ViewHelpers/IsEnabledViewHelper.php
@@ -6,6 +6,7 @@
 
 use Override;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
 use Unleash\Client\Unleash;
 
@@ -21,12 +22,10 @@ public function initializeArguments(): void
 
     /**
      * @param array{feature: string, default: bool} $arguments
-     * @return bool
      */
     #[Override]
-    protected static function evaluateCondition($arguments = null)
+    public static function verdict(array $arguments, RenderingContextInterface $renderingContext): bool
     {
-        assert(is_array($arguments), 'Arguments must be an array');
         $unleash = GeneralUtility::makeInstance(Unleash::class);
         assert($unleash instanceof Unleash);
         return $unleash->isEnabled($arguments['feature'], default: (bool)$arguments['default']);