From 2ae21532bc0a24724c5d8fa91dfd2c98bc57e93f Mon Sep 17 00:00:00 2001
From: Thibaud Fabre <thibaud@aztech.io>
Date: Thu, 27 Oct 2016 15:42:26 +0200
Subject: [PATCH] Fix undefined property error

---
 .../Phrasea/SearchEngine/Elastic/Mapping/ComplexMapping.php   | 4 ----
 .../SearchEngine/Elastic/Mapping/ComplexPropertiesMapping.php | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/ComplexMapping.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/ComplexMapping.php
index 58f50faecd..0e154f832f 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/ComplexMapping.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/ComplexMapping.php
@@ -76,10 +76,6 @@ class ComplexMapping extends FieldMapping
             $properties[$name] = $child->toArray();
         }
 
-        if ($this->childKey) {
-            return [$this->childKey => $properties];
-        }
-
         return $properties;
     }
 }
diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/ComplexPropertiesMapping.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/ComplexPropertiesMapping.php
index c3e48be954..af1487da15 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/ComplexPropertiesMapping.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Mapping/ComplexPropertiesMapping.php
@@ -24,7 +24,7 @@ class ComplexPropertiesMapping extends ComplexMapping
     /**
      * @return array
      */
-    public function toArray()
+    public function getProperties()
     {
         return [ 'properties' => parent::getProperties() ];
     }