v2: Updates

* Simplifies & beautifies everything
* Introduces a new Class system.
* Errors are defaulted to AWS's handler.
* New function names & more efficient handling.
* Should fix a majority of the errors.

Please read the README for more!

aws/Aws/Api/ErrorParser/RestJsonErrorParser.php

@@ -1,17 +1,31 @@
 <?php
 namespace Aws\Api\ErrorParser;
 
+use Aws\Api\Parser\JsonParser;
+use Aws\Api\Service;
+use Aws\Api\StructureShape;
+use Aws\CommandInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
  * Parses JSON-REST errors.
  */
-class RestJsonErrorParser
+class RestJsonErrorParser extends AbstractErrorParser
 {
     use JsonParserTrait;
 
-    public function __invoke(ResponseInterface $response)
+    private $parser;
+
+    public function __construct(Service $api = null, JsonParser $parser = null)
     {
+        parent::__construct($api);
+        $this->parser = $parser ?: new JsonParser();
+    }
+
+    public function __invoke(
+        ResponseInterface $response,
+        CommandInterface $command = null
+    ) {
         $data = $this->genericHandler($response);
 
         // Merge in error data from the JSON body
@@ -30,6 +44,15 @@ class RestJsonErrorParser
             $data['code'] = $colon ? substr($code, 0, $colon) : $code;
         }
 
+        // Retrieve error message directly
+        $data['message'] = isset($data['parsed']['message'])
+            ? $data['parsed']['message']
+            : (isset($data['parsed']['Message'])
+                ? $data['parsed']['Message']
+                : null);
+
+        $this->populateShape($data, $response, $command);
+
         return $data;
     }
 }