Improve bitmasks for 3.x

src/Model/Behavior/BitmaskedBehavior.php

@@ -3,6 +3,7 @@
 namespace Tools\Model\Behavior;
 
 use ArrayObject;
+use Cake\Database\Expression\Comparison;
 use Cake\Datasource\EntityInterface;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
@@ -180,7 +181,8 @@ class BitmaskedBehavior extends Behavior {
 	 */
 	public function encodeBitmaskConditions(Query $query) {
 		$field = $this->_config['field'];
-		if (!($mappedField = $this->_config['mappedField'])) {
+		$mappedField = $this->_config['mappedField'];
+		if (!$mappedField) {
 			$mappedField = $field;
 		}
 
@@ -189,27 +191,29 @@ class BitmaskedBehavior extends Behavior {
 			return;
 		}
 
-		$callable = function ($foo) use ($field, $mappedField) {
-			if (!$foo instanceof \Cake\Database\Expression\Comparison) {
-				return $foo;
+		$callable = function ($comparison) use ($field, $mappedField) {
+			if (!$comparison instanceof Comparison) {
+				return $comparison;
 			}
-			$key = $foo->getField();
-			if ($key === $mappedField || $key === $this->_table->alias() . '.' . $mappedField) {
-				$foo->setValue($this->encodeBitmask($foo->getValue()));
+			$key = $comparison->getField();
+
+			if ($key !== $mappedField && $key !== $this->_table->alias() . '.' . $mappedField) {
+				return $comparison;
 			}
+
+			$comparison->setValue($this->encodeBitmask($comparison->getValue()));
 			if ($field !== $mappedField) {
-				$foo->setField($field);
+				$comparison->setField($field);
 			}
 
-			return $foo;
+			return $comparison;
 		};
 
 		$where->iterateParts($callable);
 	}
 
-
 	/**
-	 * @param \Cake\Datasource\EntityInterface $entity
+	 * @param \ArrayObject $data
 	 * @return void
 	 */
 	public function encodeBitmaskDataRaw(ArrayObject $data) {
@@ -252,7 +256,7 @@ class BitmaskedBehavior extends Behavior {
 
 	/**
 	 * @param string $field
-	 * 
+	 *
 	 * @return int|null
 	 */
 	protected function _getDefault($field) {

tests/TestCase/Model/Behavior/BitmaskedBehaviorTest.php

@@ -29,7 +29,7 @@ class BitmaskedBehaviorTest extends TestCase {
 		$this->Comments = TableRegistry::get('BitmaskedComments');
 		$this->Comments->addBehavior('Tools.Bitmasked', ['mappedField' => 'statuses']);
 	}
-	
+
 	/**
 	 * @return void
 	 */
@@ -40,7 +40,7 @@ class BitmaskedBehaviorTest extends TestCase {
 		$expected = BitmaskedComment::statuses();
 		$this->assertSame($expected, $bits);
 	}
-	
+
 	/**
 	 * @return void
 	 * @expectedException \RuntimeException
@@ -50,7 +50,7 @@ class BitmaskedBehaviorTest extends TestCase {
 		$this->Comments->removeBehavior('Bitmasked');
 		$this->Comments->addBehavior('Tools.Bitmasked', ['field' => 'my_field']);
 	}
-	
+
 	/**
 	 * @return void
 	 */