Merge pull request #6 from rajesh6115/master

menu widget corrected

Author: sankarsuda

composer.json

@@ -11,7 +11,7 @@
   ],
   "minimum-stability": "dev",
   "require": {
-    "php": ">= 5.6"
+    "php": ">= 5.5"
   },
   "autoload": {
     "psr-4": {

src/Voice/Tag/Dial.php

@@ -19,35 +19,16 @@ public function __construct($to, $from = null)
 
     public function onAnswer($tag, $attribs = [], $isSequential = false)
     {
-        $newTag = $this->append($tag, $attribs);
-        if($isSequential){
-            $this->attributes['onanswer'] = array_merge($this->attributes['onanswer'], array($newTag) );
-        }else {
-            $this->setAttribute('onanswer', array($newTag), true);
-        }
-        return $newTag;
+        $new_tag = $this->append($tag, $attribs);
+        $this->setAttribute('onanswer', array($new_tag), false);
+        return $new_tag;
     }
 
     public function onNoAnswer($tag, $attribs = [], $isSequential = false)
     {
-        $newTag = $this->append($tag, $attribs);
-        if($isSequential){
-            $this->attributes['onnoanswer'] = array_merge($this->attributes['onnoanswer'], array($newTag) );
-        }else {
-            $this->setAttribute('onnoanswer', array($newTag), true);
-        }
-        return $newTag;
-    }
-
-    public function noAnswer($tag, $attribs = [], $isSequential = false)
-    {
-        $newTag = $this->append($tag, $attribs);
-        if($isSequential){
-            $this->attributes['onnoanswer'] = array_merge($this->attributes['onnoanswer'], array($newTag) );
-        }else {
-            $this->setAttribute('onnoanswer', array($newTag), true);
-        }
-        return $newTag;
+        $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,42 +13,54 @@ 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 = [], $isSequential = false)
     {
-        $newTag = $this->append($verb, $attribs);
-        if($isSequential){
-            $this->attributes['onfail'] = array_merge($this->attributes['onfail'], array($newTag) );
-        }else {
-            $this->setAttribute('onfail', array($newTag), true);
-        }
-        return $newTag;
+        $new_tag = $this->append($verb, $attribs);
+        $this->setAttribute('onfail', array($new_tag), false);
+        return $new_tag;
     }
 
-    public function onTimeout($verb, $attribs = [], $isSequential = false)
+    public function onKeyPress($key, $verb, $attribs = [])
     {
-        $newTag = $this->append($verb, $attribs);
-        if($isSequential){
-            $this->attributes['timeout'] = array_merge($this->attributes['timeout'], array($newTag) );
-        }else {
-            $this->setAttribute('timeout', array($newTag), true);
-        }
+        $new_tag = $this->append($verb, $attribs);
+        $this->setAttribute($key, array($new_tag), false);
+        return $new_tag;
+    }
+    public function onWrongKey($verb, $attribs = [])
+    {
+        $new_tag = $this->append($verb, $attribs);
+        $this->setAttribute('wrongkey', array($new_tag), false);
+        return $new_tag;
+    }
 
-        return $newTag;
+    public function onTimeout($verb, $attribs = [], $isSequential = false)
+    {
+        $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,
-            'dtmftdefaultkey' => ''
+            'waittime'        => 10,
+            'maxrepeat'       => 3,
+            'type'            => 'parallel',
+            'dtmftimeout'     => 3,
+            'dtmfdefaultkey' => ''
         ];
     }
 }

src/Voice/Tag/Url.php

@@ -14,9 +14,11 @@ public function __construct($url = null, $response = [])
 
     public function onResponse($value, $tag)
     {
-        return $this->setAttribute([
-            'response' => [$value => $this->append($tag)]
+        $new_tag = $this->append($tag);
+        $this->setAttribute([
+            'response' => [$value => array($new_tag)]
         ], null, true);
+        return $new_tag;
     }
 
     public function getDefaultAttributes()

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;