Merge pull request #174

doctrine · Apr 18, 2014 · e9dc1ea · e9dc1ea
2 parents f57b098 + 2a5d5c4
commit e9dc1ea
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/lib/Doctrine/MongoDB/Query/Expr.php b/lib/Doctrine/MongoDB/Query/Expr.php
@@ -453,7 +453,7 @@ public function gte($value)
      */
     public function in(array $values)
     {
-        return $this->operator('$in', $values);
+        return $this->operator('$in', array_values($values));
     }
 
     /**
@@ -638,7 +638,7 @@ public function notEqual($value)
      */
     public function notIn(array $values)
     {
-        return $this->operator('$nin', $values);
+        return $this->operator('$nin', array_values($values));
     }
 
     /**

diff --git a/tests/Doctrine/MongoDB/Tests/Query/ExprTest.php b/tests/Doctrine/MongoDB/Tests/Query/ExprTest.php
@@ -395,4 +395,36 @@ private function getMockPolygon($json)
 
         return $point;
     }
+
+    public function testIn()
+    {
+        $expr = new Expr();
+
+        $this->assertSame($expr, $expr->in(array('value1', 'value2')));
+        $this->assertEquals(array('$in' => array('value1', 'value2')), $expr->getQuery());
+    }
+
+    public function testInWillStripKeysToYieldBsonArray()
+    {
+        $expr = new Expr();
+
+        $this->assertSame($expr, $expr->in(array(1 => 'value1', 'some' => 'value2')));
+        $this->assertEquals(array('$in' => array('value1', 'value2')), $expr->getQuery());
+    }
+
+    public function testNotIn()
+    {
+        $expr = new Expr();
+
+        $this->assertSame($expr, $expr->notIn(array('value1', 'value2')));
+        $this->assertEquals(array('$nin' => array('value1', 'value2')), $expr->getQuery());
+    }
+
+    public function testNotInWillStripKeysToYieldBsonArray()
+    {
+        $expr = new Expr();
+
+        $this->assertSame($expr, $expr->notIn(array(1 => 'value1', 'some' => 'value2')));
+        $this->assertEquals(array('$nin' => array('value1', 'value2')), $expr->getQuery());
+    }
 }