deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch '3.0.x'

Browse source
This commit is contained in:
Tim Nagel 2015-01-09 08:56:41 +11:00
parent ee9f7e5297 2ce2d7e610
commit c2c87a53e4
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG-3.0.md
View file

@ -12,6 +12,10 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v3.0.0...v3.0.1
To generate a changelog summary since the last version, run To generate a changelog summary since the last version, run
`git log --no-merges --oneline v3.0.0...3.0.x` `git log --no-merges --oneline v3.0.0...3.0.x`
* 3.0.7 (Unreleased)
* Fixed multi_field properties not being normalised #769
* 3.0.6 (2015-01-04) * 3.0.6 (2015-01-04)
* Removed unused public image asset for the web development toolbar #742 * Removed unused public image asset for the web development toolbar #742

3
Index/MappingBuilder.php
View file

@ -113,6 +113,9 @@ class MappingBuilder
if (!isset($property['type'])) { if (!isset($property['type'])) {
$property['type'] = 'string'; $property['type'] = 'string';
} }
if ($property['type'] == 'multi_field' && isset($property['fields'])) {
$this->fixProperties($property['fields']);
}
if (isset($property['properties'])) { if (isset($property['properties'])) {
$this->fixProperties($property['properties']); $this->fixProperties($property['properties']);
} }

5
Tests/Functional/app/Basic/config.yml
View file

@ -74,6 +74,11 @@ fos_elastica:
properties: properties:
date: { boost: 5 } date: { boost: 5 }
content: ~ content: ~
multiple:
type: "multi_field"
properties:
name: ~
position: ~
user: user:
type: "object" type: "object"
approver: approver: