Merge branch 'master' into feature/view-layer

zendframework · Feb 9, 2012 · c7b940e · c7b940e
commit c7b940e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Options.php b/src/Options.php
@@ -40,7 +40,7 @@ abstract class Options implements ParameterObject
      */
     public function __construct($options = null)
     {
-        if (is_null($options)) {
+        if ($options === null) {
             return;
         }
         $this->processArray($options);
@@ -136,7 +136,7 @@ public function __get($key)
     public function __isset($key)
     {
         $getter = $this->assembleGetterNameFromConfigKey($key);
-        return !is_null($this->{$getter}());
+        return ($this->{$getter}() !== null);
     }
 
     /**