Support for multiline {define} block (#459)

Author: MartinMystikJonas

CHANGELOG.md

@@ -12,6 +12,7 @@
 ### Fixed
 - Updated coding standard (Possible **BC break** - added `final` or `abstract` to (almost) all classes)
 - Bleeding edge changes - updated typehints
+- Fixed parameters parsing for multiline {define}
 - Functions handling with FunctionExecutor in new Latte 
 - Removed unformatPresenterClass of new PresenterFactory
 

src/Compiler/NodeVisitor/AddParametersForBlockNodeVisitor.php

@@ -56,12 +56,12 @@ public function leaveNode(Node $node): ?array
         }
 
         $parameters = [];
-        $pattern = '/(?<define>{define (?<block_name>.*?),? (?<parameters>.*)}) on line (?<line>\d+)/';
+        $pattern = '/(?<define>{define\s+(?<block_name>.*?)\s*,?\s+(?<parameters>.*)})\s+on line (?<line>\d+)/s';
         preg_match($pattern, $comment->getText(), $match);
         if (isset($match['parameters'])) {
             $define = $match['define'];
 
-            $typesAndVariablesPattern = '/(?<type>[\?\\\[\]\<\>[:alnum:]]*)[ ]*\$(?<variable>[[:alnum:]]+)/';
+            $typesAndVariablesPattern = '/(?<type>[\?\\\[\]\<\>[:alnum:]]*)[ ]*\$(?<variable>[[:alnum:]]+)/s';
             preg_match_all($typesAndVariablesPattern, $match['parameters'], $typesAndVariables);
 
             $variableTypes = array_combine($typesAndVariables['variable'], $typesAndVariables['type']) ?: [];
@@ -102,7 +102,7 @@ public function leaveNode(Node $node): ?array
             }
         } else {
             // process default blocks content etc.
-            $pattern = '/{block (?<block_name>.*?)} on line (?<line>\d+)/';
+            $pattern = '/{block\s+(?<block_name>.*?)}\s+on line (?<line>\d+)/s';
             preg_match($pattern, $comment->getText(), $match);
         }
 

tests/Rule/LatteTemplatesRule/SimpleControl/Fixtures/Blocks/define.latte

@@ -29,4 +29,11 @@
 {include no-comma-block, $knownInteger}
 {include no-comma-block}
 
+{define multiline-block,
+  int $count,
+  string $name}
+    {php \PHPStan\dumpType($count)}
+    {php \PHPStan\dumpType($name)}
+{/define}
+
 {php \PHPStan\dumpType($paramString)}

tests/Rule/LatteTemplatesRule/SimpleControl/LatteTemplatesRuleForSimpleControlTest.php

@@ -378,9 +378,19 @@ public function testBlocks(): void
                 30,
                 'define.latte',
             ],
+            [
+                'Dumped type: int',
+                35,
+                'define.latte',
+            ],
+            [
+                'Dumped type: string',
+                36,
+                'define.latte',
+            ],
             [
                 'Dumped type: \'some string\'',
-                32,
+                39,
                 'define.latte',
             ],
         ]);