Respect "flattened" parameter wrt query serialization field names

pzorn · Jun 18, 2015 · 6f66fe3 · 6f66fe3
1 parent d62abf0
commit 6f66fe3
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Api/Serializer/QueryParamBuilder.php b/src/Api/Serializer/QueryParamBuilder.php
@@ -16,7 +16,15 @@ class QueryParamBuilder
 
     protected function queryName(Shape $shape, $default = null)
     {
-        return $shape['queryName'] ?: $default;
+        if (null !== $shape['queryName']) {
+            return $shape['queryName'];
+        }
+
+        if ($this->isFlat($shape) && !empty($shape['member']['locationName'])) {
+            return $shape['member']['locationName'];
+        }
+
+        return $default;
     }
 
     protected function isFlat(Shape $shape)