Merge pull request #740 from smrtab/master

Fixes #739 Wrong condition

Author: thinkingserious

lib/mail/EmailAddress.php

@@ -70,8 +70,8 @@ public function __construct(
      */ 
     public function setEmailAddress($emailAddress)
     {
-        if (!is_string($emailAddress) &&
-            filter_var($emailAddress, FILTER_VALIDATE_EMAIL)
+        if (!(is_string($emailAddress) &&
+            filter_var($emailAddress, FILTER_VALIDATE_EMAIL))
         ) {
             throw new TypeException(
                 '$emailAddress must be valid and of type string.'

test/unit/MailHelperTest.php

@@ -70,4 +70,15 @@ public function testEmailName()
             '{"name":"\\"O\'Keeffe, John \\\\\\"Billy\\\\\\"\\"","email":"[email protected]"}'
         );
     }
+    
+    /**
+     * This method tests TypeException for wrong email address
+     *
+     * @expectedException \SendGrid\Mail\TypeException
+     */
+    public function testEmailAddress()
+    {
+		$email = new EmailAddress();
+    	$email->setEmailAddress('[email protected]@wrong');
+    }    
 }