ProductImage and ProductCollection now extends ArrayCollection

- Refactored GetProducts response - Fixed many tests
mobly · Jul 16, 2015 · 1224360 · 1224360
1 parent 26a0659
commit 1224360
Show file tree

Hide file tree

Showing 139 changed files with 1,009 additions and 943 deletions.
diff --git a/src/Common/Api/ErrorParser/XmlErrorParser.php b/src/Common/Api/ErrorParser/XmlErrorParser.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\ErrorParser;
+<?php namespace SellerCenter\SDK\Common\Api\ErrorParser;
 
 use GuzzleHttp\Message\ResponseInterface;
 use JMS\Serializer\SerializerBuilder;
@@ -21,7 +19,7 @@ public function __invoke(ResponseInterface $response)
             $serializer = SerializerBuilder::create()->build();
             return $serializer->deserialize(
                 $response->xml()->asXML(),
-                'SellerCenter\SDK\Common\Api\ErrorResponse',
+                'SellerCenter\SDK\Common\Api\Response\Error\ErrorResponse',
                 'xml'
             );
         }

diff --git a/src/Common/Api/FilesystemApiProvider.php b/src/Common/Api/FilesystemApiProvider.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api;
+<?php namespace SellerCenter\SDK\Common\Api;
 
 use GuzzleHttp\Utils;
 
@@ -108,6 +106,7 @@ private function load($service, $version, $type)
         $path = "{$this->path}/{$service}-{$version}.{$type}.php";
 
         if (file_exists($path)) {
+            /** @noinspection PhpIncludeInspection */
             return require $path;
         }
 

diff --git a/src/Common/Api/Parser/AbstractParser.php b/src/Common/Api/Parser/AbstractParser.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\Parser;
+<?php namespace SellerCenter\SDK\Common\Api\Parser;
 
 use SellerCenter\SDK\Common\Api\Service;
 

diff --git a/src/Common/Api/Parser/AbstractRestParser.php b/src/Common/Api/Parser/AbstractRestParser.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\Parser;
+<?php namespace SellerCenter\SDK\Common\Api\Parser;
 
 use GuzzleHttp\Message\ResponseInterface;
 

diff --git a/src/Common/Api/Parser/RestXmlParser.php b/src/Common/Api/Parser/RestXmlParser.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\Parser;
+<?php namespace SellerCenter\SDK\Common\Api\Parser;
 
 use GuzzleHttp\Message\ResponseInterface;
 use SellerCenter\SDK\Common\Api\Service;

diff --git a/src/Common/Api/Parser/XmlParser.php b/src/Common/Api/Parser/XmlParser.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\Parser;
+<?php namespace SellerCenter\SDK\Common\Api\Parser;
 
 use JMS\Serializer\SerializerBuilder;
 use SimpleXMLElement;

diff --git a/src/Common/Api/Response/BodyInterface.php b/src/Common/Api/Response/BodyInterface.php
@@ -0,0 +1,6 @@
+<?php namespace SellerCenter\SDK\Common\Api\Response;
+
+interface BodyInterface
+{
+
+}
diff --git a/src/Common/Api/ErrorResponse/Body.php → src/Common/Api/Response/Error/Body.php b/src/Common/Api/ErrorResponse/Body.php → src/Common/Api/Response/Error/Body.php
@@ -1,21 +1,20 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\ErrorResponse;
+<?php namespace SellerCenter\SDK\Common\Api\Response\Error;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use JMS\Serializer\Annotation as JMS;
+use SellerCenter\SDK\Common\Api\Response\BodyInterface;
 
 /**
  * Class Body
  *
- * @package SellerCenter\SDK\Common\Api\ErrorResponse
+ * @package SellerCenter\SDK\Common\Api\Response\Error\ErrorResponse
  * @author Daniel Costa
  */
