Merge pull request #1104 from simon-n/master

adapted Type namespace collision fix for Query\Ids, see PR #438

Author: merk

lib/Elastica/Query/Ids.php

@@ -2,7 +2,7 @@
 
 namespace Elastica\Query;
 
-use Elastica\Type;
+use Elastica\Type as ElasticaType;
 
 /**
  * Ids Query.
@@ -50,7 +50,7 @@ public function addId($id)
      */
     public function addType($type)
     {
-        if ($type instanceof Type) {
+        if ($type instanceof ElasticaType) {
             $type = $type->getName();
         } elseif (empty($type) && !is_numeric($type)) {
             // A type can be 0, but cannot be empty
@@ -71,7 +71,7 @@ public function addType($type)
      */
     public function setType($type)
     {
-        if ($type instanceof Type) {
+        if ($type instanceof ElasticaType) {
             $type = $type->getName();
         } elseif (empty($type) && !is_numeric($type)) {
             // A type can be 0, but cannot be empty

test/lib/Elastica/Test/Query/IdsTest.php

@@ -4,6 +4,7 @@
 
 use Elastica\Document;
 use Elastica\Query\Ids;
+use Elastica\Query\Type;
 use Elastica\Test\Base as BaseTest;
 
 class IdsTest extends BaseTest
@@ -185,4 +186,17 @@ public function testSetTypeArraySearchSingle()
 
         $this->assertEquals(1, $resultSet->count());
     }
+
+    public function testQueryTypeAndTypeCollision()
+    {
+        // This test ensures that Elastica\Type and Elastica\Query\Type
+        // do not collide when used together, which at one point
+        // happened because of a use statement in Elastica\Query\Ids
+        // Test goal is to make sure a Fatal Error is not triggered
+        //
+        // adapted fix for Elastica\Filter\Type
+        // see https://github.com/ruflin/Elastica/pull/438
+        $queryType = new Type();
+        $filter = new Ids();
+    }
 }