Testing All widgets

Author: rajesh6115

src/Voice/Tag/Dial.php

@@ -19,17 +19,16 @@ public function __construct($to, $from = null)
 
     public function onAnswer($tag, $attribs = [])
     {
-        return $this->setAttribute('onanswer', $this->append($tag, $attribs), true);
+        $new_tag = $this->append($tag, $attribs);
+        $this->setAttribute('onanswer', array($new_tag), false);
+        return $new_tag;
     }
 
     public function onNoAnswer($tag, $attribs = [])
     {
-        return $this->setAttribute('onnoanswer', $this->append($tag, $attribs), true);
-    }
-
-    public function noAnswer($tag, $attribs = [])
-    {
-        return $this->setAttribute('onnoanswer', $this->append($tag, $attribs), true);
+        $new_tag = $this->append($tag, $attribs);
+        $this->setAttribute('onnoanswer', array($new_tag), false);
+        return $new_tag;
     }
 
     public function getDefaultAttributes()

src/Voice/Tag/Menu.php

@@ -13,28 +13,47 @@ class Menu extends Voice
         'onfail'
     ];
 
-    public function __construct($prompt, $attribs = [])
+    public function __construct($prompt = null, $attribs = [])
     {
+        if ($prompt) {
+            if (is_array($prompt)) {
+                $attribs = array_merge($prompt, $attribs);
+            } else {
+                $attribs['prompt'] = $prompt;
+            }
+        }
+
         parent::__construct("Menu", $attribs);
     }
 
     public function onFail($verb, $attribs = [])
     {
-        return $this->setAttribute('onFail', $this->append($verb, $attribs), true);
+        $new_tag = $this->append($verb, $attribs);
+        $this->setAttribute('onfail', array($new_tag), false);
+        return $new_tag;
+    }
+
+    public function onKeyPress($key, $verb, $attribs = [])
+    {
+        $new_tag = $this->append($verb, $attribs);
+        $this->setAttribute($key, array($new_tag), false);
+        return $new_tag;
     }
 
     public function onTimeout($verb, $attribs = [])
     {
-        return $this->setAttribute('timeout', $this->append($verb, $attribs), true);
+        $new_tag = $this->append($verb, $attribs);
+        $this->setAttribute('timeout', array($new_tag), false);
+        return $new_tag;
     }
 
     public function getDefaultAttributes()
     {
         return [
-            'waittime' => 10,
-            'maxrepeat' => 3,
-            'type' => 'parallel',
-            'dtmftimeout' => 3,
+            'waittime'        => 10,
+            'maxrepeat'       => 3,
+            'type'            => 'parallel',
+            'dtmftimeout'     => 3,
             'dtmftdefaultkey' => ''
         ];
     }

src/Voice/Voice.php

@@ -7,9 +7,9 @@
 class Voice
 {
     protected $name;
-    protected $append = [];
+    protected $append     = [];
     protected $attributes = [];
-    protected $nested = [];
+    protected $nested     = [];
 
     /**
      * DialPlan Constructor
@@ -44,13 +44,13 @@ public function setAttribute($name, $value = null, $instance = false)
         if ($instance) {
             return $value;
         }
-        
+
         return $this;
     }
-    
+
     public function append($verb, $args = [])
     {
-        $widget = 'Mobtexting\\Voice\\Tag\\'.ucfirst(strtolower($verb));
+        $widget = 'Mobtexting\\Voice\\Tag\\' . ucfirst(strtolower($verb));
 
         $widget = new $widget(...$args);
 
@@ -94,7 +94,7 @@ public function toArray()
         $element = array();
         $attributes = $this->getDefaultAttributes();
 
-        $attributes = array_merge($attributes, $this->processAttribs($this->attributes));
+        $attributes = array_replace($attributes, $this->processAttribs($this->attributes));
 
         $element[$this->name] = $attributes;