Merge pull request #785 from ruflin/release-v1.4.3.0

Release v1.4.3.0
ruflin · Feb 17, 2015 · bfa9363 · bfa9363
2 parents e25ff5b + 7f62c6b
commit bfa9363
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/README.markdown b/README.markdown
@@ -22,7 +22,7 @@ Dependencies
 | Project | Version | Required |
 |---------|---------|----------|
 |[Elasticsearch](https://github.com/elasticsearch/elasticsearch/tree/v1.4.3)|1.4.3|yes|
-|[Elasticsearch mapper attachments plugin](https://github.com/elasticsearch/elasticsearch-mapper-attachments/tree/v2.4.1)|2.4.1|no|
+|[Elasticsearch mapper attachments plugin](https://github.com/elasticsearch/elasticsearch-mapper-attachments/tree/v2.4.2)|2.4.2|no|
 |[Elasticsearch thrift transport plugin](https://github.com/elasticsearch/elasticsearch-transport-thrift/tree/v2.4.1)|2.4.1|no|
 |[Elasticsearch memcached transport plugin](https://github.com/elasticsearch/elasticsearch-transport-memcached/tree/v2.4.1)|2.4.1|no|
 |[Elasticsearch geocluster facet plugin](https://github.com/zenobase/geocluster-facet/tree/0.0.12)|0.0.12|no|
diff --git a/ansible/es-playbook.yml b/ansible/es-playbook.yml
@@ -7,7 +7,7 @@
   vars:
     - ES_VER: "1.4.3"
     - ES_SHORT_VER: "1.4"
-    - ES_MAPPER_ATTACHMENTS_VER: "2.4.1"
+    - ES_MAPPER_ATTACHMENTS_VER: "2.4.2"
     - ES_TRANSPORT_MEMCACHED_VER: "2.4.1"
     - ES_TRANSPORT_THRIFT_VER: "2.4.1"
     - ES_GEOCLUSTER_FACET_VER: "0.0.12"

diff --git a/changes.txt b/changes.txt
@@ -1,11 +1,12 @@
 CHANGES
 
 2015-02-17
+- Release v1.4.3.0
 - Added Elastica\Query\MatchPhrase #599
 - Added Elastica\Query\MatchPhrasePrefix #599
 
 2015-02-04
-- Reset PHP 5.3 tests
+- Reset PHP 5.3 tests and enable compatibility for PHP 5.3 again
 
 2015-02-16
 - Update elasticsearch compatibility to 1.4.3 #782
@@ -20,7 +21,8 @@ CHANGES
 - Add support for filters aggregation #773
 
 2015-01-27
-- Exception\ElasticsearchException now can be catched like all other exceptions as Exception\ExceptionInterface
+- Housekeeping, coding standard #764 
+- Exception\ElasticsearchException now can be catched like all other exceptions as Exception\ExceptionInterface #762
 
 2015-01-25
 - Release v1.4.2.0

diff --git a/test/lib/Elastica/Test/Facet/StatisticalTest.php b/test/lib/Elastica/Test/Facet/StatisticalTest.php
@@ -8,6 +8,9 @@
 use Elastica\Query\MatchAll;
 use Elastica\Test\Base as BaseTest;
 
+/**
+ * @todo Add test for Statistical with setScript
+ */
 class StatisticalTest extends BaseTest
 {
     public function testStatisticalWithSetField()
@@ -71,12 +74,4 @@ public function testStatisticalWithSetFields()
         $this->assertEquals(10, $facets['stats']['min']);
         $this->assertEquals(90, $facets['stats']['max']);
     }
-
-    /**
-     * @todo
-     */
-    public function testStatisticalWithSetScript()
-    {
-        $this->markTestIncomplete('Test for setting the script value');
-    }
 }
diff --git a/test/lib/Elastica/Test/Type/MappingTest.php b/test/lib/Elastica/Test/Type/MappingTest.php
@@ -105,7 +105,7 @@ public function testNestedMapping()
         $index->create(array(), true);
         $type = $index->getType('test');
 
-        $this->markTestIncomplete('nested mapping is not set right yet');
+        //$this->markTestIncomplete('nested mapping is not set right yet');
         $mapping = new Mapping($type,
             array(
                 'test' => array(
@@ -122,7 +122,8 @@ public function testNestedMapping()
             )
         );
 
-        $type->setMapping($mapping);
+        $response = $type->setMapping($mapping);
+		$this->assertFalse($response->hasError());
 
         $doc = new Document(1, array(
             'user' => array(
@@ -136,6 +137,7 @@ public function testNestedMapping()
 
         $index->refresh();
         $resultSet = $type->search('ruflin');
+		$this->assertEquals($resultSet->count(), 1);
 
         $index->delete();
     }