Merge branch '3.0.x'

This commit is contained in:
Tim Nagel 2015-01-22 11:26:07 +11:00
commit 7f28be3c4e
6 changed files with 50 additions and 23 deletions

View file

@ -32,11 +32,15 @@ class MappingToElasticaTest extends WebTestCase
$this->assertTrue($mapping['type']['properties']['field1']['store']);
$this->assertArrayNotHasKey('store', $mapping['type']['properties']['field2']);
$type = $this->getType($client, 'type');
$mapping = $type->getMapping();
$this->assertEquals('parent', $mapping['type']['_parent']['type']);
$parent = $this->getType($client, 'parent');
$mapping = $parent->getMapping();
$this->assertEquals('my_analyzer', $mapping['parent']['index_analyzer']);
$this->assertEquals('whitespace', $mapping['parent']['search_analyzer']);
$this->assertEquals('my_analyzer', $mapping['type']['index_analyzer']);
$this->assertEquals('whitespace', $mapping['type']['search_analyzer']);
}
public function testResetType()

View file

@ -95,3 +95,4 @@ fos_elastica:
identifier: "id"
null_mappings:
mappings: ~
empty_index: ~