Fix Tests

SimpleSoftwareIO · Aug 22, 2014 · 5dd5539 · 5dd5539
1 parent ba5b8d1
commit 5dd5539
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/src/SimpleSoftwareIO/SMS/Drivers/EmailSMS.php b/src/SimpleSoftwareIO/SMS/Drivers/EmailSMS.php
@@ -36,7 +36,7 @@ public function send(Message $message)
         $me = $this;
 
         $this->mailer->send($this->message->getView(), $this->message->getData(), function ($email) use ($me) {
-            foreach ($me->message->getTo() as $number) {
+            foreach ($me->message->getToWithCarriers() as $number) {
                 $email->to($me->buildEmail($number));
             }
 

diff --git a/src/SimpleSoftwareIO/SMS/Message.php b/src/SimpleSoftwareIO/SMS/Message.php
@@ -116,21 +116,27 @@ public function to($number, $carrier = null)
     }
 
     /**
-     * Returns the To addresses
+     * Returns the To addresses without the carriers
      *
      * @return array
      */
-    public function getTo($returnCarriers = false)
+    public function getTo()
     {
-        if ($returnCarriers) {
-            return $this->to;
-        } else {
-            $numbers = array();
-            foreach ($this->to as $to) {
-                $numbers[] = $to['number'];
-            }
-            return $numbers;
+        $numbers = array();
+        foreach ($this->to as $to) {
+            $numbers[] = $to['number'];
         }
+        return $numbers;
+    }
+
+    /**
+     * Returns all numbers that a message is being sent to and includes their carriers.
+     *
+     * @return array An array with numbers and carriers
+     */
+    public function getToWithCarriers()
+    {
+        return $this->to;
     }
 
     /**

diff --git a/tests/MessageTest.php b/tests/MessageTest.php
@@ -47,25 +47,25 @@ public function testAddImages()
 
   public function testAddToWithCarrier()
   {
-	$toAddresses = $this->message->getTo();
+	$toAddresses = $this->message->getToWithCarriers();
     $this->assertTrue(empty($toAddresses));
 
     $to = [0 => ['number' => '+15555555555', 'carrier' => 'att']];
     $this->message->to('+15555555555', 'att');
 
-    $this->assertEquals($to, $this->message->getTo());
+    $this->assertEquals($to, $this->message->getToWithCarriers());
 
     $to = [
       0 => ['number' => '+15555555555', 'carrier' => 'att'],
       1 => ['number' => '+14444444444', 'carrier' => 'verizon']
     ];
     $this->message->to('+14444444444', 'verizon');
-    $this->assertEquals($to, $this->message->getTo());
+    $this->assertEquals($to, $this->message->getToWithCarriers());
   }
 
   public function testAddToWithoutCarrier()
   {
-    $to = [0 => ['number' => '+15555555555', 'carrier' => null]];
+    $to = ['+15555555555'];
     $this->message->to('+15555555555');
 
     $this->assertEquals($to, $this->message->getTo());