Fix setType for Ids query (#1124) (#1146)

ruflin · Aug 23, 2016 · 0ffd884 · 0ffd884
1 parent 045ee26
commit 0ffd884
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/Elastica/Query/Ids.php b/lib/Elastica/Query/Ids.php
@@ -64,7 +64,7 @@ public function addType($type)
     /**
      * Set type.
      *
-     * @param string|\Elastica\Type $type Type name or object
+     * @param array|string|\Elastica\Type $type Type name or object
      *
      * @return $this
      */
@@ -77,7 +77,7 @@ public function setType($type)
             return $this;
         }
 
-        $this->_params['type'] = $type;
+        $this->_params['type'] = (array)$type;
 
         return $this;
     }

diff --git a/test/lib/Elastica/Test/Query/IdsTest.php b/test/lib/Elastica/Test/Query/IdsTest.php
@@ -156,6 +156,22 @@ public function testSetTypeSingleSearchArrayDocInOtherType()
         $this->assertEquals(1, $resultSet->count());
     }
 
+    /**
+     * @group functional
+     */
+    public function testSetTypeAndAddType()
+    {
+        $query = new Ids();
+
+        $query->setIds(['1', '4']);
+        $query->setType('helloworld1');
+        $query->addType('helloworld2');
+
+        $resultSet = $this->_index->search($query);
+
+        $this->assertEquals(2, $resultSet->count());
+    }
+
     /**
      * @group functional
      */