MongoDB 2.6: Ensure $in argument is a real BSON array

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));
     }
 
     /**
@@ -675,7 +675,7 @@ public function notEqual($value)
      */
     public function notIn(array $values)
     {
-        return $this->operator('$nin', $values);
+        return $this->operator('$nin', array_values($values));
     }
 
     /**

tests/Doctrine/MongoDB/Tests/Query/ExprTest.php

@@ -445,4 +445,38 @@ 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 testInSendsRealBSONArray()
+    {
+        $expr = new Expr();
+
+        $this->assertSame($expr, $expr->field('_id')->in(array(1 => 'value1', 'some' => 'value2')));
+        $this->assertEquals(array('_id' => 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 testNotInSendsRealBSONArray()
+    {
+        $expr = new Expr();
+
+        $this->assertSame($expr, $expr->field('_id')->notIn(array(1 => 'value1', 'some' => 'value2')));
+        $this->assertEquals(array('_id' => array('$nin' => array('value1', 'value2'))), $expr->getQuery());
+    }
+
+
 }