take it

lib/AmazonECS.class.php

@@ -56,6 +56,15 @@ public function __construct($accessKey, $secretKey, $country = 'DE')
     $this->responseConfig['country']    = $country;
   }
 
+  /**
+   * execute search
+   * 
+   * @param string $pattern
+   *
+   * @return array|object return type depends on setting 
+   *
+   * @see returnType()
+   */
   public function search($pattern)
   {
     if (false === isset($this->requestConfig['category']))
@@ -73,7 +82,15 @@ public function search($pattern)
     );
   }
 
-  protected function buildRequestParams($function, $params)
+  /**
+   * Builds the request parameters
+   *
+   * @param string $function
+   * @param array  $params
+   *
+   * @return array
+   */
+  protected function buildRequestParams($function, array $params)
   {
     return array(
       'AWSAccessKeyId' => $this->requestConfig['accessKey'],
@@ -85,13 +102,25 @@ protected function buildRequestParams($function, $params)
     );
   }
 
+  /**
+   * Set or get the country
+   * 
+   * if the country argument is null it will return the current 
+   * country, otherwise it will set the country and reutrn itself.
+   * 
+   * @param string|null $country
+   *
+   * @return string|AmazonECS depends on country argument
+   */
   public function country($country = null)
   {
-    if (null !== $country)
+    if (null === $country)
     {
-      $this->responseConfig['country'] = $country;
+      return $this->responseConfig['country'];
     }
 
+    $this->responseConfig['country'] = $country;
+
     return $this;
   }
 
@@ -109,20 +138,36 @@ public function category($category = null)
 
   public function responseGroup($responseGroup = null)
   {
-    if (null !== $responseGroup)
+    if (null === $responseGroup)
     {
-      $this->responseConfig['responseGroup'] = $responseGroup;
+      return $this->responseConfig['responseGroup'];
     }
 
+    $this->responseConfig['responseGroup'] = $responseGroup;
+
     return $this;
   }
 
-  public function setReturnType($type)
+  public function returnType($type = null)
   {
+    if (null === $type)
+    {
+      return $this->responseConfig['returnType'];
+    }
+
     $this->responseConfig['returnType'] = $type;
+
     return $this;
   }
 
+  /**
+   * @deprected use returnType() instead
+   */
+  public function setReturnType($type)
+  {
+    return $this->returnType($type);
+  }
+
   /**
    * Returns the Response either as Array or Array/Object
    *
@@ -143,7 +188,9 @@ protected function returnData($object)
       break;
 
       default:
-        return false;
+        throw new InvalidArgumentException(sprintf(
+          "Unknwon return type %s", $this->responseConfig['returnType']
+        ));
       break;
     }
   }
@@ -160,18 +207,23 @@ protected function objectToArray($object)
     $out = array();
     foreach ($object as $key => $value)
     {
-      switch(true)
+      switch (true)
       {
         case is_object($value):
           $out[$key] = $this->objectToArray($value);
-          break;
+        break;
+
         case is_array($value):
           $out[$key] = $this->objectToArray($value);
+
+        break;
+
+        default:
+          $out[$key] = $value;
         break;
-      default:
-        $out[$key] = $value;
       }
     }
+
     return $out;
   }