tweet_live: comparison web/lib/Zend/Service/WindowsAzure/Storage.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Service_WindowsAzure
 * @subpackage Storage
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Storage.php 23167 2010-10-19 17:53:31Z mabe $
+* @version    $Id: Storage.php 24697 2012-03-23 13:11:04Z ezimuel $
 */
 /**
-* @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
+* @see Zend_Http_Client
 */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
+require_once 'Zend/Http/Client.php';
 /**
 * @see Zend_Service_WindowsAzure_Credentials_SharedKey
 */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
 /**
 * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
 */
 require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-/**
-* @see Zend_Service_WindowsAzure_Exception
-*/
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-/**
-* @see Zend_Http_Client
-*/
-require_once 'Zend/Http/Client.php';
-/**
-* @see Zend_Http_Response
-*/
-require_once 'Zend/Http/Response.php';
 /**
 * @category   Zend
 * @package    Zend_Service_WindowsAzure
 * @subpackage Storage
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Service_WindowsAzure_Storage
 {
 	/**
 		) {
 			// Local storage
 			$this->_usePathStyleUri = true;
 		}
-		if ($this->_credentials === null) {
+		if (is_null($this->_credentials)) {
 		    $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKey(
 		    	$this->_accountName, $this->_accountKey, $this->_usePathStyleUri);
 		}
 		$this->_retryPolicy = $retryPolicy;
-		if ($this->_retryPolicy === null) {
+		if (is_null($this->_retryPolicy)) {
 		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
 		}
 		// Setup default Zend_Http_Client channel
 		$options = array(
 	 */
 	public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Proxy')
 	{
 		$this->_httpClientChannel->setAdapter($adapterInstance);
 	}
 /**
 * Retrieve HTTP client channel
 *
 * @return Zend_Http_Client_Adapter_Interface
 */
 	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
 	 */
 	public function setRetryPolicy(Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
 	{
 		$this->_retryPolicy = $retryPolicy;
-		if ($this->_retryPolicy === null) {
+		if (is_null($this->_retryPolicy)) {
 		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
 		}
 	}
 	/**
 		if (strpos($path, '/') !== 0) {
 			$path = '/' . $path;
 		}
 		// Clean headers
-		if ($headers === null) {
+		if (is_null($headers)) {
 		    $headers = array();
 		}
 		// Ensure cUrl will also work correctly:
 		//  - disable Content-Type if required
 		$requestUrl     = $this->_credentials
 						  ->signRequestUrl($this->getBaseUrl() . $path . $queryString, $resourceType, $requiredPermission);
 		$requestHeaders = $this->_credentials
 						  ->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission, $rawData);
 		// Prepare request
 		$this->_httpClientChannel->resetParameters(true);
 		$this->_httpClientChannel->setUri($requestUrl);
 		$this->_httpClientChannel->setHeaders($requestHeaders);
 		$this->_httpClientChannel->setRawData($rawData);
 	 * @return object
 	 * @throws Zend_Service_WindowsAzure_Exception
 	 */
 	protected function _parseResponse(Zend_Http_Response $response = null)
 	{
-		if ($response === null) {
+		if (is_null($response)) {
+			require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Response should not be null.');
 		}
 $xml = @simplexml_load_string($response->getBody());
 		// Return headers
 		$headers = array();
 		foreach ($metadata as $key => $value) {
 			if (strpos($value, "\r") !== false || strpos($value, "\n") !== false) {
-				throw new Zend_Service_WindowsAzure_Exception('Metadata cannot contain newline characters.');
+require_once 'Zend/Service/WindowsAzure/Exception.php';
+throw new Zend_Service_WindowsAzure_Exception('Metadata cannot contain newline characters.');
 			}
 			if (!self::isValidMetadataName($key)) {
-		    	throw new Zend_Service_WindowsAzure_Exception('Metadata name does not adhere to metadata naming conventions. See http://msdn.microsoft.com/en-us/library/aa664670(VS.71).aspx for more information.');
+require_once 'Zend/Service/WindowsAzure/Exception.php';
+throw new Zend_Service_WindowsAzure_Exception('Metadata name does not adhere to metadata naming conventions. See http://msdn.microsoft.com/en-us/library/aa664670(VS.71).aspx for more information.');
 			}
 		    $headers["x-ms-meta-" . strtolower($key)] = $value;
 		}
 		return $headers;
 	 * @return array
 	 */
 	protected function _parseMetadataElement($element = null)
 	{
 		// Metadata present?
-		if ($element !== null && isset($element->Metadata) && $element->Metadata !== null) {
+		if (!is_null($element) && isset($element->Metadata) && !is_null($element->Metadata)) {
 			return get_object_vars($element->Metadata);
 		}
 		return array();
 	}
 	public function isoDate($timestamp = null)
 	{
 	    $tz = @date_default_timezone_get();
 	    @date_default_timezone_set('UTC');
-	    if ($timestamp === null) {
+	    if (is_null($timestamp)) {
 	        $timestamp = time();
 	    }
 	    $returnValue = str_replace('+00:00', '.0000000Z', @date('c', $timestamp));
 	    @date_default_timezone_set($tz);

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c