Avoid overriding the exception message with the raw message (#1516)

Author: stof

src/Generator/ResponseParser/RestJsonParser.php

@@ -68,6 +68,8 @@ public function generate(StructureShape $shape, bool $throwOnError = true): Pars
             return new ParserResult(strtr('$this->PROPERTY_NAME = $response->getContent(THROW);', ['THROW' => $throwOnError ? '' : 'false', 'PROPERTY_NAME' => GeneratorHelper::normalizeName($payloadProperty)]));
         }
 
+        $forException = !$throwOnError;
+
         $properties = [];
         $this->functions = [];
         $this->generatedFunctions = [];
@@ -77,6 +79,11 @@ public function generate(StructureShape $shape, bool $throwOnError = true): Pars
                 continue;
             }
 
+            // Avoid conflicts with PHP properties. Those AWS members are included in the AWSError anyway.
+            if ($forException && \in_array(strtolower($member->getName()), ['code', 'message'])) {
+                continue;
+            }
+
             if (!$member->isNullable() && !$member->isRequired()) {
                 $properties[] = strtr('if (null !== $v = (PROPERTY_ACCESSOR)) {
                         $this->PROPERTY_NAME = $v;

src/Generator/ResponseParser/RestXmlParser.php

@@ -69,11 +69,17 @@ public function generate(StructureShape $shape, bool $throwOnError = true): Pars
                 'PROPERTY_ACCESSOR' => $this->parseXmlElement('$data', $member->getShape(), $member->isRequired() || null === $shape->getResultWrapper(), false),
             ]);
         } else {
+            $forException = !$throwOnError;
             foreach ($shape->getMembers() as $member) {
                 if (\in_array($member->getLocation(), ['header', 'headers'])) {
                     continue;
                 }
 
+                // Avoid conflicts with PHP properties. Those AWS members are included in the AWSError anyway.
+                if ($forException && \in_array(strtolower($member->getName()), ['code', 'message'])) {
+                    continue;
+                }
+
                 if (!$member->isNullable() && !$member->isRequired()) {
                     $properties[] = strtr('if (null !== $v = (PROPERTY_ACCESSOR)) {
                         $this->PROPERTY_NAME = $v;