[BUGFIX] Fix f:if inline syntax case (#803)

Good: {f:if(condition:'{myVariable}',then: '1', else:'0')} Bad: {f:if(condition:'{myVariable}',then: 1, else:0)} This is a regression of 2.9.0. The patch adds coverage and fixes the case.
TYPO3 · Jun 8, 2023 · a502df3 · a502df3
1 parent 203c14f
commit a502df3
Show file tree

Hide file tree

Showing 3 changed files with 150 additions and 1 deletion.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -60,6 +60,11 @@ parameters:
 			count: 1
 			path: src/Core/Rendering/RenderingContext.php
 
+		-
+			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
+			count: 1
+			path: src/Core/ViewHelper/AbstractConditionViewHelper.php
+
 		-
 			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
 			count: 1

diff --git a/src/Core/ViewHelper/AbstractConditionViewHelper.php b/src/Core/ViewHelper/AbstractConditionViewHelper.php
@@ -235,14 +235,22 @@ final public function convert(TemplateCompiler $templateCompiler): array
                     is_array($defaultValue) && empty($defaultValue) ? '[]' : var_export($defaultValue, true)
                 );
             } elseif ($arguments[$argumentName] instanceof NodeInterface) {
-                // Argument *is* given to VH, resolve
+                // Argument *is* given to VH and is a node, resolve
                 $converted = $arguments[$argumentName]->convert($templateCompiler);
                 $accumulatedArgumentInitializationCode .= $converted['initialization'];
                 $argumentInitializationCode .= sprintf(
                     '\'%s\' => %s,' . chr(10),
                     $argumentName,
                     $converted['execution']
                 );
+            } else {
+                // Argument *is* given to VH and is a simple type.
+                // @todo: Why is this not a node object as well? See f:if inline syntax tests.
+                $argumentInitializationCode .= sprintf(
+                    '\'%s\' => %s,' . chr(10),
+                    $argumentName,
+                    $arguments[$argumentName]
+                );
             }
         }
 

diff --git a/tests/Functional/ViewHelpers/IfThenElseViewHelperTest.php b/tests/Functional/ViewHelpers/IfThenElseViewHelperTest.php
@@ -342,6 +342,37 @@ public static function renderDataProvider(): \Generator
             '',
         ];
 
+        yield 'then variable argument, else variable argument, verdict true' => [
+            '<f:if condition="{verdict}" then="{thenVariable}" else="{elseVariable}" />',
+            ['verdict' => true, 'thenVariable' => 'thenArgument', 'elseVariable' => 'elseArgument'],
+            'thenArgument',
+        ];
+        yield 'then variable argument, else variable argument, verdict false' => [
+            '<f:if condition="{verdict}" then="{thenVariable}" else="{elseVariable}" />',
+            ['verdict' => false, 'thenVariable' => 'thenArgument', 'elseVariable' => 'elseArgument'],
+            'elseArgument',
+        ];
+        yield 'then variable argument missing, else variable argument, verdict true' => [
+            '<f:if condition="{verdict}" then="{thenVariable}" else="{elseVariable}" />',
+            ['verdict' => true, 'elseVariable' => 'elseArgument'],
+            '',
+        ];
+        yield 'then variable argument missing, else variable argument, verdict false' => [
+            '<f:if condition="{verdict}" then="{thenVariable}" else="{elseVariable}" />',
+            ['verdict' => false, 'elseVariable' => 'elseArgument'],
+            'elseArgument',
+        ];
+        yield 'then variable argument, else variable missing, verdict true' => [
+            '<f:if condition="{verdict}" then="{thenVariable}" else="{elseVariable}" />',
+            ['verdict' => true, 'thenVariable' => 'thenArgument'],
+            'thenArgument',
+        ];
+        yield 'then variable argument, else variable missing, verdict false' => [
+            '<f:if condition="{verdict}" then="{thenVariable}" else="{elseVariable}" />',
+            ['verdict' => false, 'thenVariable' => 'thenArgument'],
+            '',
+        ];
+
         /*
          * @todo: broken non-compiled, ok compiled
         yield 'else argument, else if child, if verdict false, elseif verdict true' => [
@@ -352,6 +383,111 @@ public static function renderDataProvider(): \Generator
             'elseIfChild',
         ];
         */
