Просмотр исходного кода

ZF-5413: fixed my last commit is_null -> === null

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22661 44c647ce-9c0f-0410-b52a-842ac1e357ba
mabe 15 лет назад
Родитель
Сommit
594df6d02f
40 измененных файлов с 73 добавлено и 73 удалено
  1. 1 1
      library/Zend/Amf/Server.php
  2. 12 12
      library/Zend/Cache/Backend/Static.php
  3. 1 1
      library/Zend/Cache/Frontend/Capture.php
  4. 1 1
      library/Zend/Crypt/DiffieHellman.php
  5. 1 1
      library/Zend/Crypt/Math/BigInteger.php
  6. 1 1
      library/Zend/Crypt/Rsa/Key/Private.php
  7. 1 1
      library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php
  8. 1 1
      library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php
  9. 2 2
      library/Zend/Feed/Reader.php
  10. 1 1
      library/Zend/Feed/Reader/Feed/Atom.php
  11. 1 1
      library/Zend/Feed/Reader/Feed/Rss.php
  12. 1 1
      library/Zend/Feed/Writer/Deleted.php
  13. 2 2
      library/Zend/Feed/Writer/Entry.php
  14. 2 2
      library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
  15. 2 2
      library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
  16. 1 1
      library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
  17. 3 3
      library/Zend/Feed/Writer/Feed/FeedAbstract.php
  18. 1 1
      library/Zend/Filter/Boolean.php
  19. 1 1
      library/Zend/Filter/Compress/Rar.php
  20. 2 2
      library/Zend/Gdata/App/Base.php
  21. 2 2
      library/Zend/Ldap.php
  22. 1 1
      library/Zend/Ldap/Attribute.php
  23. 1 1
      library/Zend/Ldap/Node.php
  24. 1 1
      library/Zend/Log/Filter/Priority.php
  25. 3 3
      library/Zend/Oauth/Consumer.php
  26. 1 1
      library/Zend/Oauth/Http.php
  27. 1 1
      library/Zend/Oauth/Signature/Plaintext.php
  28. 1 1
      library/Zend/Oauth/Token.php
  29. 2 2
      library/Zend/Queue/Stomp/Frame.php
  30. 1 1
      library/Zend/Service/Amazon/S3.php
  31. 1 1
      library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
  32. 1 1
      library/Zend/Service/Twitter.php
  33. 6 6
      library/Zend/Service/WindowsAzure/Storage.php
  34. 2 2
      library/Zend/Service/WindowsAzure/Storage/Batch.php
  35. 1 1
      library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
  36. 1 1
      library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
  37. 4 4
      library/Zend/Service/WindowsAzure/Storage/Table.php
  38. 1 1
      library/Zend/Tool/Framework/Metadata/Basic.php
  39. 2 2
      library/Zend/Validate/NotEmpty.php
  40. 2 2
      library/Zend/View/Helper/HeadTitle.php

+ 1 - 1
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);

+ 12 - 12
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;

+ 1 - 1
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) {

+ 1 - 1
library/Zend/Crypt/DiffieHellman.php

@@ -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()');
         }

+ 1 - 1
library/Zend/Crypt/Math/BigInteger.php

@@ -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')) {

+ 1 - 1
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
              */

+ 1 - 1
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);

+ 1 - 1
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;

+ 2 - 2
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) {

+ 1 - 1
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();
         }
 

+ 1 - 1
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();
         }
 

+ 1 - 1
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);

+ 2 - 2
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);

+ 2 - 2
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');

+ 2 - 2
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');

+ 1 - 1
library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php

@@ -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');

+ 3 - 3
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);

+ 1 - 1
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;
             }
         }

+ 1 - 1
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');
         }

+ 2 - 2
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

+ 2 - 2
library/Zend/Ldap.php

@@ -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 {

+ 1 - 1
library/Zend/Ldap/Attribute.php

@@ -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)

+ 1 - 1
library/Zend/Ldap/Node.php

@@ -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
              */

+ 1 - 1
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;
     }
 
     /**

+ 3 - 3
library/Zend/Oauth/Consumer.php

@@ -102,7 +102,7 @@ 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)) {
             $request->setParameters($customServiceParameters);
@@ -134,7 +134,7 @@ 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)) {
             $redirect->setParameters($customServiceParameters);
@@ -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);
         }
 

+ 1 - 1
library/Zend/Oauth/Http.php

@@ -181,7 +181,7 @@ class Zend_Oauth_Http
             $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

+ 1 - 1
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));

+ 1 - 1
library/Zend/Oauth/Token.php

@@ -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;
         }
     }

+ 2 - 2
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;
     }
@@ -229,7 +229,7 @@ class Zend_Queue_Stomp_Frame
      */
     public function getCommand()
     {
-        return($this->_command === NULL)
+        return ($this->_command === NULL)
             ? false
             : $this->_command;
     }

+ 1 - 1
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);
 

+ 1 - 1
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(

+ 1 - 1
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;

+ 6 - 6
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();
 	    }
 	        

+ 2 - 2
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 = '';
 		}
 		    

+ 1 - 1
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 . '".');

+ 1 - 1
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';

+ 4 - 4
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.');
 		}
 		                     
@@ -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,7 +794,7 @@ 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[] = '>';

+ 1 - 1
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)';
                 }
 

+ 2 - 2
library/Zend/Validate/NotEmpty.php

@@ -158,7 +158,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) &&
-            !is_bool($value) && !is_array($value) && !is_object($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;
             }

+ 2 - 2
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;