Rename. #677

src/Foundation/Core/AbstractAPI.php

@@ -60,7 +60,7 @@ abstract class AbstractAPI
      */
     public function __construct(AccessToken $accessToken)
     {
-        $this->setAccessToken($accessToken);
+        $this->accessToken = $accessToken;
     }
 
     /**

src/OfficialAccount/Broadcast/Broadcast.php → src/OfficialAccount/Broadcast/Client.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * Broadcast.php.
+ * OfficialAccount Broadcast Client.
  *
  * @author    overtrue <[email protected]>
  * @copyright 2015 overtrue <[email protected]>
@@ -24,10 +24,7 @@
 use EasyWeChat\Exceptions\HttpException;
 use EasyWeChat\Foundation\Core\AbstractAPI;
 
-/**
- * Class Broadcast.
- */
-class Broadcast extends AbstractAPI
+class Client extends AbstractAPI
 {
     const API_SEND_BY_GROUP = 'https://api.weixin.qq.com/cgi-bin/message/mass/sendall';
     const API_SEND_BY_OPENID = 'https://api.weixin.qq.com/cgi-bin/message/mass/send';

src/OfficialAccount/Broadcast/MessageBuilder.php

@@ -56,12 +56,12 @@ class MessageBuilder
      * @var array
      */
     private $msgTypes = [
-        Broadcast::MSG_TYPE_TEXT,
-        Broadcast::MSG_TYPE_NEWS,
-        Broadcast::MSG_TYPE_IMAGE,
-        Broadcast::MSG_TYPE_VIDEO,
-        Broadcast::MSG_TYPE_VOICE,
-        Broadcast::MSG_TYPE_CARD,
+        Client::MSG_TYPE_TEXT,
+        Client::MSG_TYPE_NEWS,
+        Client::MSG_TYPE_IMAGE,
+        Client::MSG_TYPE_VIDEO,
+        Client::MSG_TYPE_VOICE,
+        Client::MSG_TYPE_CARD,
     ];
 
     /**
@@ -70,8 +70,8 @@ class MessageBuilder
      * @var array
      */
     private $previewBys = [
-        Broadcast::PREVIEW_BY_OPENID,
-        Broadcast::PREVIEW_BY_NAME,
+        Client::PREVIEW_BY_OPENID,
+        Client::PREVIEW_BY_NAME,
     ];
 
     /**
@@ -140,9 +140,9 @@ public function build()
         }
 
         // 群发视频消息给用户列表时，视频消息格式需要另外处理，具体见文档
-        if (isset($this->to) && is_array($this->to) && $this->msgType === Broadcast::MSG_TYPE_VIDEO) {
+        if (isset($this->to) && is_array($this->to) && $this->msgType === Client::MSG_TYPE_VIDEO) {
             $this->msgType = 'video';
-        } elseif ($this->msgType === Broadcast::MSG_TYPE_VIDEO) {
+        } elseif ($this->msgType === Client::MSG_TYPE_VIDEO) {
             $this->msgType = 'mpvideo';
         }
 
@@ -173,7 +173,7 @@ public function buildPreview($by)
 
         if (empty($this->msgType)) {
             throw new RuntimeException('Message type not exist.');
-        } elseif ($this->msgType === Broadcast::MSG_TYPE_VIDEO) {
+        } elseif ($this->msgType === Client::MSG_TYPE_VIDEO) {
             $this->msgType = 'mpvideo';
         }
 

src/OfficialAccount/Broadcast/ServiceProvider.php

@@ -41,7 +41,7 @@ class ServiceProvider implements ServiceProviderInterface
     public function register(Container $pimple)
     {
         $pimple['broadcast'] = function ($pimple) {
-            return new Broadcast($pimple['access_token']);
+            return new Client($pimple['access_token']);
         };
     }
 }

src/OfficialAccount/Card/Card.php → src/OfficialAccount/Card/Client.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * Card.php.
+ * OfficialAccount Card Client.
  *
  * @author    overtrue <[email protected]>
  * @copyright 2016 overtrue <[email protected]>
@@ -27,7 +27,7 @@
 use EasyWeChat\Support\Arr;
 use Psr\Http\Message\ResponseInterface;
 
-class Card extends AbstractAPI
+class Client extends AbstractAPI
 {
     /**
      * Cache.
@@ -212,7 +212,7 @@ public function jsConfigForAssign(array $cards)
      * @param string $cardId
      * @param array  $extension
      *
-     * @return string
+     * @return array
      */
     public function attachExtension($cardId, array $extension = [])
     {
@@ -834,7 +834,7 @@ public function getCache()
     }
 
     /**
-     * Set Api_ticket cache prifix.
+     * Set Api_ticket cache prefix.
      *
      * @param string $prefix
      *
@@ -880,7 +880,7 @@ public function getTicketCacheKey()
      *
      * @param string $url
      *
-     * @return Card
+     * @return Client
      */
     public function setUrl($url)
     {

src/OfficialAccount/Card/ServiceProvider.php

@@ -41,7 +41,7 @@ class ServiceProvider implements ServiceProviderInterface
     public function register(Container $pimple)
     {
         $pimple['card'] = function ($pimple) {
-            $card = new Card($pimple['access_token']);
+            $card = new Client($pimple['access_token']);
             $card->setCache($pimple['cache']);
 
             return $card;

src/OfficialAccount/CustomerService/CustomerService.php → src/OfficialAccount/CustomerService/Client.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * CustomerService.php.
+ * OfficialAccount CustomerService Client.
  *
  * @author    overtrue <[email protected]>
  * @copyright 2015 overtrue <[email protected]>
@@ -24,10 +24,7 @@
 use EasyWeChat\Foundation\Core\AbstractAPI;
 use EasyWeChat\Support\Collection;
 
-/**
- * Class CustomerService.
- */
-class CustomerService extends AbstractAPI
+class Client extends AbstractAPI
 {
     const API_LISTS = 'https://api.weixin.qq.com/cgi-bin/customservice/getkflist';
     const API_ONLINE = 'https://api.weixin.qq.com/cgi-bin/customservice/getonlinekflist';

src/OfficialAccount/CustomerService/MessageBuilder.php

@@ -56,16 +56,16 @@ class MessageBuilder
     /**
      * Customer service instance.
      *
-     * @var \EasyWeChat\OfficialAccount\CustomerService\CustomerService
+     * @var \EasyWeChat\OfficialAccount\CustomerService\Client
      */
     protected $customerService;
 
     /**
      * MessageBuilder constructor.
      *
-     * @param \EasyWeChat\OfficialAccount\CustomerService\CustomerService $customerService
+     * @param \EasyWeChat\OfficialAccount\CustomerService\Client $customerService
      */
-    public function __construct(CustomerService $customerService)
+    public function __construct(Client $customerService)
     {
         $this->customerService = $customerService;
     }

src/OfficialAccount/CustomerService/ServiceProvider.php

@@ -41,11 +41,11 @@ class ServiceProvider implements ServiceProviderInterface
     public function register(Container $pimple)
     {
         $pimple['customer_service'] = function ($pimple) {
-            return new CustomerService($pimple['access_token']);
+            return new Client($pimple['access_token']);
         };
 
         $pimple['customer_service_session'] = $pimple['customer_service.session'] = function ($pimple) {
-            return new Session($pimple['access_token']);
+            return new SessionClient($pimple['access_token']);
         };
     }
 }

src/OfficialAccount/CustomerService/Session.php → src/OfficialAccount/CustomerService/SessionClient.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * Session.php.
+ * OfficialAccount CustomerService Session Client.
  *
  * @author    overtrue <[email protected]>
  * @copyright 2015 overtrue <[email protected]>
@@ -23,10 +23,7 @@
 
 use EasyWeChat\Foundation\Core\AbstractAPI;
 
-/**
- * Class Session.
- */
-class Session extends AbstractAPI
+class SessionClient extends AbstractAPI
 {
     const API_CREATE = 'https://api.weixin.qq.com/customservice/kfsession/create';
     const API_CLOSE = 'https://api.weixin.qq.com/customservice/kfsession/close';

src/OfficialAccount/Device/Device.php → src/OfficialAccount/Device/Client.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * Device.php.
+ * OfficialAccount Device Client.
  *
  * @author    soone <[email protected]>
  * @copyright 2016 soone <[email protected]>
@@ -21,10 +21,7 @@
 use EasyWeChat\Foundation\Core\AbstractAPI;
 use EasyWeChat\OfficialAccount\Core\AccessToken;
 
-/**
- * Class Device.
- */
-class Device extends AbstractAPI
+class Client extends AbstractAPI
 {
     protected $deviceType;
     protected $productId;
@@ -45,7 +42,7 @@ class Device extends AbstractAPI
 
     public function __construct(AccessToken $accessToken, $config)
     {
-        parent::setAccessToken($accessToken);
+        parent::__construct($accessToken);
         $this->config = $config;
         $this->deviceType = $this->config['device_type'];
         $this->productId = $this->config['product_id'];

src/OfficialAccount/Device/ServiceProvider.php

@@ -45,7 +45,7 @@ class ServiceProvider implements ServiceProviderInterface
     public function register(Container $pimple)
     {
         $pimple['device'] = function ($pimple) {
-            return new Device($pimple['access_token'], $pimple['config']->get('device', []));
+            return new Client($pimple['access_token'], $pimple['config']->get('device', []));
         };
     }
 }

src/OfficialAccount/Js/Js.php → src/OfficialAccount/Js/Client.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * Js.php.
+ * OfficialAccount Js Client.
  *
  * @author    overtrue <[email protected]>
  * @copyright 2015 overtrue <[email protected]>
@@ -27,10 +27,7 @@
 use EasyWeChat\Support\Str;
 use EasyWeChat\Support\Url as UrlHelper;
 
-/**
- * Class Js.
- */
-class Js extends AbstractAPI
+class Client extends AbstractAPI
 {
     /**
      * Cache.
@@ -163,7 +160,7 @@ public function getSignature($ticket, $nonce, $timestamp, $url)
      *
      * @param string $url
      *
-     * @return Js
+     * @return $this
      */
     public function setUrl($url)
     {

src/OfficialAccount/Js/ServiceProvider.php

@@ -41,7 +41,7 @@ class ServiceProvider implements ServiceProviderInterface
     public function register(Container $pimple)
     {
         $pimple['js'] = function ($pimple) {
-            $js = new Js($pimple['access_token']);
+            $js = new Client($pimple['access_token']);
             $js->setCache($pimple['cache']);
 
             return $js;

src/OfficialAccount/Material/Material.php → src/OfficialAccount/Material/Client.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * Material.php.
+ * OfficialAccount Material Client.
  *
  * @author    overtrue <[email protected]>
  * @copyright 2015 overtrue <[email protected]>
@@ -25,10 +25,7 @@
 use EasyWeChat\Foundation\Core\AbstractAPI;
 use EasyWeChat\OfficialAccount\Message\Article;
 
-/**
- * Class Material.
- */
-class Material extends AbstractAPI
+class Client extends AbstractAPI
 {
     /**
      * Allow media type.

src/OfficialAccount/Material/ServiceProvider.php

@@ -41,11 +41,11 @@ class ServiceProvider implements ServiceProviderInterface
     public function register(Container $pimple)
     {
         $pimple['material'] = function ($pimple) {
-            return new Material($pimple['access_token']);
+            return new Client($pimple['access_token']);
         };
 
         $temporary = function ($pimple) {
-            return new Temporary($pimple['access_token']);
+            return new TemporaryClient($pimple['access_token']);
         };
 
         $pimple['material_temporary'] = $temporary;

src/OfficialAccount/Material/Temporary.php → src/OfficialAccount/Material/TemporaryClient.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * Temporary.php.
+ * OfficialAccount Temporary Material Client.
  *
  * @author    overtrue <[email protected]>
  * @copyright 2015 overtrue <[email protected]>
@@ -25,10 +25,7 @@
 use EasyWeChat\Foundation\Core\AbstractAPI;
 use EasyWeChat\Support\File;
 
-/**
- * Class Temporary.
- */
-class Temporary extends AbstractAPI
+class TemporaryClient extends AbstractAPI
 {
     /**
      * Allow media type.

src/OfficialAccount/Menu/Menu.php → src/OfficialAccount/Menu/Client.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * Menu.php.
+ * OfficialAccount Menu Client.
  *
  * @author    overtrue <[email protected]>
  * @copyright 2015 overtrue <[email protected]>
@@ -23,10 +23,7 @@
 
 use EasyWeChat\Foundation\Core\AbstractAPI;
 
-/**
- * Class Menu.
- */
-class Menu extends AbstractAPI
+class Client extends AbstractAPI
 {
     const API_CREATE = 'https://api.weixin.qq.com/cgi-bin/menu/create';
     const API_GET = 'https://api.weixin.qq.com/cgi-bin/menu/get';

src/OfficialAccount/Menu/ServiceProvider.php

@@ -41,7 +41,7 @@ class ServiceProvider implements ServiceProviderInterface
     public function register(Container $pimple)
     {
         $pimple['menu'] = function ($pimple) {
-            return new Menu($pimple['access_token']);
+            return new Client($pimple['access_token']);
         };
     }
 }