fix error for empty type configuration

This commit is contained in:
Evgeniy Sokolov 2015-02-02 10:38:01 +01:00 committed by Tim Nagel
parent 55bfee22e8
commit cf9f7c6be8
2 changed files with 22 additions and 0 deletions

View file

@ -192,6 +192,10 @@ class Configuration implements ConfigurationInterface
->useAttributeAsKey('name')
->prototype('array')
->treatNullLike(array())
->beforeNormalization()
->ifNull()
->thenEmptyArray()
->end()
// BC - Renaming 'mappings' node to 'properties'
->beforeNormalization()
->ifTrue(function($v) { return array_key_exists('mappings', $v); })

View file

@ -199,6 +199,24 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$this->assertCount(3, $configuration['indexes']['test']['types']['test']['properties']);
}
public function testUnconfiguredType()
{
$configuration = $this->getConfigs(array(
'clients' => array(
'default' => array('url' => 'http://localhost:9200'),
),
'indexes' => array(
'test' => array(
'types' => array(
'test' => null
)
)
)
));
$this->assertArrayHasKey('properties', $configuration['indexes']['test']['types']['test']);
}
public function testNestedProperties()
{
$this->getConfigs(array(