Merge branch 'master' into feature/view-layer

zendframework · Feb 9, 2012 · 8344c40 · 8344c40
commit 8344c40
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Message.php b/src/Message.php
@@ -379,7 +379,7 @@ public function getSubject()
      */
     public function setBody($body)
     {
-        if (!is_string($body) && !is_null($body)) {
+        if (!is_string($body) && $body !== null) {
             if (!is_object($body)) {
                 throw new Exception\InvalidArgumentException(sprintf(
                     '%s expects a string or object argument; received "%s"',

diff --git a/src/Transport/Sendmail.php b/src/Transport/Sendmail.php
@@ -90,7 +90,7 @@ public function __construct($parameters = null)
      */
     public function setParameters($parameters)
     {
-        if (is_null($parameters) || is_string($parameters)) {
+        if ($parameters === null || is_string($parameters)) {
             $this->parameters = $parameters;
             return $this;
         }

diff --git a/src/Transport/SmtpOptions.php b/src/Transport/SmtpOptions.php
@@ -79,7 +79,7 @@ public function getName()
      */
     public function setName($name)
     {
-        if (!is_string($name) && !is_null($name)) {
+        if (!is_string($name) && $name !== null) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Name must be a string or null; argument of type "%s" provided',
                 (is_object($name) ? get_class($name) : gettype($name))
@@ -111,7 +111,7 @@ public function getConnectionClass()
      */
     public function setConnectionClass($connectionClass) 
     {
-        if (!is_string($connectionClass) && !is_null($connectionClass)) {
+        if (!is_string($connectionClass) && $connectionClass !== null) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Connection class must be a string or null; argument of type "%s" provided',
                 (is_object($connectionClass) ? get_class($connectionClass) : gettype($connectionClass))