Skip to content

Commit 7de22b5

Browse files
overtrueovertrue
committed
Merge pull request w7corp#196 from tangrucheng/develop
Add alias
2 parents 28ff214 + 12db1f3 commit 7de22b5

File tree

4 files changed

+260
-6
lines changed

4 files changed

+260
-6
lines changed

‎src/Broadcast/Broadcast.php‎

Lines changed: 255 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Broadcast extends AbstractAPI
3535
const API_GET = 'http://api.weixin.qq.com/cgi-bin/message/mass/get';
3636

3737
const PREVIEW_BY_OPENID = 'touser';
38-
const PREVIEW_BY_WXH = 'towxname';
38+
const PREVIEW_BY_NAME = 'towxname';
3939

4040
const MSG_TYPE_TEXT = 'text'; // 文本
4141
const MSG_TYPE_NEWS = 'news'; // 图文
@@ -62,6 +62,84 @@ public function send($msgType, $message, $to = null)
6262
return $this->post($api, $message);
6363
}
6464

65+
/**
66+
* Send a text message.
67+
*
68+
* @param mixed $message message
69+
* @param mixed $to
70+
*
71+
* @return mixed
72+
*/
73+
public function sendText($message, $to = null)
74+
{
75+
return $this->send(self::MSG_TYPE_TEXT, $message, $to);
76+
}
77+
78+
/**
79+
* Send a news message.
80+
*
81+
* @param mixed $message message
82+
* @param mixed $to
83+
*
84+
* @return mixed
85+
*/
86+
public function sendNews($message, $to = null)
87+
{
88+
return $this->send(self::MSG_TYPE_NEWS, $message, $to);
89+
}
90+
91+
/**
92+
* Send a voice message.
93+
*
94+
* @param mixed $message message
95+
* @param mixed $to
96+
*
97+
* @return mixed
98+
*/
99+
public function sendVoice($message, $to = null)
100+
{
101+
return $this->send(self::MSG_TYPE_VOICE, $message, $to);
102+
}
103+
104+
/**
105+
* Send a image message.
106+
*
107+
* @param mixed $message message
108+
* @param mixed $to
109+
*
110+
* @return mixed
111+
*/
112+
public function sendImage($message, $to = null)
113+
{
114+
return $this->send(self::MSG_TYPE_IMAGE, $message, $to);
115+
}
116+
117+
/**
118+
* Send a video message.
119+
*
120+
* @param mixed $message message
121+
* @param mixed $to
122+
*
123+
* @return mixed
124+
*/
125+
public function sendVideo($message, $to = null)
126+
{
127+
return $this->send(self::MSG_TYPE_VIDEO, $message, $to);
128+
}
129+
130+
/**
131+
* Send a card message.
132+
*
133+
* @param mixed $message message
134+
* @param mixed $to
135+
*
136+
* @return mixed
137+
*/
138+
public function sendCard($message, $to = null)
139+
{
140+
return $this->send(self::MSG_TYPE_CARD, $message, $to);
141+
}
142+
65143
/**
66144
* Preview a message.
67145
*
@@ -79,6 +157,182 @@ public function preview($msgType, $message, $to, $by = self::PREVIEW_BY_OPENID)
79157
return $this->post(self::API_PREVIEW, $message);
80158
}
81159

160+
/**
161+
* Preview a text message.
162+
*
163+
* @param mixed $message message
164+
* @param string $to
165+
* @param string $by
166+
*
167+
* @return mixed
168+
*/
169+
public function previewText($message, $to, $by = self::PREVIEW_BY_OPENID)
170+
{
171+
return $this->preview(self::MSG_TYPE_TEXT, $message, $to, $by);
172+
}
173+
174+
/**
175+
* Preview a news message.
176+
*
177+
* @param mixed $message message
178+
* @param string $to
179+
* @param string $by
180+
*
181+
* @return mixed
182+
*/
183+
public function previewNews($message, $to, $by = self::PREVIEW_BY_OPENID)
184+
{
185+
return $this->preview(self::MSG_TYPE_NEWS, $message, $to, $by);
186+
}
187+
188+
/**
189+
* Preview a voice message.
190+
*
191+
* @param mixed $message message
192+
* @param string $to
193+
* @param string $by
194+
*
195+
* @return mixed
196+
*/
197+
public function previewVoice($message, $to, $by = self::PREVIEW_BY_OPENID)
198+
{
199+
return $this->preview(self::MSG_TYPE_VOICE, $message, $to, $by);
200+
}
201+
202+
/**
203+
* Preview a image message.
204+
*
205+
* @param mixed $message message
206+
* @param string $to
207+
* @param string $by
208+
*
209+
* @return mixed
210+
*/
211+
public function previewImage($message, $to, $by = self::PREVIEW_BY_OPENID)
212+
{
213+
return $this->preview(self::MSG_TYPE_IMAGE, $message, $to, $by);
214+
}
215+
216+
/**
217+
* Preview a video message.
218+
*
219+
* @param mixed $message message
220+
* @param string $to
221+
* @param string $by
222+
*
223+
* @return mixed
224+
*/
225+
public function previewVideo($message, $to, $by = self::PREVIEW_BY_OPENID)
226+
{
227+
return $this->preview(self::MSG_TYPE_VIDEO, $message, $to, $by);
228+
}
229+
230+
/**
231+
* Preview a card message.
232+
*
233+
* @param mixed $message message
234+
* @param string $to
235+
* @param string $by
236+
*
237+
* @return mixed
238+
*/
239+
public function previewCard($message, $to, $by = self::PREVIEW_BY_OPENID)
240+
{
241+
return $this->preview(self::MSG_TYPE_CARD, $message, $to, $by);
242+
}
243+
244+
/**
245+
* Preview a message by name.
246+
*
247+
* @param string $msgType message type
248+
* @param mixed $message message
249+
* @param $to
250+
*
251+
* @return mixed
252+
*/
253+
public function previewByName($msgType, $message, $to)
254+
{
255+
return $this->preview($msgType, $message, $to, self::PREVIEW_BY_NAME);
256+
}
257+
258+
/**
259+
* Preview a text message by name.
260+
*
261+
* @param mixed $message message
262+
* @param $to
263+
*
264+
* @return mixed
265+
*/
266+
public function previewTextByName($message, $to)
267+
{
268+
return $this->preview(self::MSG_TYPE_TEXT, $message, $to, self::PREVIEW_BY_NAME);
269+
}
270+
271+
/**
272+
* Preview a news message by name.
273+
*
274+
* @param mixed $message message
275+
* @param $to
276+
*
277+
* @return mixed
278+
*/
279+
public function previewNewsByName($message, $to)
280+
{
281+
return $this->preview(self::MSG_TYPE_NEWS, $message, $to, self::PREVIEW_BY_NAME);
282+
}
283+
284+
/**
285+
* Preview a voice message by name.
286+
*
287+
* @param mixed $message message
288+
* @param $to
289+
*
290+
* @return mixed
291+
*/
292+
public function previewVoiceByName($message, $to)
293+
{
294+
return $this->preview(self::MSG_TYPE_VOICE, $message, $to, self::PREVIEW_BY_NAME);
295+
}
296+
297+
/**
298+
* Preview a image message by name.
299+
*
300+
* @param mixed $message message
301+
* @param $to
302+
*
303+
* @return mixed
304+
*/
305+
public function previewImageByName($message, $to)
306+
{
307+
return $this->preview(self::MSG_TYPE_IMAGE, $message, $to, self::PREVIEW_BY_NAME);
308+
}
309+
310+
/**
311+
* Preview a video message by name.
312+
*
313+
* @param mixed $message message
314+
* @param $to
315+
*
316+
* @return mixed
317+
*/
318+
public function previewVideoByName($message, $to)
319+
{
320+
return $this->preview(self::MSG_TYPE_VIDEO, $message, $to, self::PREVIEW_BY_NAME);
321+
}
322+
323+
/**
324+
* Preview a card message by name.
325+
*
326+
* @param mixed $message message
327+
* @param $to
328+
*
329+
* @return mixed
330+
*/
331+
public function previewCardByName($message, $to)
332+
{
333+
return $this->preview(self::MSG_TYPE_CARD, $message, $to, self::PREVIEW_BY_NAME);
334+
}
335+
82336
/**
83337
* Delete a broadcast.
84338
*

‎src/Broadcast/MessageBuilder.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class MessageBuilder
7070
*/
7171
private $previewBys = [
7272
Broadcast::PREVIEW_BY_OPENID,
73-
Broadcast::PREVIEW_BY_WXH,
73+
Broadcast::PREVIEW_BY_NAME,
7474
];
7575

