ZF-5413: no double parentheses | NULL -> null

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22662 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Amf/Server.php

@@ -607,7 +607,7 @@ class Zend_Amf_Server implements Zend_Server_Interface
     public function handle($request = null)
     {
         // Check if request was passed otherwise get it from the server
-        if (($request === NULL) || !$request instanceof Zend_Amf_Request) {
+        if ($request === null || !$request instanceof Zend_Amf_Request) {
             $request = $this->getRequest();
         } else {
             $this->setRequest($request);

library/Zend/Cache/Backend/Static.php

@@ -166,7 +166,7 @@ class Zend_Cache_Backend_Static
         if (empty($fileName)) {
             $fileName = $this->_options['index_filename'];
         }
-        if (($this->_tagged === NULL) && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
+        if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
             $this->_tagged = $tagged;
         } elseif (!$this->_tagged) {
             return false;
@@ -211,7 +211,7 @@ class Zend_Cache_Backend_Static
         }
 
         clearstatcache();
-        if (($id === NULL) || strlen($id) == 0) {
+        if ($id === null || strlen($id) == 0) {
             $id = $this->_detectId();
         } else {
             $id = $this->_decodeId($id);
@@ -225,7 +225,7 @@ class Zend_Cache_Backend_Static
         $pathName = realpath($this->_options['public_dir']) . dirname($id);
         $this->_createDirectoriesFor($pathName);
 
-        if (($id === NULL) || strlen($id) == 0) {
+        if ($id === null || strlen($id) == 0) {
             $dataUnserialized = unserialize($data);
             $data = $dataUnserialized['data'];
         }
@@ -239,9 +239,9 @@ class Zend_Cache_Backend_Static
         }
         @chmod($file, $this->_octdec($this->_options['cache_file_umask']));
 
-        if (($this->_tagged === NULL) && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
+        if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
             $this->_tagged = $tagged;
-        } elseif (($this->_tagged === NULL)) {
+        } elseif ($this->_tagged === null) {
             $this->_tagged = array();
         }
         if (!isset($this->_tagged[$id])) {
@@ -305,7 +305,7 @@ class Zend_Cache_Backend_Static
             Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
         }
         $fileName = basename($id);
-        if (($this->_tagged === NULL) && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
+        if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
             $this->_tagged = $tagged;
         } elseif (!$this->_tagged) {
             return false;
@@ -394,7 +394,7 @@ class Zend_Cache_Backend_Static
                 if (empty($tags)) {
                     throw new Zend_Exception('Cannot use tag matching modes as no tags were defined');
                 }
-                if (($this->_tagged === NULL) && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
+                if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
                     $this->_tagged = $tagged;
                 } elseif (!$this->_tagged) {
                     return true;
@@ -412,11 +412,11 @@ class Zend_Cache_Backend_Static
                 $result = true;
                 break;
             case Zend_Cache::CLEANING_MODE_ALL:
-                if (($this->_tagged === NULL)) {
+                if ($this->_tagged === null) {
                     $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME);
                     $this->_tagged = $tagged;
                 }
-                if (($this->_tagged === NULL) || empty($this->_tagged)) {
+                if ($this->_tagged === null || empty($this->_tagged)) {
                     return true;
                 }
                 $urls = array_keys($this->_tagged);
@@ -434,11 +434,11 @@ class Zend_Cache_Backend_Static
                 if (empty($tags)) {
                     throw new Zend_Exception('Cannot use tag matching modes as no tags were defined');
                 }
-                if (($this->_tagged === NULL)) {
+                if ($this->_tagged === null) {
                     $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME);
                     $this->_tagged = $tagged;
                 }
-                if (($this->_tagged === NULL) || empty($this->_tagged)) {
+                if ($this->_tagged === null || empty($this->_tagged)) {
                     return true;
                 }
                 $urls = array_keys($this->_tagged);
@@ -481,7 +481,7 @@ class Zend_Cache_Backend_Static
      */
     public function getInnerCache()
     {
-        if (($this->_tagCache === NULL)) {
+        if ($this->_tagCache === null) {
             Zend_Cache::throwException('An Inner Cache has not been set; use setInnerCache()');
         }
         return $this->_tagCache;

library/Zend/Cache/Frontend/Capture.php

@@ -75,7 +75,7 @@ class Zend_Cache_Frontend_Capture extends Zend_Cache_Core
     public function _flush($data)
     {
         $id = array_pop($this->_idStack);
-        if (($id === NULL)) {
+        if ($id === null) {
             Zend_Cache::throwException('use of _flush() without a start()');
         }
         if ($this->_extension) {

library/Zend/Controller/Action/Helper/Cache.php

@@ -223,7 +223,7 @@ class Zend_Controller_Action_Helper_Cache
      */
     public function getManager()
     {
-        if (($this->_manager !== NULL)) {
+        if ($this->_manager !== null) {
             return $this->_manager;
         }
         $front = Zend_Controller_Front::getInstance();

library/Zend/Crypt/DiffieHellman.php

@@ -108,7 +108,7 @@ class Zend_Crypt_DiffieHellman
     {
         $this->setPrime($prime);
         $this->setGenerator($generator);
-        if (($privateKey !== NULL)) {
+        if ($privateKey !== null) {
             $this->setPrivateKey($privateKey, $privateKeyType);
         }
         $this->setBigIntegerMath();
@@ -170,7 +170,7 @@ class Zend_Crypt_DiffieHellman
      */
     public function getPublicKey($type = self::NUMBER)
     {
-        if (($this->_publicKey === NULL)) {
+        if ($this->_publicKey === null) {
             require_once 'Zend/Crypt/DiffieHellman/Exception.php';
             throw new Zend_Crypt_DiffieHellman_Exception('A public key has not yet been generated using a prior call to generateKeys()');
         }

library/Zend/Crypt/Math/BigInteger.php

@@ -61,7 +61,7 @@ class Zend_Crypt_Math_BigInteger
      */
     public function __construct($extension = null)
     {
-        if (($extension !== NULL) && !in_array($extension, array('bcmath', 'gmp', 'bigint'))) {
+        if ($extension !== null && !in_array($extension, array('bcmath', 'gmp', 'bigint'))) {
             require_once('Zend/Crypt/Math/BigInteger/Exception.php');
             throw new Zend_Crypt_Math_BigInteger_Exception('Invalid extension type; please use one of bcmath, gmp or bigint');
         }
@@ -90,7 +90,7 @@ class Zend_Crypt_Math_BigInteger
      */
     protected function _loadAdapter($extension = null)
     {
-        if (($extension === NULL)) {
+        if ($extension === null) {
             if (extension_loaded('gmp')) {
                 $extension = 'gmp';
             //} elseif (extension_loaded('big_int')) {

library/Zend/Crypt/Rsa.php

@@ -190,7 +190,7 @@ class Zend_Crypt_Rsa
     {
         $config = null;
         $passPhrase = null;
-        if (($configargs !== NULL)) {
+        if ($configargs !== null) {
             if (isset($configargs['passPhrase'])) {
                 $passPhrase = $configargs['passPhrase'];
                 unset($configargs['passPhrase']);

library/Zend/Crypt/Rsa/Key/Private.php

@@ -62,7 +62,7 @@ class Zend_Crypt_Rsa_Key_Private extends Zend_Crypt_Rsa_Key
 
     public function getPublicKey()
     {
-        if (($this->_publicKey === NULL)) {
+        if ($this->_publicKey === null) {
             /**
              * @see Zend_Crypt_Rsa_Key_Public
              */

library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php

@@ -74,7 +74,7 @@ abstract class Zend_Feed_Pubsubhubbub_CallbackAbstract
      */
     public function __construct($config = null)
     {
-        if (($config !== NULL)) {
+        if ($config !== null) {
             $this->setConfig($config);
         }
     }

library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php

@@ -53,7 +53,7 @@ class Zend_Feed_Pubsubhubbub_Model_ModelAbstract
      */
     public function __construct(Zend_Db_Table_Abstract $tableGateway = null)
     {
-        if (($tableGateway === NULL)) {
+        if ($tableGateway === null) {
             $parts = explode('_', get_class($this));
             $table = strtolower(array_pop($parts));
             $this->_db = new Zend_Db_Table($table);

library/Zend/Feed/Pubsubhubbub/Publisher.php

@@ -74,7 +74,7 @@ class Zend_Feed_Pubsubhubbub_Publisher
      */
     public function __construct($config = null)
     {
-        if (($config !== NULL)) {
+        if ($config !== null) {
             $this->setConfig($config);
         }
     }
@@ -306,7 +306,7 @@ class Zend_Feed_Pubsubhubbub_Publisher
             $this->removeParameter($name);
             return $this;
         }
-        if (empty($value) || (!is_string($value) && ($value !== NULL))) {
+        if (empty($value) || (!is_string($value) && $value !== null)) {
             require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
             throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "value"'
                 .' of "' . $value . '" must be a non-empty string');

library/Zend/Feed/Pubsubhubbub/Subscriber.php

@@ -150,7 +150,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber
      */
     public function __construct($config = null)
     {
-        if (($config !== NULL)) {
+        if ($config !== null) {
             $this->setConfig($config);
         }
     }
@@ -471,7 +471,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber
             $this->removeParameter($name);
             return $this;
         }
-        if (empty($value) || (!is_string($value) && ($value !== NULL))) {
+        if (empty($value) || (!is_string($value) && $value !== null)) {
             require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
             throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "value"'
                 . ' of "' . $value . '" must be a non-empty string');

library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php

@@ -208,7 +208,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber_Callback
      */
     public function hasFeedUpdate()
     {
-        if (($this->_feedUpdate === NULL)) {
+        if ($this->_feedUpdate === null) {
             return false;
         }
         return true;

library/Zend/Feed/Reader.php

@@ -236,10 +236,10 @@ class Zend_Feed_Reader
         if (self::$_httpConditionalGet && $cache) {
             $data = $cache->load($cacheId);
             if ($data) {
-                if (($etag === NULL)) {
+                if ($etag === null) {
                     $etag = $cache->load($cacheId.'_etag');
                 }
-                if (($lastModified === NULL)) {
+                if ($lastModified === null) {
                     $lastModified = $cache->load($cacheId.'_lastmodified');;
                 }
                 if ($etag) {

library/Zend/Feed/Reader/Extension/EntryAbstract.php

@@ -83,7 +83,7 @@ abstract class Zend_Feed_Reader_Extension_EntryAbstract
         $this->_entryKey    = $entryKey;
         $this->_domDocument = $entry->ownerDocument;
 
-        if (($type !== NULL)) {
+        if ($type !== null) {
             $this->_data['type'] = $type;
         } else {
             $this->_data['type'] = Zend_Feed_Reader::detectType($entry->ownerDocument, true);

library/Zend/Feed/Reader/Feed/Atom.php

@@ -318,7 +318,7 @@ class Zend_Feed_Reader_Feed_Atom extends Zend_Feed_Reader_FeedAbstract
 
         $link = $this->getExtension('Atom')->getFeedLink();
 
-        if (($link === NULL) || empty($link)) {
+        if ($link === null || empty($link)) {
             $link = $this->getOriginalSourceUri();
         }
 

library/Zend/Feed/Reader/Feed/Rss.php

@@ -543,7 +543,7 @@ class Zend_Feed_Reader_Feed_Rss extends Zend_Feed_Reader_FeedAbstract
 
         $link = $this->getExtension('Atom')->getFeedLink();
 
-        if (($link === NULL) || empty($link)) {
+        if ($link === null || empty($link)) {
             $link = $this->getOriginalSourceUri();
         }
 

library/Zend/Feed/Reader/FeedSet.php

@@ -88,7 +88,7 @@ class Zend_Feed_Reader_FeedSet extends ArrayObject
     protected function _absolutiseUri($link, $uri = null)
     {
         if (!Zend_Uri::check($link)) {
-            if (($uri !== NULL)) {
+            if ($uri !== null) {
                 $uri = Zend_Uri::factory($uri);
 
                 if ($link[0] !== '/') {

library/Zend/Feed/Writer/Deleted.php

@@ -126,7 +126,7 @@ class Zend_Feed_Writer_Deleted
     public function setWhen($date = null)
     {
         $zdate = null;
-        if (($date === NULL)) {
+        if ($date === null) {
             $zdate = new Zend_Date;
         } elseif (ctype_digit($date) && strlen($date) == 10) {
             $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);

library/Zend/Feed/Writer/Entry.php

@@ -212,7 +212,7 @@ class Zend_Feed_Writer_Entry
     public function setDateCreated($date = null)
     {
         $zdate = null;
-        if (($date === NULL)) {
+        if ($date === null) {
             $zdate = new Zend_Date;
         } elseif (ctype_digit($date) && strlen($date) == 10) {
             $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
@@ -233,7 +233,7 @@ class Zend_Feed_Writer_Entry
     public function setDateModified($date = null)
     {
         $zdate = null;
-        if (($date === NULL)) {
+        if ($date === null) {
             $zdate = new Zend_Date;
         } elseif (ctype_digit($date) && strlen($date) == 10) {
             $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);

library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php

@@ -104,7 +104,7 @@ class Zend_Feed_Writer_Extension_ITunes_Renderer_Entry
     protected function _setBlock(DOMDocument $dom, DOMElement $root)
     {
         $block = $this->getDataContainer()->getItunesBlock();
-        if (($block === NULL)) {
+        if ($block === null) {
             return;
         }
         $el = $dom->createElement('itunes:block');
@@ -144,7 +144,7 @@ class Zend_Feed_Writer_Extension_ITunes_Renderer_Entry
     protected function _setExplicit(DOMDocument $dom, DOMElement $root)
     {
         $explicit = $this->getDataContainer()->getItunesExplicit();
-        if (($explicit === NULL)) {
+        if ($explicit === null) {
             return;
         }
         $el = $dom->createElement('itunes:explicit');

library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php

@@ -109,7 +109,7 @@ class Zend_Feed_Writer_Extension_ITunes_Renderer_Feed
     protected function _setBlock(DOMDocument $dom, DOMElement $root)
     {
         $block = $this->getDataContainer()->getItunesBlock();
-        if (($block === NULL)) {
+        if ($block === null) {
             return;
         }
         $el = $dom->createElement('itunes:block');
@@ -200,7 +200,7 @@ class Zend_Feed_Writer_Extension_ITunes_Renderer_Feed
     protected function _setExplicit(DOMDocument $dom, DOMElement $root)
     {
         $explicit = $this->getDataContainer()->getItunesExplicit();
-        if (($explicit === NULL)) {
+        if ($explicit === null) {
             return;
         }
         $el = $dom->createElement('itunes:explicit');

library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php

@@ -90,7 +90,7 @@ class Zend_Feed_Writer_Extension_Threading_Renderer_Entry
         $clink->setAttribute('type', 'text/html');
         $clink->setAttribute('href', $link);
         $count = $this->getDataContainer()->getCommentCount();
-        if (($count !== NULL)) {
+        if ($count !== null) {
             $clink->setAttribute('thr:count', $count);
         }
         $root->appendChild($clink);
@@ -116,7 +116,7 @@ class Zend_Feed_Writer_Extension_Threading_Renderer_Entry
             $flink->setAttribute('type', 'application/'. $link['type'] .'+xml');
             $flink->setAttribute('href', $link['uri']);
             $count = $this->getDataContainer()->getCommentCount();
-            if (($count !== NULL)) {
+            if ($count !== null) {
                 $flink->setAttribute('thr:count', $count);
             }
             $root->appendChild($flink);
@@ -134,7 +134,7 @@ class Zend_Feed_Writer_Extension_Threading_Renderer_Entry
     protected function _setCommentCount(DOMDocument $dom, DOMElement $root)
     {
         $count = $this->getDataContainer()->getCommentCount();
-        if (($count === NULL)) {
+        if ($count === null) {
             return;
         }
         $tcount = $this->_dom->createElement('thr:total');

library/Zend/Feed/Writer/Feed/FeedAbstract.php

@@ -171,7 +171,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract
     public function setDateCreated($date = null)
     {
         $zdate = null;
-        if (($date === NULL)) {
+        if ($date === null) {
             $zdate = new Zend_Date;
         } elseif (ctype_digit($date) && strlen($date) == 10) {
             $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
@@ -192,7 +192,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract
     public function setDateModified($date = null)
     {
         $zdate = null;
-        if (($date === NULL)) {
+        if ($date === null) {
             $zdate = new Zend_Date;
         } elseif (ctype_digit($date) && strlen($date) == 10) {
             $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
@@ -213,7 +213,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract
     public function setLastBuildDate($date = null)
     {
         $zdate = null;
-        if (($date === NULL)) {
+        if ($date === null) {
             $zdate = new Zend_Date;
         } elseif (ctype_digit($date) && strlen($date) == 10) {
             $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);

library/Zend/Filter/Boolean.php

@@ -273,7 +273,7 @@ class Zend_Filter_Boolean implements Zend_Filter_Interface
         // NULL (null)
         if ($type >= self::NULL) {
             $type -= self::NULL;
-            if (($value === NULL)) {
+            if ($value === null) {
                 return false;
             }
         }

library/Zend/Filter/Compress/Rar.php

@@ -176,7 +176,7 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract
     public function compress($content)
     {
         $callback = $this->getCallback();
-        if (($callback === NULL)) {
+        if ($callback === null) {
             require_once 'Zend/Filter/Exception.php';
             throw new Zend_Filter_Exception('No compression callback available');
         }
@@ -210,7 +210,7 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract
         }
 
         $password = $this->getPassword();
-        if (($password !== NULL)) {
+        if ($password !== null) {
             $archive = rar_open($archive, $password);
         } else {
             $archive = rar_open($archive);

library/Zend/Gdata/App/Base.php

@@ -375,8 +375,8 @@ abstract class Zend_Gdata_App_Base
     {
         // Check for a memoized result
         $key = $prefix . ' ' .
-               (($majorVersion === NULL) ? 'NULL' : $majorVersion) .
-               ' '. (($minorVersion === NULL) ? 'NULL' : $minorVersion);
+               ($majorVersion === null ? 'NULL' : $majorVersion) .
+               ' '. ($minorVersion === null ? 'NULL' : $minorVersion);
         if (array_key_exists($key, self::$_namespaceLookupCache))
           return self::$_namespaceLookupCache[$key];
         // If no match, return the prefix by default

library/Zend/Ldap.php

@@ -979,7 +979,7 @@ class Zend_Ldap
             require_once 'Zend/Ldap/Exception.php';
             throw new Zend_Ldap_Exception($this, 'searching: ' . $filter);
         }
-        if (($sort !== NULL) && is_string($sort)) {
+        if ($sort !== null && is_string($sort)) {
             $isSorted = @ldap_sort($this->getResource(), $search, $sort);
             if($isSorted === false) {
                 /**
@@ -1156,7 +1156,7 @@ class Zend_Ldap
         foreach ($entry as $key => $value) {
             if (is_array($value)) {
                 foreach ($value as $i => $v) {
-                    if (($v === NULL)) unset($value[$i]);
+                    if ($v === null) unset($value[$i]);
                     else if (!is_scalar($v)) {
                         throw new InvalidArgumentException('Only scalar values allowed in LDAP data');
                     } else {
@@ -1170,7 +1170,7 @@ class Zend_Ldap
                 }
                 $entry[$key] = array_values($value);
             } else {
-                if (($value === NULL)) $entry[$key] = array();
+                if ($value === null) $entry[$key] = array();
                 else if (!is_scalar($value)) {
                     throw new InvalidArgumentException('Only scalar values allowed in LDAP data');
                 } else {

library/Zend/Ldap/Attribute.php

@@ -53,13 +53,13 @@ class Zend_Ldap_Attribute
             foreach ($value as $v)
             {
                 $v = self::_valueToLdap($v);
-                if (($v !== NULL)) $valArray[] = $v;
+                if ($v !== null) $valArray[] = $v;
             }
         }
-        else if (($value !== NULL))
+        else if ($value !== null)
         {
             $value = self::_valueToLdap($value);
-            if (($value !== NULL)) $valArray[] = $value;
+            if ($value !== null) $valArray[] = $value;
         }
 
         if ($append === true && isset($data[$attribName]))
@@ -84,7 +84,7 @@ class Zend_Ldap_Attribute
     public static function getAttribute(array $data, $attribName, $index = null)
     {
         $attribName = strtolower($attribName);
-        if (($index === NULL)) {
+        if ($index === null) {
             if (!isset($data[$attribName])) return array();
             $retArray = array();
             foreach ($data[$attribName] as $v)
@@ -344,12 +344,12 @@ class Zend_Ldap_Attribute
         {
             foreach ($value as $v) {
                 $v = self::_valueToLdapDateTime($v, $utc);
-                if (($v !== NULL)) $convertedValues[] = $v;
+                if ($v !== null) $convertedValues[] = $v;
             }
         }
-        else if (($value !== NULL)) {
+        else if ($value !== null) {
             $value = self::_valueToLdapDateTime($value, $utc);
-            if (($value !== NULL)) $convertedValues[] = $value;
+            if ($value !== null) $convertedValues[] = $value;
         }
         self::setAttribute($data, $attribName, $convertedValues, $append);
     }

library/Zend/Ldap/Dn.php

@@ -610,8 +610,8 @@ class Zend_Ldap_Dn implements ArrayAccess
                 $ret[] = array($k[$i] => $v[$i]);
             }
         }
-        if (($keys !== NULL)) $keys = $k;
-        if (($vals !== NULL)) $vals = $v;
+        if ($keys !== null) $keys = $k;
+        if ($vals !== null) $vals = $v;
         return $ret;
     }
 

library/Zend/Ldap/Filter.php

@@ -242,9 +242,9 @@ class Zend_Ldap_Filter extends Zend_Ldap_Filter_String
     private static function _createFilterString($attr, $value, $filtertype, $prepend = null, $append = null)
     {
         $str = $attr . $filtertype;
-        if (($prepend !== NULL)) $str .= $prepend;
+        if ($prepend !== null) $str .= $prepend;
         $str .= self::escapeValue($value);
-        if (($append !== NULL)) $str .= $append;
+        if ($append !== null) $str .= $append;
         return $str;
     }
 

library/Zend/Ldap/Node.php

@@ -99,7 +99,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
     protected function __construct(Zend_Ldap_Dn $dn, array $data, $fromDataSource, Zend_Ldap $ldap = null)
     {
         parent::__construct($dn, $data, $fromDataSource);
-        if (($ldap !== NULL)) $this->attachLdap($ldap);
+        if ($ldap !== null) $this->attachLdap($ldap);
         else $this->detachLdap();
     }
 
@@ -136,7 +136,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      */
     public function getLdap()
     {
-        if (($this->_ldap === NULL)) {
+        if ($this->_ldap === null) {
             /**
              * @see Zend_Ldap_Exception
              */
@@ -205,7 +205,7 @@ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, Recurs
      */
     public function isAttached()
     {
-        return (($this->_ldap !== NULL));
+        return ($this->_ldap !== null);
     }
 
     /**

library/Zend/Log/Filter/Priority.php

@@ -59,7 +59,7 @@ class Zend_Log_Filter_Priority extends Zend_Log_Filter_Abstract
         }
 
         $this->_priority = $priority;
-        $this->_operator = ($operator === NULL) ? '<=' : $operator;
+        $this->_operator = $operator === null ? '<=' : $operator;
     }
 
     /**

library/Zend/Oauth/Client.php

@@ -78,7 +78,7 @@ class Zend_Oauth_Client extends Zend_Http_Client
     {
         parent::__construct($uri, $config);
         $this->_config = new Zend_Oauth_Config;
-        if (($oauthOptions !== NULL)) {
+        if ($oauthOptions !== null) {
             if ($oauthOptions instanceof Zend_Config) {
                 $oauthOptions = $oauthOptions->toArray();
             }
@@ -217,7 +217,7 @@ class Zend_Oauth_Client extends Zend_Http_Client
      */
     public function request($method = null)
     {
-        if (($method !== NULL)) {
+        if ($method !== null) {
             $this->setMethod($method);
         }
         $this->prepareOauth();

library/Zend/Oauth/Config.php

@@ -156,7 +156,7 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface
      */
     public function __construct($options = null)
     {
-        if (($options !== NULL)) {
+        if ($options !== null) {
             if ($options instanceof Zend_Config) {
                 $options = $options->toArray();
             }
@@ -267,7 +267,7 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface
      */
     public function getConsumerSecret()
     {
-        if (($this->_rsaPrivateKey !== NULL)) {
+        if ($this->_rsaPrivateKey !== null) {
             return $this->_rsaPrivateKey;
         }
         return $this->_consumerSecret;

library/Zend/Oauth/Consumer.php

@@ -79,7 +79,7 @@ class Zend_Oauth_Consumer extends Zend_Oauth
     public function __construct($options = null)
     {
         $this->_config = new Zend_Oauth_Config;
-        if (($options !== NULL)) {
+        if ($options !== null) {
             if ($options instanceof Zend_Config) {
                 $options = $options->toArray();
             }
@@ -102,12 +102,12 @@ class Zend_Oauth_Consumer extends Zend_Oauth
         $httpMethod = null,
         Zend_Oauth_Http_RequestToken $request = null
     ) {
-        if (($request === NULL)) {
+        if ($request === null) {
             $request = new Zend_Oauth_Http_RequestToken($this, $customServiceParameters);
-        } elseif(($customServiceParameters !== NULL)) {
+        } elseif($customServiceParameters !== null) {
             $request->setParameters($customServiceParameters);
         }
-        if (($httpMethod !== NULL)) {
+        if ($httpMethod !== null) {
             $request->setMethod($httpMethod);
         } else {
             $request->setMethod($this->getRequestMethod());
@@ -134,12 +134,12 @@ class Zend_Oauth_Consumer extends Zend_Oauth
         Zend_Oauth_Token_Request $token = null,
         Zend_Oauth_Http_UserAuthorization $redirect = null
     ) {
-        if (($redirect === NULL)) {
+        if ($redirect === null) {
             $redirect = new Zend_Oauth_Http_UserAuthorization($this, $customServiceParameters);
-        } elseif(($customServiceParameters !== NULL)) {
+        } elseif($customServiceParameters !== null) {
             $redirect->setParameters($customServiceParameters);
         }
-        if (($token !== NULL)) {
+        if ($token !== null) {
             $this->_requestToken = $token;
         }
         return $redirect->getUrl();
@@ -187,7 +187,7 @@ class Zend_Oauth_Consumer extends Zend_Oauth
             throw new Zend_Oauth_Exception(
                 'Response from Service Provider is not a valid authorized request token');
         }
-        if (($request === NULL)) {
+        if ($request === null) {
             $request = new Zend_Oauth_Http_AccessToken($this);
         }
 
@@ -198,7 +198,7 @@ class Zend_Oauth_Consumer extends Zend_Oauth
             ));
             $request->setParameters($params);
         }
-        if (($httpMethod !== NULL)) {
+        if ($httpMethod !== null) {
             $request->setMethod($httpMethod);
         } else {
             $request->setMethod($this->getRequestMethod());

library/Zend/Oauth/Http.php

@@ -86,10 +86,10 @@ class Zend_Oauth_Http
     ) {
         $this->_consumer = $consumer;
         $this->_preferredRequestScheme = $this->_consumer->getRequestScheme();
-        if (($parameters !== NULL)) {
+        if ($parameters !== null) {
             $this->setParameters($parameters);
         }
-        if (($utility !== NULL)) {
+        if ($utility !== null) {
             $this->_httpUtility = $utility;
         } else {
             $this->_httpUtility = new Zend_Oauth_Http_Utility;
@@ -177,11 +177,11 @@ class Zend_Oauth_Http
             require_once 'Zend/Oauth/Exception.php';
             throw new Zend_Oauth_Exception('Error in HTTP request', null, $e);
         }
-        if (($response !== NULL)) {
+        if ($response !== null) {
             $body   = $response->getBody();
             $status = $response->getStatus();
         }
-        if (($response === NULL) // Request failure/exception
+        if ($response === null // Request failure/exception
             || $status == 500  // Internal Server Error
             || $status == 400  // Bad Request
             || $status == 401  // Unauthorized
@@ -233,7 +233,7 @@ class Zend_Oauth_Http
                 require_once 'Zend/Oauth/Exception.php';
                 throw new Zend_Oauth_Exception(
                     'Could not retrieve a valid Token response from Token URL:'
-                    . (($response !== NULL) 
+                    . ($response !== null 
                         ? PHP_EOL . $response->getBody()
                         : ' No body - check for headers')
                 );

library/Zend/Oauth/Http/Utility.php

@@ -60,7 +60,7 @@ class Zend_Oauth_Http_Utility
         }
 
 
-        if (($serviceProviderParams !== NULL)) {
+        if ($serviceProviderParams !== null) {
             $params = array_merge($params, $serviceProviderParams);
         }
 

library/Zend/Oauth/Signature/Plaintext.php

@@ -40,7 +40,7 @@ class Zend_Oauth_Signature_Plaintext extends Zend_Oauth_Signature_SignatureAbstr
      */
     public function sign(array $params, $method = null, $url = null)
     {
-        if (($this->_tokenSecret === NULL)) {
+        if ($this->_tokenSecret === null) {
             return $this->_consumerSecret . '&';
         }
         $return = implode('&', array($this->_consumerSecret, $this->_tokenSecret));

library/Zend/Oauth/Signature/SignatureAbstract.php

@@ -115,7 +115,7 @@ abstract class Zend_Oauth_Signature_SignatureAbstract
     protected function _assembleKey()
     {
         $parts = array($this->_consumerSecret);
-        if (($this->_tokenSecret !== NULL)) {
+        if ($this->_tokenSecret !== null) {
             $parts[] = $this->_tokenSecret;
         }
         foreach ($parts as $key => $secret) {

library/Zend/Oauth/Token.php

@@ -68,14 +68,14 @@ abstract class Zend_Oauth_Token
         Zend_Http_Response $response = null,
         Zend_Oauth_Http_Utility $utility = null
     ) {
-        if (($response !== NULL)) {
+        if ($response !== null) {
             $this->_response = $response;
             $params = $this->_parseParameters($response);
             if (count($params) > 0) {
                 $this->setParams($params);
             }
         }
-        if (($utility !== NULL)) {
+        if ($utility !== null) {
             $this->_httpUtility = $utility;
         } else {
             $this->_httpUtility = new Zend_Oauth_Http_Utility;
@@ -278,7 +278,7 @@ abstract class Zend_Oauth_Token
      */
     public function __wakeup() 
     {
-        if (($this->_httpUtility === NULL)) {
+        if ($this->_httpUtility === null) {
             $this->_httpUtility = new Zend_Oauth_Http_Utility;
         }
     }

library/Zend/Oauth/Token/AuthorizedRequest.php

@@ -44,14 +44,14 @@ class Zend_Oauth_Token_AuthorizedRequest extends Zend_Oauth_Token
      */
     public function __construct(array $data = null, Zend_Oauth_Http_Utility $utility = null)
     {
-        if (($data !== NULL)) {
+        if ($data !== null) {
             $this->_data = $data;
             $params = $this->_parseData();
             if (count($params) > 0) {
                 $this->setParams($params);
             }
         }
-        if (($utility !== NULL)) {
+        if ($utility !== null) {
             $this->_httpUtility = $utility;
         } else {
             $this->_httpUtility = new Zend_Oauth_Http_Utility;

library/Zend/Queue/Stomp/Frame.php

@@ -195,7 +195,7 @@ class Zend_Queue_Stomp_Frame
      */
     public function getBody()
     {
-        return ($this->_body === NULL)
+        return $this->_body === null
             ? false
             : $this->_body;
     }
@@ -211,7 +211,7 @@ class Zend_Queue_Stomp_Frame
      */
     public function setBody($body)
     {
-        if (!is_string($body) && ($body !== NULL)) {
+        if (!is_string($body) && $body !== null) {
             require_once 'Zend/Queue/Exception.php';
             throw new Zend_Queue_Exception('$body is not a string or null');
         }
@@ -229,7 +229,7 @@ class Zend_Queue_Stomp_Frame
      */
     public function getCommand()
     {
-        return ($this->_command === NULL)
+        return $this->_command === null
             ? false
             : $this->_command;
     }
@@ -243,7 +243,7 @@ class Zend_Queue_Stomp_Frame
      */
     public function setCommand($command)
     {
-        if (!is_string($command) && ($command !== NULL)) {
+        if (!is_string($command) && $command !== null) {
             require_once 'Zend/Queue/Exception.php';
             throw new Zend_Queue_Exception('$command is not a string or null');
         }

library/Zend/Service/Amazon/S3.php

@@ -518,7 +518,7 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
 
         $headers = (is_array($meta)) ? $meta : array();
         $headers['x-amz-copy-source'] = $sourceObject;
-        $headers['x-amz-metadata-directive'] = ($meta === NULL) ? 'COPY' : 'REPLACE';
+        $headers['x-amz-metadata-directive'] = $meta === null ? 'COPY' : 'REPLACE';
 
         $response = $this->_makeRequest('PUT', $destObject, null, $headers);
 

library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php

@@ -334,7 +334,7 @@ abstract class Zend_Service_DeveloperGarden_Client_ClientAbstract
             $options['classmap'] = $this->_classMap;
         }
         $wsdlCache = Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::getWsdlCache();
-        if (($wsdlCache !== NULL)) {
+        if ($wsdlCache !== null) {
             $options['cache_wsdl'] = $wsdlCache;
         }
         return $options;

library/Zend/Service/DeveloperGarden/Client/Soap.php

@@ -109,7 +109,7 @@ class Zend_Service_DeveloperGarden_Client_Soap extends Zend_Soap_Client
         /**
          * add WSSE Security header
          */
-        if (($this->_tokenService !== NULL)) {
+        if ($this->_tokenService !== null) {
             // if login method we addWsseLoginHeader
             if (in_array('login', $arguments)) {
                 $this->addWsseLoginHeader();

library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php

@@ -522,7 +522,7 @@ class Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
     {
         $retVal = array();
         foreach ($this->_parameters as $key => $value) {
-            if (($value === NULL)) {
+            if ($value === null) {
                 continue;
             }
             $param = array(

library/Zend/Service/Twitter.php

@@ -145,7 +145,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client
             $this->setLocalHttpClient($options['accessToken']->getHttpClient($options));
         } else {
             $this->setLocalHttpClient(clone self::getHttpClient());
-            if (($consumer === NULL)) {
+            if ($consumer === null) {
                 $this->_oauthConsumer = new Zend_Oauth_Consumer($options);
             } else {
                 $this->_oauthConsumer = $consumer;

library/Zend/Service/WindowsAzure/Credentials/SharedKey.php

@@ -103,7 +103,7 @@ class Zend_Service_WindowsAzure_Credentials_SharedKey
 		}
 		
 		// Build canonicalized headers
-		if (($headers !== NULL)) {
+		if ($headers !== null) {
 			foreach ($headers as $header => $value) {
 				if (is_bool($value)) {
 					$value = $value === true ? 'True' : 'False';

library/Zend/Service/WindowsAzure/Storage.php

@@ -198,13 +198,13 @@ class Zend_Service_WindowsAzure_Storage
 			$this->_usePathStyleUri = true;
 		}
 		
-		if (($this->_credentials === NULL)) {
+		if ($this->_credentials === null) {
 		    $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKey(
 		    	$this->_accountName, $this->_accountKey, $this->_usePathStyleUri);
 		}
 		
 		$this->_retryPolicy = $retryPolicy;
-		if (($this->_retryPolicy === NULL)) {
+		if ($this->_retryPolicy === null) {
 		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
 		}
 		
@@ -240,7 +240,7 @@ class Zend_Service_WindowsAzure_Storage
 	public function setRetryPolicy(Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
 	{
 		$this->_retryPolicy = $retryPolicy;
-		if (($this->_retryPolicy === NULL)) {
+		if ($this->_retryPolicy === null) {
 		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
 		}
 	}
@@ -357,7 +357,7 @@ class Zend_Service_WindowsAzure_Storage
 		}
 			
 		// Clean headers
-		if (($headers === NULL)) {
+		if ($headers === null) {
 		    $headers = array();
 		}
 		
@@ -406,7 +406,7 @@ class Zend_Service_WindowsAzure_Storage
 	 */
 	protected function _parseResponse(Zend_Http_Response $response = null)
 	{
-		if (($response === NULL)) {
+		if ($response === null) {
 			throw new Zend_Service_WindowsAzure_Exception('Response should not be null.');
 		}
 		
@@ -485,7 +485,7 @@ class Zend_Service_WindowsAzure_Storage
 	    $tz = @date_default_timezone_get();
 	    @date_default_timezone_set('UTC');
 	    
-	    if (($timestamp === NULL)) {
+	    if ($timestamp === null) {
 	        $timestamp = time();
 	    }
 	        

library/Zend/Service/WindowsAzure/Storage/Batch.php

@@ -149,7 +149,7 @@ class Zend_Service_WindowsAzure_Storage_Batch
 		}
 			
 		// Clean headers
-		if (($headers === NULL)) {
+		if ($headers === null) {
 		    $headers = array();
 		}
 		    
@@ -161,7 +161,7 @@ class Zend_Service_WindowsAzure_Storage_Batch
 		$requestUrl     = $this->getBaseUrl() . $path . $queryString;
 		
 		// Generate $rawData
-		if (($rawData === NULL)) {
+		if ($rawData === null) {
 		    $rawData = '';
 		}
 		    

library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php

@@ -75,7 +75,7 @@ abstract class Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
      */
     public function setCurrentBatch(Zend_Service_WindowsAzure_Storage_Batch $batch = null)
     {
-        if (($batch !== NULL) && $this->isInBatch()) {
+        if ($batch !== null && $this->isInBatch()) {
             throw new Zend_Service_WindowsAzure_Exception('Only one batch can be active at a time.');
         }
         $this->_currentBatch = $batch;
@@ -98,7 +98,7 @@ abstract class Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
      */
     public function isInBatch()
     {
-        return ($this->_currentBatch !== NULL);
+        return $this->_currentBatch !== null;
     }
     
     /**

library/Zend/Service/WindowsAzure/Storage/Blob.php

@@ -469,13 +469,13 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
 	{
 	    // Build query string
 	    $queryString = '?comp=list';
-	    if (($prefix !== NULL)) {
+	    if ($prefix !== null) {
 	        $queryString .= '&prefix=' . $prefix;
 	    }
-	    if (($maxResults !== NULL)) {
+	    if ($maxResults !== null) {
 	        $queryString .= '&maxresults=' . $maxResults;
 	    }
-	    if (($marker !== NULL)) {
+	    if ($marker !== null) {
 	        $queryString .= '&marker=' . $marker;
 	    }
 	        
@@ -486,7 +486,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
 			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
 
 			$containers = array();
-			if (($xmlContainers !== NULL)) {
+			if ($xmlContainers !== null) {
 				for ($i = 0; $i < count($xmlContainers); $i++) {
 					$containers[] = new Zend_Service_WindowsAzure_Storage_BlobContainer(
 						(string)$xmlContainers[$i]->Name,
@@ -496,12 +496,12 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
 				}
 			}
 			$currentResultCount = $currentResultCount + count($containers);
-			if (($maxResults !== NULL) && $currentResultCount < $maxResults) {
-    			if (($xmlMarker !== NULL) && $xmlMarker != '') {
+			if ($maxResults !== null && $currentResultCount < $maxResults) {
+    			if ($xmlMarker !== null && $xmlMarker != '') {
     			    $containers = array_merge($containers, $this->listContainers($prefix, $maxResults, $xmlMarker, $currentResultCount));
     			}
 			}
-			if (($maxResults !== NULL) && count($containers) > $maxResults) {
+			if ($maxResults !== null && count($containers) > $maxResults) {
 			    $containers = array_slice($containers, 0, $maxResults);
 			}
 			    
@@ -1135,16 +1135,16 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
 			
 	    // Build query string
 	    $queryString = '?restype=container&comp=list';
-        if (($prefix !== NULL)) {
+        if ($prefix !== null) {
 	        $queryString .= '&prefix=' . $prefix;
         }
 		if ($delimiter !== '') {
 			$queryString .= '&delimiter=' . $delimiter;
 		}
-	    if (($maxResults !== NULL)) {
+	    if ($maxResults !== null) {
 	        $queryString .= '&maxresults=' . $maxResults;
 	    }
-	    if (($marker !== NULL)) {
+	    if ($marker !== null) {
 	        $queryString .= '&marker=' . $marker;
 	    }
 
@@ -1156,7 +1156,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
 		    
 			// Blobs
 			$xmlBlobs = $this->_parseResponse($response)->Blobs->Blob;
-			if (($xmlBlobs !== NULL)) {
+			if ($xmlBlobs !== null) {
 				for ($i = 0; $i < count($xmlBlobs); $i++) {
 					$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
 						$containerName,
@@ -1176,7 +1176,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
 			// Blob prefixes (folders)
 			$xmlBlobs = $this->_parseResponse($response)->Blobs->BlobPrefix;
 			
-			if (($xmlBlobs !== NULL)) {
+			if ($xmlBlobs !== null) {
 				for ($i = 0; $i < count($xmlBlobs); $i++) {
 					$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
 						$containerName,
@@ -1196,12 +1196,12 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
 			// More blobs?
 			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
 			$currentResultCount = $currentResultCount + count($blobs);
-			if (($maxResults !== NULL) && $currentResultCount < $maxResults) {
-    			if (($xmlMarker !== NULL) && $xmlMarker != '') {
+			if ($maxResults !== null && $currentResultCount < $maxResults) {
+    			if ($xmlMarker !== null && $xmlMarker != '') {
     			    $blobs = array_merge($blobs, $this->listBlobs($containerName, $prefix, $delimiter, $maxResults, $marker, $currentResultCount));
     			}
 			}
-			if (($maxResults !== NULL) && count($blobs) > $maxResults) {
+			if ($maxResults !== null && count($blobs) > $maxResults) {
 			    $blobs = array_slice($blobs, 0, $maxResults);
 			}
 			

library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php

@@ -90,7 +90,7 @@ class Zend_Service_WindowsAzure_Storage_Blob_Stream
      */
     protected function _getStorageClient($path = '')
     {
-        if (($this->_storageClient === NULL)) {
+        if ($this->_storageClient === null) {
             $url = explode(':', $path);
             if (!$url) {
                 throw new Zend_Service_WindowsAzure_Exception('Could not parse path "' . $path . '".');
@@ -371,7 +371,7 @@ class Zend_Service_WindowsAzure_Storage_Blob_Stream
         } catch (Zend_Service_WindowsAzure_Exception $ex) {
             // Unexisting file...
         }
-        if (($info !== NULL)) {
+        if ($info !== null) {
             $stat['size']  = $info->Size;
             $stat['atime'] = time();
         }     
@@ -456,7 +456,7 @@ class Zend_Service_WindowsAzure_Storage_Blob_Stream
         } catch (Zend_Service_WindowsAzure_Exception $ex) {
             // Unexisting file...
         }
-        if (($info !== NULL)) {
+        if ($info !== null) {
             $stat['size']  = $info->Size;
             $stat['atime'] = time();
         } 

library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php

@@ -86,7 +86,7 @@ class Zend_Service_WindowsAzure_Storage_DynamicTableEntity extends Zend_Service_
         } else {
             if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
                 // Determine type?
-                if (($type === NULL)) {
+                if ($type === null) {
                     $type = 'Edm.String';
                     if (is_int($value)) {
                         $type = 'Edm.Int32';

library/Zend/Service/WindowsAzure/Storage/Queue.php

@@ -278,13 +278,13 @@ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_
 	{
 	    // Build query string
 	    $queryString = '?comp=list';
-	    if (($prefix !== NULL)) {
+	    if ($prefix !== null) {
 	        $queryString .= '&prefix=' . $prefix;
 	    }
-	    if (($maxResults !== NULL)) {
+	    if ($maxResults !== null) {
 	        $queryString .= '&maxresults=' . $maxResults;
 	    }
-	    if (($marker !== NULL)) {
+	    if ($marker !== null) {
 	        $queryString .= '&marker=' . $marker;
 	    }
 	        
@@ -295,7 +295,7 @@ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_
 			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
 
 			$queues = array();
-			if (($xmlQueues !== NULL)) {
+			if ($xmlQueues !== null) {
 				for ($i = 0; $i < count($xmlQueues); $i++) {
 					$queues[] = new Zend_Service_WindowsAzure_Storage_QueueInstance(
 						(string)$xmlQueues[$i]->QueueName
@@ -303,12 +303,12 @@ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_
 				}
 			}
 			$currentResultCount = $currentResultCount + count($queues);
-			if (($maxResults !== NULL) && $currentResultCount < $maxResults) {
-    			if (($xmlMarker !== NULL) && $xmlMarker != '') {
+			if ($maxResults !== null && $currentResultCount < $maxResults) {
+    			if ($xmlMarker !== null && $xmlMarker != '') {
     			    $queues = array_merge($queues, $this->listQueues($prefix, $maxResults, $xmlMarker, $currentResultCount));
     			}
 			}
-			if (($maxResults !== NULL) && count($queues) > $maxResults) {
+			if ($maxResults !== null && count($queues) > $maxResults) {
 			    $queues = array_slice($queues, 0, $maxResults);
 			}
 			    
@@ -340,13 +340,13 @@ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_
 		if ($message == '') {
 		    throw new Zend_Service_WindowsAzure_Exception('Message is not specified.');
 		}
-		if (($ttl !== NULL) && ($ttl <= 0 || $ttl > self::MAX_MESSAGE_SIZE)) {
+		if ($ttl !== null && ($ttl <= 0 || $ttl > self::MAX_MESSAGE_SIZE)) {
 		    throw new Zend_Service_WindowsAzure_Exception('Message TTL is invalid. Maximal TTL is 7 days (' . self::MAX_MESSAGE_SIZE . ' seconds) and should be greater than zero.');
 		}
 		    
 	    // Build query string
 	    $queryString = '';
-	    if (($ttl !== NULL)) {
+	    if ($ttl !== null) {
 	        $queryString .= '?messagettl=' . $ttl;
 	    }
 	        
@@ -385,7 +385,7 @@ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_
 		if ($numOfMessages < 1 || $numOfMessages > 32 || intval($numOfMessages) != $numOfMessages) {
 		    throw new Zend_Service_WindowsAzure_Exception('Invalid number of messages to retrieve.');
 		}
-		if (($visibilityTimeout !== NULL) && ($visibilityTimeout <= 0 || $visibilityTimeout > 7200)) {
+		if ($visibilityTimeout !== null && ($visibilityTimeout <= 0 || $visibilityTimeout > 7200)) {
 		    throw new Zend_Service_WindowsAzure_Exception('Visibility timeout is invalid. Maximum value is 2 hours (7200 seconds) and should be greater than zero.');
 		}
 		    
@@ -397,7 +397,7 @@ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_
     	if ($numOfMessages > 1) {
 	        $query[] = 'numofmessages=' . $numOfMessages;
     	}
-    	if (!$peek && ($visibilityTimeout !== NULL)) {
+    	if (!$peek && $visibilityTimeout !== null) {
 	        $query[] = 'visibilitytimeout=' . $visibilityTimeout;
     	}   
     	$queryString = '?' . implode('&', $query);

library/Zend/Service/WindowsAzure/Storage/Table.php

@@ -297,7 +297,7 @@ class Zend_Service_WindowsAzure_Storage_Table
 		if ($tableName === '') {
 			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
 		}
-		if (($entity === NULL)) {
+		if ($entity === null) {
 			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
 		}
 		                     
@@ -367,7 +367,7 @@ class Zend_Service_WindowsAzure_Storage_Table
 		if ($tableName === '') {
 			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
 		}
-		if (($entity === NULL)) {
+		if ($entity === null) {
 			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
 		}
 		                     
@@ -523,7 +523,7 @@ class Zend_Service_WindowsAzure_Storage_Table
 		}
 		
 		// Add continuation querystring parameters?
-		if (($nextPartitionKey !== NULL) && ($nextRowKey !== NULL)) {
+		if ($nextPartitionKey !== null && $nextRowKey !== null) {
 		    if ($queryString !== '') {
 		        $queryString .= '&';
 		    }
@@ -689,7 +689,7 @@ class Zend_Service_WindowsAzure_Storage_Table
 		if ($tableName === '') {
 			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
 		}
-		if (($entity === NULL)) {
+		if ($entity === null) {
 			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
 		}
 		                     
@@ -794,12 +794,12 @@ class Zend_Service_WindowsAzure_Storage_Table
 		    if ($azureValue->Type != '') {
 		        $value[] = ' m:type="' . $azureValue->Type . '"';
 		    }
-		    if (($azureValue->Value === NULL)) {
+		    if ($azureValue->Value === null) {
 		        $value[] = ' m:null="true"'; 
 		    }
 		    $value[] = '>';
 		    
-		    if (($azureValue->Value !== NULL)) {
+		    if ($azureValue->Value !== null) {
 		        if (strtolower($azureValue->Type) == 'edm.boolean') {
 		            $value[] = ($azureValue->Value == true ? '1' : '0');
 		        } else {

library/Zend/Service/WindowsAzure/Storage/TableEntity.php

@@ -263,7 +263,7 @@ class Zend_Service_WindowsAzure_Storage_TableEntity
         $properties = $type->getProperties();
         foreach ($properties as $property) {
             $accessor = self::getAzureAccessor($property);
-            if (($accessor !== NULL)) {
+            if ($accessor !== null) {
                 $azureAccessors[] = $accessor;
             }
         }
@@ -272,7 +272,7 @@ class Zend_Service_WindowsAzure_Storage_TableEntity
         $methods = $type->getMethods();
         foreach ($methods as $method) {
             $accessor = self::getAzureAccessor($method);
-            if (($accessor !== NULL)) {
+            if ($accessor !== null) {
                 $azureAccessors[] = $accessor;
             }
         }

library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php

@@ -129,7 +129,7 @@ class Zend_Service_WindowsAzure_Storage_TableEntityQuery
 	{
 	    $condition = $this->_replaceOperators($condition);
 	    
-	    if (($value !== NULL)) {
+	    if ($value !== null) {
 	        $condition = $this->_quoteInto($condition, $value);
 	    }
 	    
@@ -211,7 +211,7 @@ class Zend_Service_WindowsAzure_Storage_TableEntityQuery
 			$query[] = '$orderby=' . ($urlEncode ? urlencode($orderBy) : $orderBy);
 		}
 		
-		if (($this->_top !== NULL)) {
+		if ($this->_top !== null) {
 			$query[] = '$top=' . $this->_top;
 		}
 		
@@ -234,15 +234,15 @@ class Zend_Service_WindowsAzure_Storage_TableEntityQuery
 	    if ($includeParentheses) {
 	        $identifier .= '(';
 	        
-	        if (($this->_partitionKey !== NULL)) {
+	        if ($this->_partitionKey !== null) {
 	            $identifier .= 'PartitionKey=\'' . $this->_partitionKey . '\'';
 	        }
 	            
-	        if (($this->_partitionKey !== NULL) && ($this->_rowKey !== NULL)) {
+	        if ($this->_partitionKey !== null && $this->_rowKey !== null) {
 	            $identifier .= ', ';
 	        }
 	            
-	        if (($this->_rowKey !== NULL)) {
+	        if ($this->_rowKey !== null) {
 	            $identifier .= 'RowKey=\'' . $this->_rowKey . '\'';
 	        }
 	            

library/Zend/Tool/Framework/Metadata/Basic.php

@@ -203,7 +203,7 @@ class Zend_Tool_Framework_Metadata_Basic
                     $varValue = '(object)';
                 }
 
-                if (($varValue === NULL)) {
+                if ($varValue === null) {
                     $varValue = '(null)';
                 }
 

library/Zend/Validate/NotEmpty.php

@@ -157,7 +157,7 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract
      */
     public function isValid($value)
     {
-        if (($value !== NULL) && !is_string($value) && !is_int($value) && !is_float($value) &&
+        if ($value !== null && !is_string($value) && !is_int($value) && !is_float($value) &&
             !is_bool($value) && !is_array($value)) {
             $this->_error(self::INVALID);
             return false;
@@ -214,7 +214,7 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract
         // NULL (null)
         if ($type >= self::NULL) {
             $type -= self::NULL;
-            if (($value === NULL)) {
+            if ($value === null) {
                 $this->_error(self::IS_EMPTY);
                 return false;
             }

library/Zend/View/Helper/HeadTitle.php

@@ -70,9 +70,9 @@ class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_
      */
     public function headTitle($title = null, $setType = null)
     {
-        if (($setType === NULL) && is_null($this->getDefaultAttachOrder())) {
+        if ($setType === null && is_null($this->getDefaultAttachOrder())) {
             $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND;
-        } elseif (($setType === NULL) && !is_null($this->getDefaultAttachOrder())) {
+        } elseif ($setType === null && !is_null($this->getDefaultAttachOrder())) {
             $setType = $this->getDefaultAttachOrder();
         }
         $title = (string) $title;