Keep all XML handling inside parsers

gayanhewa · Sep 9, 2015 · 61f0eb3 · 61f0eb3
1 parent 0814b6e
commit 61f0eb3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/src/S3/AmbiguousSuccessParser.php b/src/S3/AmbiguousSuccessParser.php
@@ -6,7 +6,6 @@
 use Aws\Exception\AwsException;
 use Exception;
 use Psr\Http\Message\ResponseInterface;
-use SimpleXMLElement;
 
 class AmbiguousSuccessParser extends AbstractParser
 {
@@ -18,12 +17,18 @@ class AmbiguousSuccessParser extends AbstractParser
 
     /** @var callable */
     private $parser;
+    /** @var callable */
+    private $errorParser;
     /** @var string */
     private $exceptionClass;
 
-    public function __construct(callable $parser, $exceptionClass = AwsException::class)
-    {
+    public function __construct(
+        callable $parser,
+        callable $errorParser,
+        $exceptionClass = AwsException::class
+    ) {
         $this->parser = $parser;
+        $this->errorParser = $errorParser;
         $this->exceptionClass = $exceptionClass;
     }
 
@@ -34,12 +39,10 @@ public function __invoke(
         if (200 === $response->getStatusCode()
             && isset(self::$ambiguousSuccesses[$command->getName()])
         ) {
-            $xml = new SimpleXMLElement($response->getBody());
-            if ('Error' === $xml->getName()) {
-                throw $this->parseError(
-                    $xml->xpath('/Error/Message')[0],
-                    $command
-                );
+            $errorParser = $this->errorParser;
+            $parsed = $errorParser($response);
+            if (isset($parsed['code']) && isset($parsed['message'])) {
+                throw $this->parseError($parsed['message'], $command);
             }
         }
 

diff --git a/src/S3/S3Client.php b/src/S3/S3Client.php
@@ -495,7 +495,11 @@ public static function _applyApiProvider($value, array &$args, HandlerList $list
     {
         ClientResolver::_apply_api_provider($value, $args, $list);
         $args['parser'] = new GetBucketLocationParser(
-            new AmbiguousSuccessParser($args['parser'], $args['exception_class'])
+            new AmbiguousSuccessParser(
+                $args['parser'],
+                $args['error_parser'],
+                $args['exception_class']
+            )
         );
     }
 

diff --git a/tests/S3/S3ClientTest.php b/tests/S3/S3ClientTest.php
@@ -414,7 +414,7 @@ public function testRetries200Errors(
                     return new FulfilledPromise(new Response(
                         200,
                         [],
-                        '<?xml version="1.0" encoding="UTF-8"?><node></node>'
+                        $this->getWellFormedXml()
                     ));
                 }
 
@@ -500,4 +500,9 @@ private function getMalformedXml()
         <Size>10</Size>
 EOXML;
     }
+
+    private function getWellFormedXml()
+    {
+        return '<?xml version="1.0" encoding="UTF-8"?><node></node>';
+    }
 }