Drill into Type::getMapping result for convenience

ruflin · Apr 20, 2014 · fa5612a · fa5612a
1 parent 063f837
commit fa5612a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/changes.txt b/changes.txt
@@ -4,6 +4,7 @@ CHANGES
 - Handling of HasChild type parsing bug #585
 - Consolidate Index getMapping tests
 - Fix Type::getMapping when using an aliased index #588
+- Strip useless nesting from Type::getMapping result
 
 2014-04-19
 - Release v1.1.1.0

diff --git a/lib/Elastica/Type.php b/lib/Elastica/Type.php
@@ -300,8 +300,8 @@ public function getMapping()
         $data = $response->getData();
 
         $mapping = array_shift($data);
-        if (isset($mapping['mappings'])) {
-            return $mapping['mappings'];
+        if (isset($mapping['mappings'][$this->getName()]['properties'])) {
+            return $mapping['mappings'][$this->getName()]['properties'];
         }
 
         return array();

diff --git a/test/lib/Elastica/Test/TypeTest.php b/test/lib/Elastica/Test/TypeTest.php
@@ -141,18 +141,17 @@ public function testNoSource()
         $type = new Type($index, 'user');
         $mapping = new Mapping($type, array(
                 'id' => array('type' => 'integer', 'store' => 'yes'),
-                'username' => array('type' => 'string', 'store' => 'no'),
+                'username' => array('type' => 'string', 'store' => 'no')
             ));
         $mapping->setSource(array('enabled' => false));
         $type->setMapping($mapping);
 
         $mapping = $type->getMapping();
 
-        $this->assertArrayHasKey('user', $mapping);
-        $this->assertArrayHasKey('properties', $mapping['user']);
-        $this->assertArrayHasKey('id', $mapping['user']['properties']);
-        $this->assertArrayHasKey('type', $mapping['user']['properties']['id']);
-        $this->assertEquals('integer', $mapping['user']['properties']['id']['type']);
+        $this->assertEquals(array(
+            'id' => array('type' => 'integer', 'store' => true),
+            'username' => array('type' => 'string')
+        ), $mapping);
 
         // Adds 1 document to the index
         $doc1 = new Document(1,
@@ -787,7 +786,7 @@ public function testGetMapping() {
         $client = $index->getClient();
 
         $this->assertEquals(
-            array('test-type' => array('properties' => $expect)),
+            $expect,
             $client->getIndex($indexName)->getType($typeName)->getMapping()
         );
     }
@@ -808,7 +807,7 @@ public function testGetMappingAlias() {
         $client = $index->getClient();
 
         $this->assertEquals(
-            array('test-alias-type' => array('properties' => $expect)),
+            $expect,
             $client->getIndex($aliasName)->getType($typeName)->getMapping()
         );
     }