7676
/**

‎tests/Broadcast/BroadcastBroadcastTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ public function testPreview()
8888

8989
$broadcast = $this->getBroadcast();
9090

91-
$response = $broadcast->preview(Broadcast::MSG_TYPE_TEXT, 'CONTENT', 'WXH', Broadcast::PREVIEW_BY_WXH);
91+
$response = $broadcast->preview(Broadcast::MSG_TYPE_TEXT, 'CONTENT', 'WXH', Broadcast::PREVIEW_BY_NAME);
9292

9393
$this->assertStringStartsWith(Broadcast::API_PREVIEW, $response['api']);
9494
$data = [
95-
Broadcast::PREVIEW_BY_WXH => 'WXH',
95+
Broadcast::PREVIEW_BY_NAME => 'WXH',
9696
'text' => [
9797
'content' => 'CONTENT',
9898
],

‎tests/Broadcast/BroadcastMessageBuilderTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ public function testBuildPreview()
135135
$messageBuilder = new MessageBuilder();
136136
$messageBuilder->msgType(Broadcast::MSG_TYPE_TEXT)->message('CONTENT')->to('WXH');
137137
$message = [
138-
Broadcast::PREVIEW_BY_WXH => 'WXH',
138+
Broadcast::PREVIEW_BY_NAME => 'WXH',
139139
'text' => [
140140
'content' => 'CONTENT',
141141
],
142142
'msgtype' => 'text',
143143
];
144-
$this->assertEquals($message, $messageBuilder->buildPreview(Broadcast::PREVIEW_BY_WXH));
144+
$this->assertEquals($message, $messageBuilder->buildPreview(Broadcast::PREVIEW_BY_NAME));
145145

146146
// exception
147147
$messageBuilder = new MessageBuilder();

0 commit comments

Comments
 (0)