Skip to content
This repository was archived by the owner on Nov 26, 2020. It is now read-only.

Commit a881a87

Browse files
authored
Merge pull request #5 from azijul1/master
change return logic in dial, menu, and filter tags
2 parents d4f98d8 + ee86310 commit a881a87

3 files changed

Lines changed: 31 additions & 21 deletions

File tree

src/Voice/Tag/Dial.php

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,35 @@ public function __construct($to, $from = null)
1919

2020
public function onAnswer($tag, $attribs = [], $isSequential = false)
2121
{
22+
$newTag = $this->append($tag, $attribs);
2223
if($isSequential){
23-
$this->attributes['onanswer'] = array_merge($this->attributes['onanswer'], array($this->append($tag, $attribs)) );
24-
return $this->attributes;
24+
$this->attributes['onanswer'] = array_merge($this->attributes['onanswer'], array($newTag) );
2525
}else {
26-
return $this->setAttribute('onanswer', array($this->append($tag, $attribs)), true);
26+
$this->setAttribute('onanswer', array($newTag), true);
2727
}
28+
return $newTag;
2829
}
2930

3031
public function onNoAnswer($tag, $attribs = [], $isSequential = false)
3132
{
33+
$newTag = $this->append($tag, $attribs);
3234
if($isSequential){
33-
$this->attributes['onnoanswer'] = array_merge($this->attributes['onnoanswer'], array($this->append($tag, $attribs)) );
34-
return $this->attributes;
35+
$this->attributes['onnoanswer'] = array_merge($this->attributes['onnoanswer'], array($newTag) );
3536
}else {
36-
return $this->setAttribute('onnoanswer', array($this->append($tag, $attribs)), true);
37+
$this->setAttribute('onnoanswer', array($newTag), true);
3738
}
39+
return $newTag;
3840
}
3941

4042
public function noAnswer($tag, $attribs = [], $isSequential = false)
4143
{
44+
$newTag = $this->append($tag, $attribs);
4245
if($isSequential){
43-
$this->attributes['onnoanswer'] = array_merge($this->attributes['onnoanswer'], array($this->append($tag, $attribs)) );
44-
return $this->attributes;
46+
$this->attributes['onnoanswer'] = array_merge($this->attributes['onnoanswer'], array($newTag) );
4547
}else {
46-
return $this->setAttribute('onnoanswer', array($this->append($tag, $attribs)), true);
48+
$this->setAttribute('onnoanswer', array($newTag), true);
4749
}
50+
return $newTag;
4851
}
4952

5053
public function getDefaultAttributes()

src/Voice/Tag/Filter.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,26 @@ public function __construct($data = null, $type = 'frequency')
3232

3333
public function onFail($tag, $attribs = [], $isSequential = false)
3434
{
35+
$newTag = $this->append($tag, $attribs);
3536
if($isSequential){
36-
$this->attributes['onfail'] = array_merge($this->attributes['onfail'], array($this->append($tag, $attribs)) );
37-
return $this->attributes;
37+
$this->attributes['onfail'] = array_merge($this->attributes['onfail'], array($newTag) );
3838
}else {
39-
return $this->setAttribute('onfail', array($this->append($tag, $attribs)), true);
39+
$this->setAttribute('onfail', array($newTag), true);
4040
}
41+
42+
return $newTag;
4143
}
4244

4345
public function onPass($tag, $attribs = [], $isSequential = false)
4446
{
47+
$newTag = $this->append($tag, $attribs);
4548
if($isSequential){
46-
$this->attributes['onpass'] = array_merge($this->attributes['onpass'], array($this->append($tag, $attribs)) );
47-
return $this->attributes;
49+
$this->attributes['onpass'] = array_merge($this->attributes['onpass'], array($newTag) );
4850
}else {
49-
return $this->setAttribute('onpass', array($this->append($tag, $attribs)), true);
51+
$this->setAttribute('onpass', array($newTag), true);
5052
}
53+
54+
return $newTag;
5155
}
5256

5357
public function getDefaultAttributes()

src/Voice/Tag/Menu.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,25 @@ public function __construct($prompt, $attribs = [])
2020

2121
public function onFail($verb, $attribs = [], $isSequential = false)
2222
{
23+
$newTag = $this->append($verb, $attribs);
2324
if($isSequential){
24-
$this->attributes['onfail'] = array_merge($this->attributes['onfail'], array($this->append($verb, $attribs)) );
25-
return $this->attributes;
25+
$this->attributes['onfail'] = array_merge($this->attributes['onfail'], array($newTag) );
2626
}else {
27-
return $this->setAttribute('onfail', array($this->append($verb, $attribs)), true);
27+
$this->setAttribute('onfail', array($newTag), true);
2828
}
29+
return $newTag;
2930
}
3031

3132
public function onTimeout($verb, $attribs = [], $isSequential = false)
3233
{
34+
$newTag = $this->append($verb, $attribs);
3335
if($isSequential){
34-
$this->attributes['timeout'] = array_merge($this->attributes['timeout'], array($this->append($verb, $attribs)) );
35-
return $this->attributes;
36+
$this->attributes['timeout'] = array_merge($this->attributes['timeout'], array($newTag) );
3637
}else {
37-
return $this->setAttribute('timeout', array($this->append($verb, $attribs)), true);
38+
$this->setAttribute('timeout', array($newTag), true);
3839
}
40+
41+
return $newTag;
3942
}
4043

4144
public function getDefaultAttributes()

0 commit comments

Comments
 (0)