Remaining cleanup items from PR #620

sendgrid · Aug 7, 2018 · 620d820 · 620d820
1 parent e7b541d
commit 620d820
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/lib/mail/EmailAddress.php b/lib/mail/EmailAddress.php
@@ -147,7 +147,7 @@ public function setSubstitutions($substitutions)
     /**
      * Retrieve substitutions from a EmailAddress object
      */
-    public function getSubstitions()
+    public function getSubstitutions()
     {
         return $this->substitutions;
     }

diff --git a/lib/mail/Mail.php b/lib/mail/Mail.php
@@ -121,11 +121,11 @@ public function __construct(
             $subjectCount = 0;
             $personalization = new Personalization();
             foreach ($to as $email) {
-                if ($subs = $email->getSubstitions()) {
+                if ($subs = $email->getSubstitutions()) {
                     $personalization = new Personalization();
                 }
                 $personalization->addTo($email);
-                if ($subs = $email->getSubstitions()) {
+                if ($subs = $email->getSubstitutions()) {
                     foreach ($subs as $key => $value) {
                         $personalization->addSubstitution($key, $value);
                     }
@@ -144,11 +144,11 @@ public function __construct(
                         $personalization->addSubstitution($key, $value);
                     }
                 }
-                if ($subs = $email->getSubstitions()) {
+                if ($subs = $email->getSubstitutions()) {
                     $this->addPersonalization($personalization);
                 }
             }
-            if (!$subs = $email->getSubstitions()) {
+            if (!$subs = $email->getSubstitutions()) {
                 $this->addPersonalization($personalization);
             }
         }
@@ -203,7 +203,7 @@ private function addRecipientEmail(
         }
         if ($personalization != null) {
             $personalization->$personalizationFunctionCall($email);
-            if ($subs = $email->getSubstitions()) {
+            if ($subs = $email->getSubstitutions()) {
                 foreach ($subs as $key => $value) {
                     $personalization->addSubstitution($key, $value);
                 }
@@ -222,15 +222,15 @@ private function addRecipientEmail(
             }
             if ($this->personalization[0] != null && $personalizationIndex == 0) {
                 $this->personalization[0]->$personalizationFunctionCall($email);
-                if ($subs = $email->getSubstitions()) {
+                if ($subs = $email->getSubstitutions()) {
                     foreach ($subs as $key => $value) {
                         $this->personalization[0]->addSubstitution($key, $value);
                     }
                 }
                 return;
             } else if ($this->personalization[$personalizationIndex] != null) {
                 $this->personalization[$personalizationIndex]->$personalizationFunctionCall($email);
-                if ($subs = $email->getSubstitions()) {
+                if ($subs = $email->getSubstitutions()) {
                     foreach ($subs as $key => $value) {
                         $this->personalization[$personalizationIndex]->addSubstitution(
                             $key,
@@ -242,7 +242,7 @@ private function addRecipientEmail(
             } else {
                 $personalization = new Personalization();
                 $personalization->$personalizationFunctionCall($email);
-                if ($subs = $email->getSubstitions()) {
+                if ($subs = $email->getSubstitutions()) {
                     foreach ($subs as $key => $value) {
                         $personalization->addSubstitution($key, $value);
                     }
@@ -319,6 +319,16 @@ public function getPersonalizations()
         return $this->personalization;
     }
 
+    /**
+     * Retrieve the number of Personalization objects associated with the Mail object
+     *
+     * @return int
+     */
+    public function getPersonalizationCount()
+    {
+        return count($this->personalization);
+    }
+
     /**
      * Adds an email recipient to a Personalization object
      *
@@ -340,7 +350,7 @@ public function addTo(
     ) {
         if ($to instanceof To) {
             $name = $to->getName();
-            $substitutions = $to->getSubstitions();
+            $substitutions = $to->getSubstitutions();
             $to = $to->getEmailAddress();
         }
         $this->addRecipientEmail(
@@ -1083,25 +1093,23 @@ public function addAttachment(
         $disposition = null,
         $content_id = null
     ) {
-        if ($attachment instanceof Attachment) {
-            $attachment = $attachment;
-        } else if (is_array($attachment)) {
+        if (is_array($attachment)) {
             $attachment = new Attachment(
                 $attachment[0],
                 $attachment[1],
                 $attachment[2],
                 $attachment[3],
                 $attachment[4]
             );
-        } else {
+        } else if (!($attachment instanceof Attachment)) {
             $attachment = new Attachment(
                 $attachment,
                 $type,
                 $filename,
                 $disposition,
                 $content_id
             );
-        }
+        } 
         $this->attachments[] = $attachment;
     }