Use func get args and call user func array to pass on all arguments to the twilio calls create and messages sendMessage methods

Author: hannesvdvreken

src/LoggingDecorator.php

@@ -35,7 +35,7 @@ public function message($to, $message)
     {
         $this->logger->info(sprintf('Sending a message ["%s"] to %s', $message, $to));
 
-        return $this->wrapped->message($to, $message);
+        return call_user_func_array([$this->wrapped, 'message'], func_get_args());
     }
 
     /**
@@ -48,6 +48,6 @@ public function call($to, $message)
     {
         $this->logger->info(sprintf('Calling %s', $to));
 
-        return $this->wrapped->call($to, $message);
+        return call_user_func_array([$this->wrapped, 'call'], func_get_args());
     }
 }

src/Manager.php

@@ -54,7 +54,7 @@ public function from($connection)
      */
     public function message($to, $message)
     {
-        return $this->defaultConnection()->message($to, $message);
+        return call_user_func_array([$this->defaultConnection(), 'message'], func_get_args());
     }
 
     /**
@@ -65,7 +65,7 @@ public function message($to, $message)
      */
     public function call($to, $message)
     {
-        return $this->defaultConnection()->call($to, $message);
+        return call_user_func_array([$this->defaultConnection(), 'call'], func_get_args());
     }
 
     /**

src/Twilio.php

@@ -54,9 +54,11 @@ public function __construct($sid, $token, $from, $sslVerify = true)
      */
     public function message($to, $message)
     {
-        $twilio = $this->getTwilio();
+        $arguments = func_get_args();
 
-        return $twilio->account->messages->sendMessage($this->from, $to, $message);
+        array_unshift($arguments, $this->from);
+
+        return call_user_func_array([$this->getTwilio()->account->messages, 'sendMessage'], $arguments);
     }
 
     /**
@@ -67,17 +69,19 @@ public function message($to, $message)
      */
     public function call($to, $message)
     {
-        $twilio = $this->getTwilio();
+        $arguments = func_get_args();
+
+        array_unshift($arguments, $this->from);
 
         if (is_callable($message)) {
             $query = http_build_query([
                 'Twiml' => $this->twiml($message),
             ]);
 
-            $message = 'https://twimlets.com/echo?'.$query;
+            $arguments[2] = 'https://twimlets.com/echo?'.$query;
         }
 
-        return $twilio->account->calls->create($this->from, $to, $message);
+        return call_user_func_array([$this->getTwilio()->account->calls, 'create'], $arguments);
     }
 
     /**