+
+        yield 'inline syntax, then argument, verdict true' => [
+            '{f:if(condition:\'{verdict}\', then:\'thenArgument\')}',
+            ['verdict' => true],
+            'thenArgument',
+        ];
+        yield 'inline syntax, then argument, verdict false' => [
+            '{f:if(condition:\'{verdict}\', then:\'thenArgument\')}',
+            ['verdict' => false],
+            '',
+        ];
+
+        yield 'inline syntax, else argument, verdict true' => [
+            '{f:if(condition:\'{verdict}\', else:\'elseArgument\')}',
+            ['verdict' => true],
+            // @todo: wtf?
+            null,
+        ];
+        yield 'inline syntax, else argument, verdict false' => [
+            '{f:if(condition:\'{verdict}\', else:\'elseArgument\')}',
+            ['verdict' => false],
+            'elseArgument',
+        ];
+
+        yield 'inline syntax, then argument, else argument, verdict true' => [
+            '{f:if(condition:\'{verdict}\', then:\'thenArgument\', else:\'elseArgument\')}',
+            ['verdict' => true],
+            'thenArgument',
+        ];
+        yield 'inline syntax, then argument, else argument, verdict false' => [
+            '{f:if(condition:\'{verdict}\', then:\'thenArgument\', else:\'elseArgument\')}',
+            ['verdict' => false],
+            'elseArgument',
+        ];
+
+        yield 'inline syntax, then argument, else argument, no verdict' => [
+            '{f:if(then:\'thenArgument\', else:\'elseArgument\')}',
+            [],
+            'elseArgument',
+        ];
+
+        yield 'inline syntax, then argument, else argument, verdict true, verdict variable node' => [
+            '{f:if(condition:verdict, then:\'thenArgument\', else:\'elseArgument\')}',
+            ['verdict' => true],
+            'thenArgument',
+        ];
+        yield 'inline syntax, then argument, else argument, verdict false, verdict variable node' => [
+            '{f:if(condition:verdict, then:\'thenArgument\', else:\'elseArgument\')}',
+            ['verdict' => false],
+            'elseArgument',
+        ];
+
+        yield 'inline syntax, then argument, else argument, verdict variable missing' => [
+            '{f:if(condition:\'{verdict}\', then:\'thenArgument\', else:\'elseArgument\')}',
+            [],
+            'elseArgument',
+        ];
+        yield 'inline syntax, then argument, else argument, verdict variable missing, verdict variable node' => [
+            '{f:if(condition:verdict, then:\'thenArgument\', else:\'elseArgument\')}',
+            [],
+            'elseArgument',
+        ];
+
+        yield 'inline syntax, then argument variable, else argument variable, verdict true' => [
+            '{f:if(condition:\'{verdict}\', then:\'{thenVariable}\', else:\'{elseVariable}\')}',
+            ['verdict' => true, 'thenVariable' => 'thenArgument', 'elseVariable' => 'elseArgument'],
+            'thenArgument',
+        ];
+        yield 'inline syntax, then argument variable, else argument variable, verdict false' => [
+            '{f:if(condition:\'{verdict}\', then:\'{thenVariable}\', else:\'{elseVariable}\')}',
+            ['verdict' => false, 'thenVariable' => 'thenArgument',  'elseVariable' => 'elseArgument'],
+            'elseArgument',
+        ];
+
+        yield 'inline syntax, then argument variable, else argument variable node, verdict true' => [
+            '{f:if(condition:\'{verdict}\', then:thenVariable, else:elseVariable)}',
+            ['verdict' => true, 'thenVariable' => 'thenArgument', 'elseVariable' => 'elseArgument'],
+            'thenArgument',
+        ];
+        yield 'inline syntax, then argument variable, else argument variable node, verdict false' => [
+            '{f:if(condition:\'{verdict}\', then:thenVariable, else:elseVariable)}',
+            ['verdict' => false, 'thenVariable' => 'thenArgument',  'elseVariable' => 'elseArgument'],
+            'elseArgument',
+        ];
+
+        yield 'inline syntax, then argument string 1, else argument string 0, verdict true' => [
+            '{f:if(condition:\'{verdict}\', then:\'1\', else:\'0\')}',
+            ['verdict' => true],
+            1,
+        ];
+        yield 'inline syntax, then argument string 1, else argument string 0, verdict false' => [
+            '{f:if(condition:\'{verdict}\', then:\'1\', else:\'0\')}',
+            ['verdict' => false],
+            0,
+        ];
+        yield 'inline syntax, then argument int 1, else argument int 0, verdict true' => [
+            '{f:if(condition:\'{verdict}\', then:1, else:0)}',
+            ['verdict' => true],
+            1,
+        ];
+        yield 'inline syntax, then argument int 1, else argument int 0, verdict false' => [
+            '{f:if(condition:\'{verdict}\', then:1, else:0)}',
+            ['verdict' => false],
+            0,
+        ];
     }
 
     /**