Synchronization with WrikePhpLibrary changes + general refactoring.

README.md

@@ -1,9 +1,7 @@
 Wrike PHP JMSSERIALIZER
 ================================
 
-**Proof of Concept - NOT YET USABLE!!!**
-
-**First usable version around 2017-03-01**
+**Alpha version, first usable version around 2017-03-06**
 
 Introduction
 ------------
@@ -52,6 +50,56 @@ Run PHPUnit tests:
 ./vendor/bin/phpunit
 ``` 
 
+Usage
+------------
+All \GuzzleHttp\Client methods plus methods for \Zibios\WrikePhpLibrary\Client\ClientInterface.
+
+```php
+/**
+ * Standard usage
+ */
+$serializer = SerializerFactory::create(); // \JMS\Serializer\SerializerInterface
+```
+
+```php
+$resourceModelTransformer = TransformerFactory::createResourceModelTransformer($serializer);
+
+/**
+ * @param ResponseInterface $response
+ * @param string            $resourceClass
+ *
+ * @return ResourceModelInterface
+ */
+$result = $resourceModelTransformer->transform($response, $resourceClass);
+
+$result => [
+    <ResourceModelInterface>,
+    <ResourceModelInterface>,
+    ...
+]
+```
+
+```php
+$responseModelTransformer = TransformerFactory::createResponseModelTransformer($serializer);
+
+/**
+ * @param ResponseInterface $response
+ * @param string            $resourceClass
+ *
+ * @return ResponseModelInterface
+ */
+$result = $responseModelTransformer->transform($response, $resourceClass);
+
+$result => ResponseModelInterface {
+    kind: <ResponseType>;
+    data:
+        [
+            <ResourceModelInterface>,
+            <ResourceModelInterface>,
+            ...
+        ]
+}
+```
 
 Reference
 ---------

src/SerializerFactory.php

@@ -23,7 +23,7 @@ class SerializerFactory
     /**
      * @return SerializerInterface
      */
-    public static function createSerializer()
+    public static function create()
     {
         AnnotationRegistry::registerAutoloadNamespace(
             'JMS\Serializer\Annotation',

src/Transformer/AbstractResponseTransformer.php → src/Transformer/Response/AbstractResponseTransformer.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Zibios\WrikePhpJmsserializer\Transformer;
+namespace Zibios\WrikePhpJmsserializer\Transformer\Response;
 
 use JMS\Serializer\SerializerInterface;
 use Zibios\WrikePhpJmsserializer\Model\Account\AccountResponseModel;
@@ -44,7 +44,7 @@
 use Zibios\WrikePhpLibrary\Resource\UserResource;
 use Zibios\WrikePhpLibrary\Resource\VersionResource;
 use Zibios\WrikePhpLibrary\Resource\WorkflowResource;
-use Zibios\WrikePhpLibrary\Transformer\AbstractResponseTransformer as BaseAbstractResponseTransformer;
+use Zibios\WrikePhpLibrary\Transformer\Response\Psr\AbstractPsrResponseTransformer as BaseAbstractResponseTransformer;
 
 /**
  * Response Transformer Abstract.

src/Transformer/Response/ResourceModelTransformer.php

@@ -14,7 +14,6 @@
 use Psr\Http\Message\ResponseInterface;
 use Zibios\WrikePhpJmsserializer\Model\ResourceModelInterface;
 use Zibios\WrikePhpJmsserializer\Model\ResponseModelInterface;
-use Zibios\WrikePhpJmsserializer\Transformer\AbstractResponseTransformer;
 
 /**
  * Resource Model Transformer.
@@ -30,7 +29,7 @@ class ResourceModelTransformer extends AbstractResponseTransformer
      *
      * @return array|ResourceModelInterface[]|null
      */
-    public function transform(ResponseInterface $response, $resourceClass)
+    public function transform($response, $resourceClass)
     {
         $stringBody = $this->transformToStringBody($response);
         /** @var ResponseModelInterface $responseModel */

src/Transformer/Response/ResponseModelTransformer.php

@@ -13,7 +13,6 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Zibios\WrikePhpJmsserializer\Model\ResponseModelInterface;
-use Zibios\WrikePhpJmsserializer\Transformer\AbstractResponseTransformer;
 
 /**
  * Response Model Transformer.
@@ -29,7 +28,7 @@ class ResponseModelTransformer extends AbstractResponseTransformer
      *
      * @return ResponseModelInterface
      */
-    public function transform(ResponseInterface $response, $resourceClass)
+    public function transform($response, $resourceClass)
     {
         $stringBody = $this->transformToStringBody($response);
         /** @var ResponseModelInterface $responseModel */

src/TransformerFactory.php

@@ -52,7 +52,7 @@ public static function createResponseModelTransformer(SerializerInterface $seria
     protected static function prepareSerializer(SerializerInterface $serializer = null)
     {
         if ($serializer === null) {
-            $serializer = SerializerFactory::createSerializer();
+            $serializer = SerializerFactory::create();
         }
 
         return $serializer;

tests/SerializerFactoryTest.php

@@ -20,9 +20,9 @@
  */
 class SerializerFactoryTest extends TestCase
 {
-    public function test_createSerializer()
+    public function test_create()
     {
-        $serializer = SerializerFactory::createSerializer();
+        $serializer = SerializerFactory::create();
         self::assertInstanceOf(SerializerInterface::class, $serializer);
         self::assertInstanceOf(Serializer::class, $serializer);
     }

tests/Transformer/Response/ResourceModelTransformerTest.php

@@ -30,7 +30,6 @@
 use Zibios\WrikePhpJmsserializer\Model\Version\VersionResourceModel;
 use Zibios\WrikePhpJmsserializer\Model\Workflow\WorkflowResourceModel;
 use Zibios\WrikePhpJmsserializer\SerializerFactory;
-use Zibios\WrikePhpJmsserializer\Tests\Transformer\ResponseTransformerTestCase;
 use Zibios\WrikePhpJmsserializer\Transformer\Response\ResourceModelTransformer;
 use Zibios\WrikePhpLibrary\Api;
 use Zibios\WrikePhpLibrary\Resource\AccountResource;
@@ -59,7 +58,7 @@ class ResourceModelTransformerTest extends ResponseTransformerTestCase
 
     public function setUp()
     {
-        $serializer = SerializerFactory::createSerializer();
+        $serializer = SerializerFactory::create();
         $this->object = new ResourceModelTransformer($serializer);
     }
 
@@ -134,8 +133,9 @@ public function test_testNormalizeInstancesProviderCoverAllMethods()
 
         $excludedMethods = [
             '__construct',
-            'getBearerToken',
-            'setBearerToken',
+            'recreateForNewAccessToken',
+            'recreateForNewApiExceptionTransformer',
+            'recreateForNewResponseTransformer',
         ];
 
         foreach ($expectedMethodNames as $expectedMethodName) {

tests/Transformer/Response/ResponseModelTransformerTest.php

@@ -47,7 +47,6 @@
 use Zibios\WrikePhpJmsserializer\Model\Workflow\WorkflowResourceModel;
 use Zibios\WrikePhpJmsserializer\Model\Workflow\WorkflowResponseModel;
 use Zibios\WrikePhpJmsserializer\SerializerFactory;
-use Zibios\WrikePhpJmsserializer\Tests\Transformer\ResponseTransformerTestCase;
 use Zibios\WrikePhpJmsserializer\Transformer\Response\ResponseModelTransformer;
 use Zibios\WrikePhpLibrary\Api;
 use Zibios\WrikePhpLibrary\Resource\AccountResource;
@@ -76,7 +75,7 @@ class ResponseModelTransformerTest extends ResponseTransformerTestCase
 
     public function setUp()
     {
-        $serializer = SerializerFactory::createSerializer();
+        $serializer = SerializerFactory::create();
         $this->object = new ResponseModelTransformer($serializer);
     }
 
@@ -152,8 +151,9 @@ public function test_testNormalizeInstancesProviderCoverAllMethods()
 
         $excludedMethods = [
             '__construct',
-            'getBearerToken',
-            'setBearerToken',
+            'recreateForNewAccessToken',
+            'recreateForNewApiExceptionTransformer',
+            'recreateForNewResponseTransformer',
         ];
 
         foreach ($expectedMethodNames as $expectedMethodName) {

tests/Transformer/ResponseTransformerTestCase.php → tests/Transformer/Response/ResponseTransformerTestCase.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Zibios\WrikePhpJmsserializer\Tests\Transformer;
+namespace Zibios\WrikePhpJmsserializer\Tests\Transformer\Response;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;

tests/TransformerFactoryTest.php

@@ -28,7 +28,7 @@ public function test_createResourceModelTransformer()
         self::assertInstanceOf(ResponseTransformerInterface::class, $transformer);
         self::assertInstanceOf(ResourceModelTransformer::class, $transformer);
 
-        $serializer = SerializerFactory::createSerializer();
+        $serializer = SerializerFactory::create();
         $transformer = TransformerFactory::createResourceModelTransformer($serializer);
         self::assertInstanceOf(ResponseTransformerInterface::class, $transformer);
         self::assertInstanceOf(ResourceModelTransformer::class, $transformer);
@@ -40,7 +40,7 @@ public function test_createResponseModelTransformer()
         self::assertInstanceOf(ResponseTransformerInterface::class, $transformer);
         self::assertInstanceOf(ResponseModelTransformer::class, $transformer);
 
-        $serializer = SerializerFactory::createSerializer();
+        $serializer = SerializerFactory::create();
         $transformer = TransformerFactory::createResponseModelTransformer($serializer);
         self::assertInstanceOf(ResponseTransformerInterface::class, $transformer);
         self::assertInstanceOf(ResponseModelTransformer::class, $transformer);