-class Body
+class Body implements BodyInterface
 {
     /**
      * @var ArrayCollection
-     * @JMS\Type("ArrayCollection<SellerCenter\SDK\Common\Api\ErrorResponse\Detail>")
+     * @JMS\Type("ArrayCollection<SellerCenter\SDK\Common\Api\Response\Error\ErrorResponse\Detail>")
      * @JMS\XmlList(entry="ErrorDetail")
      */
     protected $detail;

diff --git a/src/Common/Api/ErrorResponse/Detail.php → src/Common/Api/Response/Error/Detail.php b/src/Common/Api/ErrorResponse/Detail.php → src/Common/Api/Response/Error/Detail.php
@@ -1,13 +1,11 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\ErrorResponse;
+<?php namespace SellerCenter\SDK\Common\Api\Response\Error;
 
 use JMS\Serializer\Annotation as JMS;
 
 /**
  * Class ErrorBody
  *
- * @package SellerCenter\SDK\Common\Api\ErrorResponse
+ * @package SellerCenter\SDK\Common\Api\Response\Error\ErrorResponse
  * @author Daniel Costa
  */
 class Detail

diff --git a/src/Common/Api/ErrorResponse.php → ...mmon/Api/Response/Error/ErrorResponse.php b/src/Common/Api/ErrorResponse.php → ...mmon/Api/Response/Error/ErrorResponse.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api;
+<?php namespace SellerCenter\SDK\Common\Api\Response\Error;
 
 use JMS\Serializer\Annotation as JMS;
 
@@ -14,53 +12,53 @@
 class ErrorResponse
 {
     /**
-     * @var ErrorResponse\Head
+     * @var Head
      * @JMS\SerializedName("Head")
-     * @JMS\Type("SellerCenter\SDK\Common\Api\ErrorResponse\Head")
+     * @JMS\Type("SellerCenter\SDK\Common\Api\Response\Error\Head")
      */
     protected $head;
 
     /**
-     * @var ErrorResponse\Body
+     * @var Body
      * @JMS\SerializedName("Body")
-     * @JMS\Type("SellerCenter\SDK\Common\Api\ErrorResponse\Body")
+     * @JMS\Type("SellerCenter\SDK\Common\Api\Response\Error\Body")
      */
     protected $body;
 
     /**
-     * @return ErrorResponse\Head
+     * @return Head
      */
     public function getHead()
     {
         return $this->head;
     }
 
     /**
-     * @param ErrorResponse\Head $head
+     * @param Head $head
      *
      * @return ErrorResponse
      */
-    public function setHead($head)
+    public function setHead(Head $head)
     {
         $this->head = $head;
 
         return $this;
     }
 
     /**
-     * @return ErrorResponse\Body
+     * @return Body
      */
     public function getBody()
     {
         return $this->body;
     }
 
     /**
-     * @param ErrorResponse\Body $body
+     * @param Body $body
      *
      * @return ErrorResponse
      */
-    public function setBody($body)
+    public function setBody(Body $body)
     {
         $this->body = $body;
 

diff --git a/src/Common/Api/ErrorResponse/Head.php → src/Common/Api/Response/Error/Head.php b/src/Common/Api/ErrorResponse/Head.php → src/Common/Api/Response/Error/Head.php
@@ -1,16 +1,15 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\ErrorResponse;
+<?php namespace SellerCenter\SDK\Common\Api\Response\Error;
 
 use JMS\Serializer\Annotation as JMS;
+use SellerCenter\SDK\Common\Api\Response\HeadInterface;
 
 /**
  * Class ErrorHead
  *
- * @package SellerCenter\SDK\Common\Api\ErrorResponse
+ * @package SellerCenter\SDK\Common\Api\Response\Error\ErrorResponse
  * @author Daniel Costa
  */
-class Head
+class Head implements HeadInterface
 {
     /**
      * @var string

diff --git a/src/Common/Api/Response/HeadInterface.php b/src/Common/Api/Response/HeadInterface.php
@@ -0,0 +1,16 @@
+<?php namespace SellerCenter\SDK\Common\Api\Response;
+
+interface HeadInterface
+{
+    /**
+     * @return string
+     */
+    public function getRequestAction();
+
+    /**
+     * @param string $requestAction
+     *
+     * @return HeadInterface
+     */
+    public function setRequestAction($requestAction);
+}
diff --git a/src/Common/Api/Response/Success/Body.php b/src/Common/Api/Response/Success/Body.php
@@ -0,0 +1,15 @@
+<?php namespace SellerCenter\SDK\Common\Api\Response\Success;
+
+use JMS\Serializer\Annotation as JMS;
+use SellerCenter\SDK\Common\Api\Response\BodyInterface;
+
+/**
+ * Class Body
+ *
+ * @package SellerCenter\SDK\Common\Api\Response\Success\SuccessResponse
+ * @author Daniel Costa
+ */
+class Body implements BodyInterface
+{
+
+}
diff --git a/src/Common/Api/SuccessResponse/Head.php → src/Common/Api/Response/Success/Head.php b/src/Common/Api/SuccessResponse/Head.php → src/Common/Api/Response/Success/Head.php
@@ -1,17 +1,16 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\SuccessResponse;
+<?php namespace SellerCenter\SDK\Common\Api\Response\Success;
 
 use JMS\Serializer\Annotation as JMS;
+use SellerCenter\SDK\Common\Api\Response\HeadInterface;
 
 /**
  * Class Head
  *
- * @package SellerCenter\SDK\Common\Api\SuccessResponse
+ * @package SellerCenter\SDK\Common\Api\Response\Success\SuccessResponse
  * @author Daniel Costa
  * @JMS\XmlRoot("Head")
  */
-class Head
+class Head implements HeadInterface
 {
     /**
      * @var string
@@ -131,15 +130,15 @@ public function setTimestamp($timestamp)
     }
 
     /**
-     * @return RequestParameters
+     * @return array
      */
     public function getRequestParameters()
     {
         return $this->requestParameters;
     }
 
     /**
-     * @param RequestParameters $requestParameters
+     * @param array $requestParameters
      *
      * @return Head
      */

diff --git a/src/Common/Api/SuccessResponse.php → .../Api/Response/Success/SuccessResponse.php b/src/Common/Api/SuccessResponse.php → .../Api/Response/Success/SuccessResponse.php
@@ -1,8 +1,7 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api;
+<?php namespace SellerCenter\SDK\Common\Api\Response\Success;
 
 use JMS\Serializer\Annotation as JMS;
+use SellerCenter\SDK\Common\Api\Response\Success;
 
 /**
  * Class SuccessResponse
@@ -14,53 +13,53 @@
 class SuccessResponse
 {
     /**
-     * @var SuccessResponse\Head
+     * @var Head
      * @JMS\SerializedName("Head")
-     * @JMS\Type("SellerCenter\SDK\Common\Api\SuccessResponse\Head")
+     * @JMS\Type("SellerCenter\SDK\Common\Api\Response\Success\Head")
      */
     protected $head;
 
     /**
-     * @var SuccessResponse\Body
+     * @var Body
      * @JMS\SerializedName("Body")
-     * @JMS\Type("SellerCenter\SDK\Common\Api\SuccessResponse\Body")
+     * @JMS\Type("SellerCenter\SDK\Common\Api\Response\Success\Body")
      */
     protected $body;
 
     /**
-     * @return SuccessResponse\Head
+     * @return Head
      */
     public function getHead()
     {
         return $this->head;
     }
 
     /**
-     * @param SuccessResponse\Head $head
+     * @param Head $head
      *
-     * @return ErrorResponse
+     * @return SuccessResponse
      */
-    public function setHead($head)
+    public function setHead(Head $head)
     {
         $this->head = $head;
 
         return $this;
     }
 
     /**
-     * @return SuccessResponse\Body
+     * @return Body
      */
     public function getBody()
     {
         return $this->body;
     }
 
     /**
-     * @param SuccessResponse\Body $body
+     * @param Body $body
      *
-     * @return ErrorResponse
+     * @return SuccessResponse
      */
-    public function setBody($body)
+    public function setBody(Body $body)
     {
         $this->body = $body;
 

diff --git a/src/Common/Api/Serializer/RestSerializer.php b/src/Common/Api/Serializer/RestSerializer.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\Serializer;
+<?php namespace SellerCenter\SDK\Common\Api\Serializer;
 
 use GuzzleHttp\Command\CommandTransaction;
 use GuzzleHttp\Message\RequestInterface;
@@ -92,11 +90,10 @@ private function serialize(RequestInterface $request, $operation, array $args)
     private function buildEndpoint($operation, array $args)
     {
         $endpoint = Url::fromString($this->endpoint);
-        $uri = (string) $endpoint;
         $varspecs = [];
 
         if (isset($operation['http']['requestUri'])) {
-            $uri = $endpoint->combine($operation['http']['requestUri']);
+            $endpoint->combine($operation['http']['requestUri']);
 
             // Create an associative array of varspecs used in expansions
             if (isset($operation['parameters'])) {

diff --git a/src/Common/Api/Serializer/RestXmlSerializer.php b/src/Common/Api/Serializer/RestXmlSerializer.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\Serializer;
+<?php namespace SellerCenter\SDK\Common\Api\Serializer;
 
 use GuzzleHttp\Message\RequestInterface;
 use GuzzleHttp\Stream\Stream;

diff --git a/src/Common/Api/Serializer/XmlSerializer.php b/src/Common/Api/Serializer/XmlSerializer.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace SellerCenter\SDK\Common\Api\Serializer;
+<?php namespace SellerCenter\SDK\Common\Api\Serializer;
 
 use JMS\Serializer\SerializerBuilder;