Fix expanding "… != <x>..<x + 1>" (#67)

mlocati · web-flow · commit f234bf7811f4 · 2026-02-23T14:37:19.000+01:00
* Revert "Fix || vs && operator precedence (#63)" This reverts commit 4133cfb. * Actually fix expanding "… != <x>..<x + 1>"
diff --git a/src/FormulaConverter.php b/src/FormulaConverter.php
@@ -134,7 +134,7 @@ private static function expandAtom($atom)
                                 $chunk = "({$what} == {$from} || {$what} == {$to})";
                                 break;
                             case '!=':
-                                $chunk = "({$what} != {$from}) && ({$what} == {$to})";
+                                $chunk = "{$what} != {$from} && {$what} != {$to}";
                                 break;
                         }
                     } else {

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private static function expandAtom($atom)`
`134`	`134`	`$chunk = "({$what} == {$from} \|\| {$what} == {$to})";`
`135`	`135`	`break;`
`136`	`136`	`case '!=':`
`137`		`- $chunk = "({$what} != {$from}) && ({$what} == {$to})";`
	`137`	`+ $chunk = "{$what} != {$from} && {$what} != {$to}";`
`138`	`138`	`break;`
`139`	`139`	`}`
`140`	`140`	`} else {`