remove the abstract ApiClient base class

Author: xabbuh

CHANGELOG.md

@@ -4,6 +4,14 @@ CHANGELOG
 0.3.0
 -----
 
+* Removed the `ApiClient` class. The `$requestHandler` and `$version` attributes
+  have been moved to the former child classes of the `ApiClient` class and
+  their visibility has been changed to `private`.
+
+* The visibility of the `$documentDataSerializer` property of the `ActivityProfileApiClient`,
+  `AgentProfileApiClient`, `DocumentApiClient`, and `StateApiClient` classes
+  has been changed to `private`.
+
 * Removed the `getRequestHandler()` method from the API classes:
 
   * `ActivityProfileApiClient::getRequestHandler()`

UPGRADE.md

@@ -4,6 +4,14 @@ UPGRADE
 Upgrading from 0.2 to 0.3
 -------------------------
 
+* Removed the `ApiClient` class. The `$requestHandler` and `$version` attributes
+  have been moved to the former child classes of the `ApiClient` class and
+  their visibility has been changed to `private`.
+
+* The visibility of the `$documentDataSerializer` property of the `ActivityProfileApiClient`,
+  `AgentProfileApiClient`, `DocumentApiClient`, and `StateApiClient` classes
+  has been changed to `private`.
+
 * Removed the `getRequestHandler()` method from the API classes:
 
   * `ActivityProfileApiClient::getRequestHandler()`

src/Api/ApiClient.php

@@ -21,12 +21,11 @@
  *
  * @author Christian Flothmann <[email protected]>
  */
-abstract class DocumentApiClient extends ApiClient
+abstract class DocumentApiClient
 {
-    /**
-     * @var DocumentDataSerializerInterface
-     */
-    protected $documentDataSerializer;
+    private $requestHandler;
+    private $version;
+    private $documentDataSerializer;
 
     /**
      * @param HandlerInterface                $requestHandler         The HTTP request handler
@@ -35,8 +34,8 @@ abstract class DocumentApiClient extends ApiClient
      */
     public function __construct(HandlerInterface $requestHandler, $version, DocumentDataSerializerInterface $documentDataSerializer)
     {
-        parent::__construct($requestHandler, $version);
-
+        $this->requestHandler = $requestHandler;
+        $this->version = $version;
         $this->documentDataSerializer = $documentDataSerializer;
     }
 

src/Api/DocumentApiClient.php

@@ -27,21 +27,12 @@
  *
  * @author Christian Flothmann <[email protected]>
  */
-final class StatementsApiClient extends ApiClient implements StatementsApiClientInterface
+final class StatementsApiClient implements StatementsApiClientInterface
 {
-    /**
-     * @var StatementSerializerInterface
-     */
+    private $requestHandler;
+    private $version;
     private $statementSerializer;
-
-    /**
-     * @var StatementResultSerializerInterface
-     */
     private $statementResultSerializer;
-
-    /**
-     * @var ActorSerializerInterface
-     */
     private $actorSerializer;
 
     /**
@@ -58,7 +49,8 @@ public function __construct(
         StatementResultSerializerInterface $statementResultSerializer,
         ActorSerializerInterface $actorSerializer
     ) {
-        parent::__construct($requestHandler, $version);
+        $this->requestHandler = $requestHandler;
+        $this->version = $version;
         $this->statementSerializer = $statementSerializer;
         $this->statementResultSerializer = $statementResultSerializer;
         $this->actorSerializer = $actorSerializer;

src/Api/StatementsApiClient.php

@@ -24,7 +24,7 @@
  *
  * @author Christian Flothmann <[email protected]>
  */
-final class XApiClient extends ApiClient implements XApiClientInterface
+final class XApiClient implements XApiClientInterface
 {
     /**
      * @var SerializerRegistryInterface