Mitigate 4.1 BC issue.

dereuromark · dereuromark · commit 1c49c8f0e332 · 2020-07-13T16:23:19.000+02:00
diff --git a/src/Model/Behavior/BitmaskedBehavior.php b/src/Model/Behavior/BitmaskedBehavior.php
@@ -4,6 +4,7 @@
 
 use ArrayObject;
 use Cake\Database\Expression\Comparison;
+use Cake\Database\Expression\ComparisonExpression;
 use Cake\Datasource\EntityInterface;
 use Cake\Event\EventInterface;
 use Cake\ORM\Behavior;
@@ -248,7 +249,7 @@ public function encodeBitmaskConditions(Query $query) {
 		}
 
 		$callable = function ($comparison) use ($field, $mappedField) {
-			if (!$comparison instanceof Comparison) {
+			if (!$comparison instanceof Comparison && !$comparison instanceof ComparisonExpression) {
 				return $comparison;
 			}
 			$key = $comparison->getField();

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use ArrayObject;`
`6`	`6`	`use Cake\Database\Expression\Comparison;`
	`7`	`+use Cake\Database\Expression\ComparisonExpression;`
`7`	`8`	`use Cake\Datasource\EntityInterface;`
`8`	`9`	`use Cake\Event\EventInterface;`
`9`	`10`	`use Cake\ORM\Behavior;`
`@@ -248,7 +249,7 @@ public function encodeBitmaskConditions(Query $query) {`
`248`	`249`	`}`
`249`	`250`
`250`	`251`	`$callable = function ($comparison) use ($field, $mappedField) {`
`251`		`- if (!$comparison instanceof Comparison) {`
	`252`	`+ if (!$comparison instanceof Comparison && !$comparison instanceof ComparisonExpression) {`
`252`	`253`	`return $comparison;`
`253`	`254`	`}`
`254`	`255`	`$key = $comparison->getField();`