Merge pull request #92 from ker0x/hotfix/issue-90

[#90] Remove Singleton design pattern on Api class
ker0x · Mar 18, 2018 · 7d94e69 · 7d94e69
2 parents 5e05f0d + 194bcee
commit 7d94e69
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 255 deletions.
diff --git a/src/Api/Code.php b/src/Api/Code.php
@@ -2,45 +2,13 @@
 
 namespace Kerox\Messenger\Api;
 
-use GuzzleHttp\ClientInterface;
 use Kerox\Messenger\Request\CodeRequest;
 use Kerox\Messenger\Response\CodeResponse;
 
 class Code extends AbstractApi
 {
     const CODE_TYPE_STANDARD = 'standard';
 
-    /**
-     * @var null|\Kerox\Messenger\Api\Code
-     */
-    private static $_instance;
-
-    /**
-     * Code constructor.
-     *
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     */
-    public function __construct(string $pageToken, ClientInterface $client)
-    {
-        parent::__construct($pageToken, $client);
-    }
-
-    /**
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     *
-     * @return \Kerox\Messenger\Api\Code
-     */
-    public static function getInstance(string $pageToken, ClientInterface $client): self
-    {
-        if (self::$_instance === null) {
-            self::$_instance = new self($pageToken, $client);
-        }
-
-        return self::$_instance;
-    }
-
     /**
      * @param int         $imageSize
      * @param string      $codeType

diff --git a/src/Api/Insights.php b/src/Api/Insights.php
@@ -2,43 +2,11 @@
 
 namespace Kerox\Messenger\Api;
 
-use GuzzleHttp\ClientInterface;
 use Kerox\Messenger\Request\InsightsRequest;
 use Kerox\Messenger\Response\InsightsResponse;
 
 class Insights extends AbstractApi
 {
-    /**
-     * @var null|\Kerox\Messenger\Api\Insights
-     */
-    private static $_instance;
-
-    /**
-     * Insights constructor.
-     *
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     */
-    public function __construct(string $pageToken, ClientInterface $client)
-    {
-        parent::__construct($pageToken, $client);
-    }
-
-    /**
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     *
-     * @return \Kerox\Messenger\Api\Insights
-     */
-    public static function getInstance(string $pageToken, ClientInterface $client): self
-    {
-        if (self::$_instance === null) {
-            self::$_instance = new self($pageToken, $client);
-        }
-
-        return self::$_instance;
-    }
-
     /**
      * @return \Kerox\Messenger\Response\InsightsResponse
      */

diff --git a/src/Api/Profile.php b/src/Api/Profile.php
@@ -2,45 +2,13 @@
 
 namespace Kerox\Messenger\Api;
 
-use GuzzleHttp\ClientInterface;
 use Kerox\Messenger\Model\ProfileSettings;
 use Kerox\Messenger\ProfileInterface;
 use Kerox\Messenger\Request\ProfileRequest;
 use Kerox\Messenger\Response\ProfileResponse;
 
 class Profile extends AbstractApi implements ProfileInterface
 {
-    /**
-     * @var null|\Kerox\Messenger\Api\Profile
-     */
-    private static $_instance;
-
-    /**
-     * Profile constructor.
-     *
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     */
-    public function __construct($pageToken, ClientInterface $client)
-    {
-        parent::__construct($pageToken, $client);
-    }
-
-    /**
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     *
-     * @return \Kerox\Messenger\Api\Profile
-     */
-    public static function getInstance(string $pageToken, ClientInterface $client): self
-    {
-        if (self::$_instance === null) {
-            self::$_instance = new self($pageToken, $client);
-        }
-
-        return self::$_instance;
-    }
-
     /**
      * @param \Kerox\Messenger\Model\ProfileSettings $profileSettings
      *

diff --git a/src/Api/Send.php b/src/Api/Send.php
@@ -2,7 +2,6 @@
 
 namespace Kerox\Messenger\Api;
 
-use GuzzleHttp\ClientInterface;
 use Kerox\Messenger\Model\Message;
 use Kerox\Messenger\Model\Message\Attachment;
 use Kerox\Messenger\Request\SendRequest;
@@ -30,37 +29,6 @@ class Send extends AbstractApi
     const TAG_PAYMENT_UPDATE = 'PAYMENT_UPDATE';
     const TAG_PERSONAL_FINANCE_UPDATE = 'PERSONAL_FINANCE_UPDATE';
 
-    /**
-     * @var null|\Kerox\Messenger\Api\Send
-     */
-    private static $_instance;
-
-    /**
-     * Send constructor.
-     *
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     */
-    public function __construct(string $pageToken, ClientInterface $client)
-    {
-        parent::__construct($pageToken, $client);
-    }
-
-    /**
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     *
-     * @return \Kerox\Messenger\Api\Send
-     */
-    public static function getInstance(string $pageToken, ClientInterface $client): self
-    {
-        if (self::$_instance === null) {
-            self::$_instance = new self($pageToken, $client);
-        }
-
-        return self::$_instance;
-    }
-
     /**
      * @param string                                $recipient
      * @param string|\Kerox\Messenger\Model\Message $message

diff --git a/src/Api/Tag.php b/src/Api/Tag.php
@@ -2,43 +2,11 @@
 
 namespace Kerox\Messenger\Api;
 
-use GuzzleHttp\ClientInterface;
 use Kerox\Messenger\Request\TagRequest;
 use Kerox\Messenger\Response\TagResponse;
 
 class Tag extends AbstractApi
 {
-    /**
-     * @var null|\Kerox\Messenger\Api\Tag
-     */
-    private static $_instance;
-
-    /**
-     * Tag constructor.
-     *
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     */
-    public function __construct(string $pageToken, ClientInterface $client)
-    {
-        parent::__construct($pageToken, $client);
-    }
-
-    /**
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     *
-     * @return \Kerox\Messenger\Api\Tag
-     */
-    public static function getInstance(string $pageToken, ClientInterface $client): self
-    {
-        if (self::$_instance === null) {
-            self::$_instance = new self($pageToken, $client);
-        }
-
-        return self::$_instance;
-    }
-
     /**
      * @return \Kerox\Messenger\Response\TagResponse
      */

diff --git a/src/Api/Thread.php b/src/Api/Thread.php
@@ -2,44 +2,12 @@
 
 namespace Kerox\Messenger\Api;
 
-use GuzzleHttp\ClientInterface;
 use Kerox\Messenger\Model\ThreadControl;
 use Kerox\Messenger\Request\ThreadRequest;
 use Kerox\Messenger\Response\ThreadResponse;
 
 class Thread extends AbstractApi
 {
-    /**
-     * @var null|\Kerox\Messenger\Api\Thread
-     */
-    private static $_instance;
-
-    /**
-     * Send constructor.
-     *
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     */
-    public function __construct(string $pageToken, ClientInterface $client)
-    {
-        parent::__construct($pageToken, $client);
-    }
-
-    /**
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     *
-     * @return \Kerox\Messenger\Api\Thread
-     */
-    public static function getInstance(string $pageToken, ClientInterface $client): self
-    {
-        if (self::$_instance === null) {
-            self::$_instance = new self($pageToken, $client);
-        }
-
-        return self::$_instance;
-    }
-
     /**
      * @param \Kerox\Messenger\Model\ThreadControl $threadControl
      *

diff --git a/src/Api/User.php b/src/Api/User.php
@@ -2,44 +2,12 @@
 
 namespace Kerox\Messenger\Api;
 
-use GuzzleHttp\ClientInterface;
 use Kerox\Messenger\Request\UserRequest;
 use Kerox\Messenger\Response\UserResponse;
 use Kerox\Messenger\UserInterface;
 
 class User extends AbstractApi implements UserInterface
 {
-    /**
-     * @var null|\Kerox\Messenger\Api\User
-     */
-    private static $_instance;
-
-    /**
-     * Send constructor.
-     *
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     */
-    public function __construct(string $pageToken, ClientInterface $client)
-    {
-        parent::__construct($pageToken, $client);
-    }
-
-    /**
-     * @param string                      $pageToken
-     * @param \GuzzleHttp\ClientInterface $client
-     *
-     * @return \Kerox\Messenger\Api\User
-     */
-    public static function getInstance(string $pageToken, ClientInterface $client): self
-    {
-        if (self::$_instance === null) {
-            self::$_instance = new self($pageToken, $client);
-        }
-
-        return self::$_instance;
-    }
-
     /**
      * @param string     $userId
      * @param array|null $fields

diff --git a/src/Api/Webhook.php b/src/Api/Webhook.php
@@ -11,11 +11,6 @@
 
 class Webhook extends AbstractApi
 {
-    /**
-     * @var null|\Kerox\Messenger\Api\Webhook
-     */
-    private static $_instance;
-
     /**
      * @var string
      */
@@ -64,24 +59,6 @@ public function __construct(string $appSecret, string $verifyToken, string $page
         $this->request = $request ?: ServerRequest::fromGlobals();
     }
 
-    /**
-     * @param string                                   $appSecret
-     * @param string                                   $verifyToken
-     * @param string                                   $pageToken
-     * @param \GuzzleHttp\ClientInterface              $client
-     * @param \Psr\Http\Message\ServerRequestInterface $request
-     *
-     * @return \Kerox\Messenger\Api\Webhook
-     */
-    public static function getInstance(string $appSecret, string $verifyToken, string $pageToken, ClientInterface $client, ServerRequestInterface $request = null): self
-    {
-        if (self::$_instance === null) {
-            self::$_instance = new self($appSecret, $verifyToken, $pageToken, $client, $request);
-        }
-
-        return self::$_instance;
-    }
-
     /**
      * @return bool
      */