Merge pull request #67 from CPS-IT/feature/typo3-13.4

CPS-IT · Nov 14, 2024 · 0e70636 · 0e70636
2 parents d168fbe + 8a78547
commit 0e70636
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 28 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -15,11 +15,11 @@ jobs:
       fail-fast: false
       matrix:
         php-version: ["8.1", "8.2", "8.3", "8.4"]
-        typo3-version: ["11.5", "12.4", "13.0"]
+        typo3-version: ["11.5", "12.4", "13.4"]
         dependencies: ["highest", "lowest"]
         exclude:
           - php-version: "8.1"
-            typo3-version: "13.0"
+            typo3-version: "13.4"
           - php-version: "8.4"
             typo3-version: "11.5"
     env:

diff --git a/Classes/ViewHelpers/DateIntervalViewHelper.php b/Classes/ViewHelpers/DateIntervalViewHelper.php
@@ -34,19 +34,14 @@
  */
 final class DateIntervalViewHelper extends Fluid\Core\ViewHelper\AbstractViewHelper
 {
-    use Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
-
     public function initializeArguments(): void
     {
-        $this->registerArgument('date', \DateTimeInterface::class, 'The date for which to create an interval');
+        $this->registerArgument('date', \DateTimeInterface::class, 'The date for which to create an interval', true);
     }
 
-    public static function renderStatic(
-        array $arguments,
-        \Closure $renderChildrenClosure,
-        Fluid\Core\Rendering\RenderingContextInterface $renderingContext,
-    ): ?int {
-        $date = $renderChildrenClosure();
+    public function render(): ?int
+    {
+        $date = $this->renderChildren();
         /** @var int $now */
         $now = Core\Utility\GeneralUtility::makeInstance(Core\Context\Context::class)->getPropertyFromAspect('date', 'timestamp');
 
@@ -56,4 +51,9 @@ public static function renderStatic(
 
         return $now - $date->getTimestamp();
     }
+
+    public function getContentArgumentName(): string
+    {
+        return 'date';
+    }
 }
diff --git a/Classes/ViewHelpers/Format/HumanDateViewHelper.php b/Classes/ViewHelpers/Format/HumanDateViewHelper.php
@@ -34,20 +34,16 @@
  */
 final class HumanDateViewHelper extends Fluid\Core\ViewHelper\AbstractViewHelper
 {
-    use Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
     use Traits\TranslatableTrait;
 
     public function initializeArguments(): void
     {
-        $this->registerArgument('date', \DateTimeInterface::class, 'The date to format');
+        $this->registerArgument('date', \DateTimeInterface::class, 'The date to format', true);
     }
 
-    public static function renderStatic(
-        array $arguments,
-        \Closure $renderChildrenClosure,
-        Fluid\Core\Rendering\RenderingContextInterface $renderingContext,
-    ): ?string {
-        $date = $renderChildrenClosure();
+    public function render(): ?string
+    {
+        $date = $this->renderChildren();
 
         if (!($date instanceof \DateTimeInterface)) {
             return null;
@@ -60,6 +56,11 @@ public static function renderStatic(
         return self::renderHumanDateInterval($date, $delta, $interval);
     }
 
+    public function getContentArgumentName(): string
+    {
+        return 'date';
+    }
+
     private static function renderHumanDateInterval(\DateTimeInterface $date, int $delta, \DateInterval $interval): string
     {
         if ($delta <= 30) {

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ console commands to list and flush the mail queue.
 * Improved queueable file transport with failure metadata
 * Backend module to list mails in queue
 * Console command to list queue and flush mails
-* Compatible with TYPO3 11.5 LTS, 12.4 LTS and 13.0
+* Compatible with TYPO3 11.5 LTS, 12.4 LTS and 13.4 LTS
 
 ## 🔥 Installation
 

diff --git a/composer.json b/composer.json
@@ -18,10 +18,10 @@
 		"symfony/console": "^5.4 || ^6.4 || ^7.0",
 		"symfony/mailer": "^5.4 || ^6.4 || ^7.0",
 		"symfony/mime": "^5.4 || ^6.4 || ^7.0",
-		"typo3/cms-backend": "~11.5.0 || ~12.4.0 || ~13.0.0",
-		"typo3/cms-core": "~11.5.0 || ~12.4.0 || ~13.0.0",
-		"typo3/cms-fluid": "~11.5.0 || ~12.4.0 || ~13.0.0",
-		"typo3fluid/fluid": "^2.7"
+		"typo3/cms-backend": "~11.5.0 || ~12.4.0 || ~13.4.0",
+		"typo3/cms-core": "~11.5.0 || ~12.4.0 || ~13.4.0",
+		"typo3/cms-fluid": "~11.5.0 || ~12.4.0 || ~13.4.0",
+		"typo3fluid/fluid": "^2.15 || ^4.0"
 	},
 	"require-dev": {
 		"armin/editorconfig-cli": "^1.8 || ^2.0",
@@ -34,9 +34,9 @@
 		"phpunit/phpcov": "^9.0 || ^10.0",
 		"saschaegerer/phpstan-typo3": "^1.10",
 		"ssch/typo3-rector": "^2.0",
-		"typo3/cms-lowlevel": "~11.5.0 || ~12.4.0 || ~13.0.0",
+		"typo3/cms-lowlevel": "~11.5.0 || ~12.4.0 || ~13.4.0",
 		"typo3/coding-standards": "^0.7.0 || ^0.8.0",
-		"typo3/testing-framework": "^7.0.2 || ^8.0.9"
+		"typo3/testing-framework": "^7.0.2 || ^8.0.9 || ^9.0.1"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -32,7 +32,7 @@
     'author_company' => 'coding. powerful. systems. CPS GmbH',
     'constraints' => [
         'depends' => [
-            'typo3' => '11.5.0-13.0.99',
+            'typo3' => '11.5.0-13.4.99',
             'php' => '8.1.0-8.4.99',
         ],
     ],