Replace all is_null($value) calls with null === $value

or alternativly null !== $value for consistency in the framework
yalibaba · Jan 22, 2013 · 3f83037 · 3f83037
1 parent 960e722
commit 3f83037
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/library/Zend/Db/Sql/Delete.php b/library/Zend/Db/Sql/Delete.php
@@ -128,7 +128,7 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
                     } elseif (is_string($pkey)) {
                         // Otherwise, if still a string, do something intelligent with the PHP type provided
 
-                        if (is_null($pvalue)) {
+                        if (null === $pvalue) {
                             // map PHP null to SQL IS NULL expression
                             $predicate = new Predicate\IsNull($pkey, $pvalue);
                         } elseif (is_array($pvalue)) {

diff --git a/library/Zend/Db/Sql/Insert.php b/library/Zend/Db/Sql/Insert.php
@@ -201,7 +201,7 @@ public function getSqlString(PlatformInterface $adapterPlatform = null)
             if ($value instanceof Expression) {
                 $exprData = $this->processExpression($value, $adapterPlatform);
                 $values[] = $exprData->getSql();
-            } elseif (is_null($value)) {
+            } elseif (null === $value) {
                 $values[] = 'NULL';
             } else {
                 $values[] = $adapterPlatform->quoteValue($value);

diff --git a/library/Zend/Db/Sql/Predicate/Between.php b/library/Zend/Db/Sql/Predicate/Between.php
@@ -34,10 +34,10 @@ public function __construct($identifier = null, $minValue = null, $maxValue = nu
         if ($identifier) {
             $this->setIdentifier($identifier);
         }
-        if (!is_null($minValue)) {
+        if (null !== $minValue) {
             $this->setMinValue($minValue);
         }
-        if (!is_null($maxValue)) {
+        if (null !== $maxValue) {
             $this->setMaxValue($maxValue);
         }
     }

diff --git a/library/Zend/Db/Sql/Select.php b/library/Zend/Db/Sql/Select.php
@@ -261,7 +261,7 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
                     } elseif (is_string($pkey)) {
                         // Otherwise, if still a string, do something intelligent with the PHP type provided
 
-                        if (is_null($pvalue)) {
+                        if (null === $pvalue) {
                             // map PHP null to SQL IS NULL expression
                             $predicate = new Predicate\IsNull($pkey, $pvalue);
                         } elseif (is_array($pvalue)) {

diff --git a/library/Zend/Db/Sql/Update.php b/library/Zend/Db/Sql/Update.php
@@ -123,7 +123,7 @@ public function set(array $values, $flag = self::VALUES_SET)
      */
     public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
     {
-        if (is_null($predicate)) {
+        if (null === $predicate) {
             throw new Exception\InvalidArgumentException('Predicate cannot be null');
         }
 
@@ -149,7 +149,7 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
                     } elseif (is_string($pkey)) {
                         // Otherwise, if still a string, do something intelligent with the PHP type provided
 
-                        if (is_null($pvalue)) {
+                        if (null === $pvalue) {
                             // map PHP null to SQL IS NULL expression
                             $predicate = new Predicate\IsNull($pkey, $pvalue);
                         } elseif (is_array($pvalue)) {
@@ -249,7 +249,7 @@ public function getSqlString(PlatformInterface $adapterPlatform = null)
                 if ($value instanceof Expression) {
                     $exprData = $this->processExpression($value, $adapterPlatform);
                     $setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = ' . $exprData->getSql();
-                } elseif (is_null($value)) {
+                } elseif (null === $value) {
                     $setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = NULL';
                 } else {
                     $setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = ' . $adapterPlatform->quoteValue($value);

diff --git a/library/Zend/Form/Element/Select.php b/library/Zend/Form/Element/Select.php
@@ -81,7 +81,7 @@ public function setValueOptions(array $options)
         $this->valueOptions = $options;
 
         // Update InArrayValidator validator haystack
-        if (!is_null($this->validator)) {
+        if (null !== $this->validator) {
             if ($this->validator instanceof InArrayValidator){
                 $validator = $this->validator;
             }

diff --git a/library/Zend/Http/Client.php b/library/Zend/Http/Client.php
@@ -582,7 +582,7 @@ public function setStream($streamfile = true)
      */
     public function getStream()
     {
-        if (!is_null($this->streamName)) {
+        if (null !== $this->streamName) {
             return $this->streamName;
         }
 

diff --git a/library/Zend/Http/Response/Stream.php b/library/Zend/Http/Response/Stream.php
@@ -242,7 +242,7 @@ public function getRawBody()
      */
     protected function readStream()
     {
-        if (!is_null($this->contentLength)) {
+        if (null !== $this->contentLength) {
             $bytes =  $this->contentLength - $this->contentStreamed;
         } else {
             $bytes = -1; //Read the whole buffer

diff --git a/library/Zend/View/Helper/Escaper/AbstractHelper.php b/library/Zend/View/Helper/Escaper/AbstractHelper.php
@@ -65,7 +65,7 @@ public function getEscaper()
      */
     public function setEncoding($encoding)
     {
-        if (!is_null($this->escaper)) {
+        if (null !== $this->escaper) {
             throw new Exception\InvalidArgumentException(
                 'Character encoding settings cannot be changed once the Helper has been used or '
                 . ' if a Zend\Escaper\Escaper object (with preset encoding option) is set.'

diff --git a/library/Zend/View/Model/JsonModel.php b/library/Zend/View/Model/JsonModel.php
@@ -67,7 +67,7 @@ public function serialize()
             $variables = ArrayUtils::iteratorToArray($variables);
         }
 
-        if (!is_null($this->jsonpCallback)) {
+        if (null !== $this->jsonpCallback) {
             return $this->jsonpCallback.'('.Json::encode($variables).');';
         }
         return Json::encode($variables);

diff --git a/library/Zend/View/Renderer/JsonRenderer.php b/library/Zend/View/Renderer/JsonRenderer.php
@@ -107,7 +107,7 @@ public function setJsonpCallback($callback)
      */
     public function hasJsonpCallback()
     {
-        return !is_null($this->jsonpCallback);
+        return null !== $this->jsonpCallback;
     }
 
     /**

diff --git a/library/Zend/XmlRpc/AbstractValue.php b/library/Zend/XmlRpc/AbstractValue.php
@@ -257,7 +257,7 @@ public static function getXmlRpcTypeByValue($value)
             return self::XMLRPC_TYPE_DOUBLE;
         } elseif (is_bool($value)) {
             return self::XMLRPC_TYPE_BOOLEAN;
-        } elseif (is_null($value)) {
+        } elseif (null === $value) {
             return self::XMLRPC_TYPE_NIL;
         } elseif (is_string($value)) {
             return self::XMLRPC_TYPE_STRING;
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,7 +107,7 @@ public function setJsonpCallback($callback) @@
          */
         public function hasJsonpCallback()
         {
-            return !is_null($this->jsonpCallback);
+            return null !== $this->jsonpCallback;
         }
         /**
@@ Expand Down @@