Merge branch 'master' into php7-compatibility

Author: ruflin

README.markdown

@@ -22,7 +22,7 @@ Dependencies
 ------------
 | Project | Version | Required |
 |---------|---------|----------|
-|[Elasticsearch](https://github.com/elasticsearch/elasticsearch/tree/v1.5.0)|1.5.0|yes|
+|[Elasticsearch](https://github.com/elasticsearch/elasticsearch/tree/v1.5.2)|1.5.2|yes|
 |[Elasticsearch mapper attachments plugin](https://github.com/elasticsearch/elasticsearch-mapper-attachments/tree/v2.5.0)|2.5.0|no|
 |[Elasticsearch thrift transport plugin](https://github.com/elasticsearch/elasticsearch-transport-thrift/tree/v2.5.0)|2.5.0|no|
 |[Elasticsearch memcached transport plugin](https://github.com/elasticsearch/elasticsearch-transport-memcached/tree/v2.5.0)|2.5.0|no|

ansible/es-playbook.yml

@@ -5,7 +5,7 @@
   hosts: localhost
   sudo: true
   vars:
-    - ES_VER: "1.5.0"
+    - ES_VER: "1.5.2"
     - ES_SHORT_VER: "1.5"
     - ES_MAPPER_ATTACHMENTS_VER: "2.5.0"
     - ES_TRANSPORT_MEMCACHED_VER: "2.5.0"

changes.txt

@@ -1,10 +1,11 @@
 CHANGES
 
 2015-05-11
+- Update elasticsearch dependency to elasticsearch 1.5.2 https://www.elastic.co/downloads/past-releases/elasticsearch-1-5-2 #834
 - Add testing on PHP 7 on Travis #826
 
 2015-05-06
-- Add Elastica\Util::reindex function by scan and bulk way http://www.elastic.co/guide/en/elasticsearch/guide/master/reindex.html #829 #931
+- Add Elastica\Util::copy function by scan and bulk way http://www.elastic.co/guide/en/elasticsearch/guide/master/reindex.html. Note: This was first called reindex #829 #931 ##836
 
 2015-04-23
 - Allow bool in Query::setSource function #818 http://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-source-filtering.html

lib/Elastica/Util.php

@@ -190,13 +190,13 @@ public static function convertRequestToCurlCommand(Request $request)
     /**
      * Copy all data from and old index to a new index
      *
-     * @param \Elastica\Index $newIndex
      * @param \Elastica\Index $oldIndex
+     * @param \Elastica\Index $newIndex
      * @param string $expiryTime
      * @param int $sizePerShard
-     * @return bool
+     * @return \Elastica\Index The new index object
      */
-    public static function reindex(Index $newIndex, Index $oldIndex, $expiryTime = '1m', $sizePerShard = 1000)
+    public static function copy(Index $oldIndex, Index $newIndex, $expiryTime = '1m', $sizePerShard = 1000)
     {
         $search = new Search($oldIndex->getClient());
         $bulk = new Bulk($newIndex->getClient());
@@ -217,8 +217,9 @@ public static function reindex(Index $newIndex, Index $oldIndex, $expiryTime = '
             $bulk->addActions($actions);
             $bulk->send();
         }
+
         $newIndex->refresh();
 
-        return true;
+        return $newIndex;
     }
 }

test/lib/Elastica/Test/UtilTest.php

@@ -119,7 +119,7 @@ public function testConvertDateTimeObjectWithoutTimezone()
         $this->assertEquals($convertedString, $date);
     }
 
-    public function testReindex()
+    public function testCopy()
     {
         $client = $this->_getClient();
         $oldIndex = $client->getIndex("elastica_test_reindex");
@@ -153,13 +153,13 @@ public function testReindex()
         $oldIndex->refresh();
 
 
-        $this->assertTrue(Util::reindex($newIndex, $oldIndex ,"1m",1));
+        $this->assertInstanceOf('Elastica\Index', Util::copy($oldIndex, $newIndex,"1m",1));
 
         $newCount = $newIndex->count();
         $this->assertEquals(8, $newCount);
     }
 
-    public function testReindexFail()
+    public function testCopyFail()
     {
         $client = $this->_getClient();
 
@@ -179,7 +179,7 @@ public function testReindexFail()
         $newIndex2->delete();
 
         try {
-            Util::reindex($newIndex, $oldIndex);
+            Util::copy($oldIndex, $newIndex);
             $this->fail('New Index should not exist');
         } catch (ResponseException $e) {
             $this->assertContains('IndexMissingException', $e->getMessage());