Support compound conditions in when clauses (#197)

See #187 Fix #124 Co-authored-by: John Rayes <[email protected]>
kalimatas · Mar 16, 2023 · d8fd54a · d8fd54a
1 parent efb285b
commit d8fd54a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/Liquid/Tag/TagCase.php b/src/Liquid/Tag/TagCase.php
@@ -99,14 +99,13 @@ public function endTag()
 	 */
 	public function unknownTag($tag, $params, array $tokens)
 	{
-		$whenSyntaxRegexp = new Regexp('/' . Liquid::get('QUOTED_FRAGMENT') . '/');
-
 		switch ($tag) {
 			case 'when':
+				$whenSyntax = preg_match_all('/(?<=,|or|^)\s*(' . Liquid::get('QUOTED_FRAGMENT') . ')/', $params, $matches);
 				// push the current nodelist onto the stack and prepare for a new one
-				if ($whenSyntaxRegexp->match($params)) {
+				if ($whenSyntax) {
 					$this->pushNodelist();
-					$this->right = $whenSyntaxRegexp->matches[0];
+					$this->right = $matches[1];
 					$this->nodelist = array();
 				} else {
 					throw new ParseException("Syntax Error in tag 'case' - Valid when condition: when [condition]"); // harry
@@ -151,12 +150,16 @@ public function render(Context $context)
 		foreach ($this->nodelists as $data) {
 			list($right, $nodelist) = $data;
 
-			if ($this->equalVariables($this->left, $right, $context)) {
-				$runElseBlock = false;
+			foreach ($right as $var) {
+				if ($this->equalVariables($this->left, $var, $context)) {
+					$runElseBlock = false;
+
+					$context->push();
+					$output .= $this->renderAll($nodelist, $context);
+					$context->pop();
 
-				$context->push();
-				$output .= $this->renderAll($nodelist, $context);
-				$context->pop();
+					break;
+				}
 			}
 		}
 

diff --git a/tests/Liquid/fixtures/case.html b/tests/Liquid/fixtures/case.html
@@ -8,8 +8,8 @@
 
 
 
-      ... else ... 
-
+      hit 2 or 3
+    
 
 
       ... else ... 
@@ -26,6 +26,6 @@
 2019
 
 
-May.
-
+Spring
+  
 2019