Merge pull request aws#667 from jeskew/feature/cache-member-shape-lis…

…t-on-structures

Cache the members list in StructureShape

src/Api/StructureShape.php

@@ -6,6 +6,11 @@
  */
 class StructureShape extends Shape
 {
+    /**
+     * @var Shape[]
+     */
+    private $members;
+
     public function __construct(array $definition, ShapeMap $shapeMap)
     {
         $definition['type'] = 'structure';
@@ -24,12 +29,11 @@ public function __construct(array $definition, ShapeMap $shapeMap)
      */
     public function getMembers()
     {
-        $result = [];
-        foreach ($this->definition['members'] as $name => $definition) {
-            $result[$name] = $this->shapeFor($definition);
+        if (empty($this->members)) {
+            $this->generateMembersHash();
         }
 
-        return $result;
+        return $this->members;
     }
 
     /**
@@ -54,10 +58,22 @@ public function hasMember($name)
      */
     public function getMember($name)
     {
-        if (!isset($this->definition['members'][$name])) {
+        $members = $this->getMembers();
+
+        if (!isset($members[$name])) {
             throw new \InvalidArgumentException('Unknown member ' . $name);
         }
 
-        return $this->shapeFor($this->definition['members'][$name]);
+        return $members[$name];
+    }
+
+
+    private function generateMembersHash()
+    {
+        $this->members = [];
+
+        foreach ($this->definition['members'] as $name => $definition) {
+            $this->members[$name] = $this->shapeFor($definition);
+        }
     }
 }