Synchronization with WrikePhpLibrary changes + general refactoring.

Author: zibios

README.md

@@ -1,19 +1,14 @@
 Wrike PHP SDK
 ================================
 
-**Proof of Concept - NOT YET USABLE!!!**
-
-**First usable version around 2017-03-01**
+**Alpha version, first usable version around 2017-03-06**
 
 Introduction
 ------------
 
 **This is full pre-configured Wrike PHP SDK package for [Wrike PHP Library](https://github.com/zibios/wrike-php-library).**
 
-For general purpose please check [full configured Wrike PHP SDK](https://github.com/zibios/wrike-php-sdk).
-For none standard purposes please check [generic Wrike PHP Library](https://github.com/zibios/wrike-php-library),
-[HTTP Client plugin](https://github.com/zibios/wrike-php-guzzle),
-and [response transformer plugin](https://github.com/zibios/wrike-php-jmsserializer).
+For more info or none standard purposes please check [generic Wrike PHP Library](https://github.com/zibios/wrike-php-library).
 
 Project status
 --------------

composer.json

@@ -12,7 +12,8 @@
     "require": {
         "php": ">=5.5",
         "zibios/wrike-php-library": "dev-master",
-        "zibios/wrike-php-guzzle": "dev-master"
+        "zibios/wrike-php-guzzle": "dev-master",
+        "zibios/wrike-php-jmsserializer": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": ">=4.0,<6.0"

src/ApiFactory.php

@@ -12,19 +12,15 @@
 namespace Zibios\WrikePhpSdk;
 
 use Zibios\WrikePhpGuzzle\ClientFactory;
-use Zibios\WrikePhpGuzzle\Transformer\ApiException\WrikeTransformer;
+use Zibios\WrikePhpGuzzle\Transformer\ApiException\GuzzleTransformer;
 use Zibios\WrikePhpLibrary\Api;
-use Zibios\WrikePhpLibrary\ImmutableApi;
-use Zibios\WrikePhpLibrary\Traits\AssertIsValidBearerToken;
 use Zibios\WrikePhpLibrary\Transformer\Response\Psr\ArrayBodyTransformer;
 
 /**
  * Api Factory.
  */
 class ApiFactory
 {
-    use AssertIsValidBearerToken;
-
     /**
      * @param string|null $bearerToken
      *
@@ -36,24 +32,8 @@ public static function create($bearerToken = '')
     {
         $client = ClientFactory::create();
         $responseTransformer = new ArrayBodyTransformer();
-        $apiExceptionTransformer = new WrikeTransformer();
+        $apiExceptionTransformer = new GuzzleTransformer();
 
         return new Api($client, $responseTransformer, $apiExceptionTransformer, $bearerToken);
     }
-
-    /**
-     * @param string|null $bearerToken
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return ImmutableApi
-     */
-    public static function createImmutable($bearerToken = '')
-    {
-        $client = ClientFactory::create();
-        $responseTransformer = new ArrayBodyTransformer();
-        $apiExceptionTransformer = new WrikeTransformer();
-
-        return new ImmutableApi($client, $responseTransformer, $apiExceptionTransformer, $bearerToken);
-    }
 }

tests/ApiFactoryTest.php

@@ -13,7 +13,7 @@
 
 use Zibios\WrikePhpLibrary\Api;
 use Zibios\WrikePhpLibrary\ApiInterface;
-use Zibios\WrikePhpLibrary\ImmutableApi;
+use Zibios\WrikePhpLibrary\ImmutableApiInterface;
 use Zibios\WrikePhpSdk\ApiFactory;
 
 /**
@@ -28,13 +28,7 @@ public function test_create()
         $api = ApiFactory::create();
         self::assertInstanceOf(Api::class, $api);
         self::assertInstanceOf(ApiInterface::class, $api);
-    }
-
-    public function test_createImmutable()
-    {
-        $api = ApiFactory::createImmutable();
-        self::assertInstanceOf(ImmutableApi::class, $api);
-        self::assertInstanceOf(ApiInterface::class, $api);
+        self::assertInstanceOf(ImmutableApiInterface::class, $api);
     }
 
     /**

tests/Integration/ApiExceptionWrikeTransformerTest.php

@@ -15,7 +15,7 @@
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use Zibios\WrikePhpGuzzle\Client\GuzzleClient;
-use Zibios\WrikePhpGuzzle\Transformer\ApiException\WrikeTransformer;
+use Zibios\WrikePhpGuzzle\Transformer\ApiException\GuzzleTransformer;
 use Zibios\WrikePhpLibrary\Api;
 use Zibios\WrikePhpLibrary\Exception\Api\AccessForbiddenException;
 use Zibios\WrikePhpLibrary\Exception\Api\ApiException;
@@ -74,7 +74,7 @@ public function wrikeExceptionsProvider()
      */
     public function test_wrikeExceptions($responseCode, $errorName, $expectedExceptionClass)
     {
-        $apiExceptionTransformer = new WrikeTransformer();
+        $apiExceptionTransformer = new GuzzleTransformer();
         $responseTransformer = new RawResponseTransformer();
         $responseMock = new MockHandler([
             new Response(