|
@@ -353,7 +353,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
|
|
|
|
|
// Acl specified?
|
|
// Acl specified?
|
|
|
- if ($acl != self::ACL_PRIVATE && !is_null($acl) && $acl != '') {
|
|
|
|
|
|
|
+ if ($acl != self::ACL_PRIVATE && $acl !== null && $acl != '') {
|
|
|
$headers[Zend_Service_WindowsAzure_Storage::PREFIX_STORAGE_HEADER . 'blob-public-access'] = $acl;
|
|
$headers[Zend_Service_WindowsAzure_Storage::PREFIX_STORAGE_HEADER . 'blob-public-access'] = $acl;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -524,16 +524,16 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
{
|
|
{
|
|
|
// Build query string
|
|
// Build query string
|
|
|
$queryString = array('comp=list');
|
|
$queryString = array('comp=list');
|
|
|
- if (!is_null($prefix)) {
|
|
|
|
|
|
|
+ if ($prefix !== null) {
|
|
|
$queryString[] = 'prefix=' . $prefix;
|
|
$queryString[] = 'prefix=' . $prefix;
|
|
|
}
|
|
}
|
|
|
- if (!is_null($maxResults)) {
|
|
|
|
|
|
|
+ if ($maxResults !== null) {
|
|
|
$queryString[] = 'maxresults=' . $maxResults;
|
|
$queryString[] = 'maxresults=' . $maxResults;
|
|
|
}
|
|
}
|
|
|
- if (!is_null($marker)) {
|
|
|
|
|
|
|
+ if ($marker !== null) {
|
|
|
$queryString[] = 'marker=' . $marker;
|
|
$queryString[] = 'marker=' . $marker;
|
|
|
}
|
|
}
|
|
|
- if (!is_null($include)) {
|
|
|
|
|
|
|
+ if ($include !== null) {
|
|
|
$queryString[] = 'include=' . $include;
|
|
$queryString[] = 'include=' . $include;
|
|
|
}
|
|
}
|
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
@@ -545,7 +545,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
|
|
$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
|
|
|
|
|
|
|
|
$containers = array();
|
|
$containers = array();
|
|
|
- if (!is_null($xmlContainers)) {
|
|
|
|
|
|
|
+ if ($xmlContainers !== null) {
|
|
|
for ($i = 0; $i < count($xmlContainers); $i++) {
|
|
for ($i = 0; $i < count($xmlContainers); $i++) {
|
|
|
$containers[] = new Zend_Service_WindowsAzure_Storage_BlobContainer(
|
|
$containers[] = new Zend_Service_WindowsAzure_Storage_BlobContainer(
|
|
|
(string)$xmlContainers[$i]->Name,
|
|
(string)$xmlContainers[$i]->Name,
|
|
@@ -556,12 +556,12 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
$currentResultCount = $currentResultCount + count($containers);
|
|
$currentResultCount = $currentResultCount + count($containers);
|
|
|
- if (!is_null($maxResults) && $currentResultCount < $maxResults) {
|
|
|
|
|
- if (!is_null($xmlMarker) && $xmlMarker != '') {
|
|
|
|
|
|
|
+ if ($maxResults !== null && $currentResultCount < $maxResults) {
|
|
|
|
|
+ if ($xmlMarker !== null && $xmlMarker != '') {
|
|
|
$containers = array_merge($containers, $this->listContainers($prefix, $maxResults, $xmlMarker, $include, $currentResultCount));
|
|
$containers = array_merge($containers, $this->listContainers($prefix, $maxResults, $xmlMarker, $include, $currentResultCount));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (!is_null($maxResults) && count($containers) > $maxResults) {
|
|
|
|
|
|
|
+ if ($maxResults !== null && count($containers) > $maxResults) {
|
|
|
$containers = array_slice($containers, 0, $maxResults);
|
|
$containers = array_slice($containers, 0, $maxResults);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -642,7 +642,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Create metadata headers
|
|
// Create metadata headers
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
@@ -788,7 +788,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Headers
|
|
// Headers
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -847,7 +847,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Create metadata headers
|
|
// Create metadata headers
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
@@ -904,13 +904,13 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Headers
|
|
// Headers
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// Build query string
|
|
// Build query string
|
|
|
$queryString = array('comp=blocklist', 'blocklisttype=' . $blockListType);
|
|
$queryString = array('comp=blocklist', 'blocklisttype=' . $blockListType);
|
|
|
- if (!is_null($snapshotId)) {
|
|
|
|
|
|
|
+ if ($snapshotId !== null) {
|
|
|
$queryString[] = 'snapshot=' . $snapshotId;
|
|
$queryString[] = 'snapshot=' . $snapshotId;
|
|
|
}
|
|
}
|
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
@@ -981,7 +981,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Create metadata headers
|
|
// Create metadata headers
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
@@ -1063,7 +1063,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Create metadata headers
|
|
// Create metadata headers
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1122,7 +1122,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Create metadata headers
|
|
// Create metadata headers
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1202,7 +1202,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Create metadata headers
|
|
// Create metadata headers
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($destinationLeaseId)) {
|
|
|
|
|
|
|
+ if ($destinationLeaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $destinationLeaseId;
|
|
$headers['x-ms-lease-id'] = $destinationLeaseId;
|
|
|
}
|
|
}
|
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
@@ -1214,7 +1214,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Resource names
|
|
// Resource names
|
|
|
$sourceResourceName = self::createResourceName($sourceContainerName, $sourceBlobName);
|
|
$sourceResourceName = self::createResourceName($sourceContainerName, $sourceBlobName);
|
|
|
- if (!is_null($sourceSnapshotId)) {
|
|
|
|
|
|
|
+ if ($sourceSnapshotId !== null) {
|
|
|
$sourceResourceName .= '?snapshot=' . $sourceSnapshotId;
|
|
$sourceResourceName .= '?snapshot=' . $sourceSnapshotId;
|
|
|
}
|
|
}
|
|
|
$destinationResourceName = self::createResourceName($destinationContainerName, $destinationBlobName);
|
|
$destinationResourceName = self::createResourceName($destinationContainerName, $destinationBlobName);
|
|
@@ -1299,14 +1299,14 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Build query string
|
|
// Build query string
|
|
|
$queryString = array();
|
|
$queryString = array();
|
|
|
- if (!is_null($snapshotId)) {
|
|
|
|
|
|
|
+ if ($snapshotId !== null) {
|
|
|
$queryString[] = 'snapshot=' . $snapshotId;
|
|
$queryString[] = 'snapshot=' . $snapshotId;
|
|
|
}
|
|
}
|
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
|
|
|
|
|
|
// Additional headers?
|
|
// Additional headers?
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
foreach ($additionalHeaders as $key => $value) {
|
|
foreach ($additionalHeaders as $key => $value) {
|
|
@@ -1353,14 +1353,14 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Build query string
|
|
// Build query string
|
|
|
$queryString = array();
|
|
$queryString = array();
|
|
|
- if (!is_null($snapshotId)) {
|
|
|
|
|
|
|
+ if ($snapshotId !== null) {
|
|
|
$queryString[] = 'snapshot=' . $snapshotId;
|
|
$queryString[] = 'snapshot=' . $snapshotId;
|
|
|
}
|
|
}
|
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
|
|
|
|
|
|
// Additional headers?
|
|
// Additional headers?
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
foreach ($additionalHeaders as $key => $value) {
|
|
foreach ($additionalHeaders as $key => $value) {
|
|
@@ -1459,7 +1459,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Create metadata headers
|
|
// Create metadata headers
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
|
|
@@ -1509,7 +1509,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
|
|
|
|
|
// Lease set?
|
|
// Lease set?
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1580,14 +1580,14 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Build query string
|
|
// Build query string
|
|
|
$queryString = array();
|
|
$queryString = array();
|
|
|
- if (!is_null($snapshotId)) {
|
|
|
|
|
|
|
+ if ($snapshotId !== null) {
|
|
|
$queryString[] = 'snapshot=' . $snapshotId;
|
|
$queryString[] = 'snapshot=' . $snapshotId;
|
|
|
}
|
|
}
|
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
|
|
|
|
|
|
// Additional headers?
|
|
// Additional headers?
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
foreach ($additionalHeaders as $key => $value) {
|
|
foreach ($additionalHeaders as $key => $value) {
|
|
@@ -1675,7 +1675,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
// Additional headers?
|
|
// Additional headers?
|
|
|
$headers = array();
|
|
$headers = array();
|
|
|
$headers['x-ms-lease-action'] = strtolower($leaseAction);
|
|
$headers['x-ms-lease-action'] = strtolower($leaseAction);
|
|
|
- if (!is_null($leaseId)) {
|
|
|
|
|
|
|
+ if ($leaseId !== null) {
|
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
$headers['x-ms-lease-id'] = $leaseId;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1719,19 +1719,19 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Build query string
|
|
// Build query string
|
|
|
$queryString = array('restype=container', 'comp=list');
|
|
$queryString = array('restype=container', 'comp=list');
|
|
|
- if (!is_null($prefix)) {
|
|
|
|
|
|
|
+ if ($prefix !== null) {
|
|
|
$queryString[] = 'prefix=' . $prefix;
|
|
$queryString[] = 'prefix=' . $prefix;
|
|
|
}
|
|
}
|
|
|
if ($delimiter !== '') {
|
|
if ($delimiter !== '') {
|
|
|
$queryString[] = 'delimiter=' . $delimiter;
|
|
$queryString[] = 'delimiter=' . $delimiter;
|
|
|
}
|
|
}
|
|
|
- if (!is_null($maxResults)) {
|
|
|
|
|
|
|
+ if ($maxResults !== null) {
|
|
|
$queryString[] = 'maxresults=' . $maxResults;
|
|
$queryString[] = 'maxresults=' . $maxResults;
|
|
|
}
|
|
}
|
|
|
- if (!is_null($marker)) {
|
|
|
|
|
|
|
+ if ($marker !== null) {
|
|
|
$queryString[] = 'marker=' . $marker;
|
|
$queryString[] = 'marker=' . $marker;
|
|
|
}
|
|
}
|
|
|
- if (!is_null($include)) {
|
|
|
|
|
|
|
+ if ($include !== null) {
|
|
|
$queryString[] = 'include=' . $include;
|
|
$queryString[] = 'include=' . $include;
|
|
|
}
|
|
}
|
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
$queryString = self::createQueryStringFromArray($queryString);
|
|
@@ -1744,7 +1744,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
|
|
|
|
|
// Blobs
|
|
// Blobs
|
|
|
$xmlBlobs = $this->_parseResponse($response)->Blobs->Blob;
|
|
$xmlBlobs = $this->_parseResponse($response)->Blobs->Blob;
|
|
|
- if (!is_null($xmlBlobs)) {
|
|
|
|
|
|
|
+ if ($xmlBlobs !== null) {
|
|
|
for ($i = 0; $i < count($xmlBlobs); $i++) {
|
|
for ($i = 0; $i < count($xmlBlobs); $i++) {
|
|
|
$properties = (array)$xmlBlobs[$i]->Properties;
|
|
$properties = (array)$xmlBlobs[$i]->Properties;
|
|
|
|
|
|
|
@@ -1771,7 +1771,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
// Blob prefixes (folders)
|
|
// Blob prefixes (folders)
|
|
|
$xmlBlobs = $this->_parseResponse($response)->Blobs->BlobPrefix;
|
|
$xmlBlobs = $this->_parseResponse($response)->Blobs->BlobPrefix;
|
|
|
|
|
|
|
|
- if (!is_null($xmlBlobs)) {
|
|
|
|
|
|
|
+ if ($xmlBlobs !== null) {
|
|
|
for ($i = 0; $i < count($xmlBlobs); $i++) {
|
|
for ($i = 0; $i < count($xmlBlobs); $i++) {
|
|
|
$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
|
|
$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
|
|
|
$containerName,
|
|
$containerName,
|
|
@@ -1796,12 +1796,12 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
|
|
|
// More blobs?
|
|
// More blobs?
|
|
|
$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
|
|
$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
|
|
|
$currentResultCount = $currentResultCount + count($blobs);
|
|
$currentResultCount = $currentResultCount + count($blobs);
|
|
|
- if (!is_null($maxResults) && $currentResultCount < $maxResults) {
|
|
|
|
|
- if (!is_null($xmlMarker) && $xmlMarker != '') {
|
|
|
|
|
|
|
+ if ($maxResults !== null && $currentResultCount < $maxResults) {
|
|
|
|
|
+ if ($xmlMarker !== null && $xmlMarker != '') {
|
|
|
$blobs = array_merge($blobs, $this->listBlobs($containerName, $prefix, $delimiter, $maxResults, $marker, $include, $currentResultCount));
|
|
$blobs = array_merge($blobs, $this->listBlobs($containerName, $prefix, $delimiter, $maxResults, $marker, $include, $currentResultCount));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (!is_null($maxResults) && count($blobs) > $maxResults) {
|
|
|
|
|
|
|
+ if ($maxResults !== null && count($blobs) > $maxResults) {
|
|
|
$blobs = array_slice($blobs, 0, $maxResults);
|
|
$blobs = array_slice($blobs, 0, $maxResults);
|
|
|
}
|
|
}
|
|
|
|
|
|