Merging with main fork

WindowsAzure/Blob/BlobService.php

@@ -44,8 +44,10 @@ class BlobService
     /**
      * Creates new object based on the builder type in the $config.
      *
-     * @param WindowsAzure\Common\Configuration    $config  The config object.
-     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder object.
+     * @param WindowsAzure\Common\Configuration             $config  The config
+     * object.
+     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder
+     * object.
      * 
      * @return WindowsAzure\Blob\Internal\IBlob
      */

WindowsAzure/Blob/Models/GetBlobMetadataResult.php

@@ -66,8 +66,8 @@ class GetBlobMetadataResult
      */
     public static function create($headers, $metadata)
     {
-        $result   = new GetBlobMetadataResult();
-        $date     = $headers[Resources::LAST_MODIFIED];
+        $result = new GetBlobMetadataResult();
+        $date   = $headers[Resources::LAST_MODIFIED];
         $result->setLastModified(Utilities::rfc1123ToDateTime($date));
         $result->setEtag($headers[Resources::ETAG]);
         $result->setMetadata(is_null($metadata) ? array() : $metadata);

WindowsAzure/Blob/Models/GetBlobResult.php

@@ -65,7 +65,7 @@ class GetBlobResult
      */
     public static function create($headers, $body, $metadata)
     {
-        $result   = new GetBlobResult();
+        $result = new GetBlobResult();
         $result->setContentStream(Utilities::stringToStream($body));
         $result->setProperties(BlobProperties::create($headers));
         $result->setMetadata(is_null($metadata) ? array() : $metadata);

WindowsAzure/Blob/Models/ListBlobsResult.php

@@ -118,7 +118,7 @@ public static function create($parsed)
             $blob->setUrl($value['Url']);
             $blob->setSnapshot(
                 Utilities::convertToDateTime(
-                        Utilities::tryGetValue($value, 'Snapshot')
+                    Utilities::tryGetValue($value, 'Snapshot')
                 )
             );
             $blob->setProperties(

WindowsAzure/Common/Configuration.php

@@ -74,12 +74,12 @@ public function __construct()
     }
 
     /**
-     * Configures $config to run against the storage emulator
+     * Configures $config to run against the storage emulator.
      *
      * @param WindowsAzure\Common\Configuration $config The configuration.
-     * @param string                          $type   The type name.
+     * @param string                            $type   The type name.
      * 
-     * @return none.
+     * @return none
      */
     private static function _useStorageEmulatorConfig($config, $type)
     {
@@ -116,7 +116,7 @@ private static function _useStorageEmulatorConfig($config, $type)
     /**
      * Access point to the static _instance of the class.
      *
-     * @return WindowsAzure\Common\Configuration.
+     * @return WindowsAzure\Common\Configuration
      */
     public static function getInstance()
     {
@@ -130,7 +130,7 @@ public static function getInstance()
     /**
      * Gets the configuration property set.
      *
-     * @return array.
+     * @return array
      */
     public function getProperties()
     {
@@ -142,7 +142,7 @@ public function getProperties()
      *
      * @param string $key index of the property value.
      * 
-     * @return mix.
+     * @return mix
      */
     public function getProperty($key)
     {
@@ -155,7 +155,7 @@ public function getProperty($key)
      * @param string $key   index of the property value.
      * @param string $value actual value to store.
      * 
-     * @return none.
+     * @return none
      */
     public function setProperty($key, $value)
     {

WindowsAzure/Common/Internal/IServiceBuilder.php

@@ -49,7 +49,7 @@ interface IServiceBuilder
      * Creates an object passed $type configured with $config.
      *
      * @param WindowsAzure\Common\Configuration $config The configuration.
-     * @param string                          $type   The type name.
+     * @param string                            $type   The type name.
      * 
      * @return mix
      */

WindowsAzure/Common/Internal/Resources.php

@@ -37,6 +37,8 @@
  */
 class Resources
 {
+    // @codingStandardsIgnoreStart
+
     // Messages
     const INVALID_TYPE_MSG     = 'The provided variable should be of type: ';
     const INVALID_META_MSG     = 'Metadata cannot contain newline characters.';
@@ -259,6 +261,8 @@ class Resources
     const SSL_VERIFY_HOST = 'ssl_verify_host';
     const SSL_LOCAL_CERT  = 'ssl_local_cert';
     const CONNECT_TIMEOUT = 'connect_timeout';
+
+    // @codingStandardsIgnoreEnd
 }
 
 ?>

WindowsAzure/Common/Internal/RestProxy.php

@@ -110,7 +110,8 @@ public function setUri($uri)
     /**
      * Sends HTTP request with the specified HTTP call context.
      * 
-     * @param WindowsAzure\Common\Internal\Http\HttpCallContext $context The HTTP call context.
+     * @param WindowsAzure\Common\Internal\Http\HttpCallContext $context The HTTP 
+     * call context.
      * 
      * @return \HTTP_Request2_Response
      */

WindowsAzure/Common/Internal/ServiceRestProxy.php

@@ -75,7 +75,8 @@ public function getAccountName()
     /**
      * Sends HTTP request with the specified HTTP call context.
      * 
-     * @param WindowsAzure\Common\Internal\Http\HttpCallContext $context The HTTP call context.
+     * @param WindowsAzure\Common\Internal\Http\HttpCallContext $context The HTTP 
+     * call context.
      * 
      * @return \HTTP_Request2_Response
      */

WindowsAzure/Common/Internal/ServicesBuilder.php

@@ -285,12 +285,12 @@ private function _buildServiceBus($config)
      */
     private function _buildServiceManagement($config)
     {
-        $certificatePath          = $config->getProperty(
+        $certificatePath = $config->getProperty(
             ServiceManagementSettings::CERTIFICATE_PATH
         );
-        $httpClient               = new HttpClient($certificatePath);
-        $xmlSerializer            = new XmlSerializer();
-        $uri                      = Utilities::tryAddUrlScheme(
+        $httpClient      = new HttpClient($certificatePath);
+        $xmlSerializer   = new XmlSerializer();
+        $uri             = Utilities::tryAddUrlScheme(
             $config->getProperty(ServiceManagementSettings::URI),
             Resources::HTTPS_SCHEME
         );
@@ -332,7 +332,7 @@ private function _buildWrap($config)
      * Creates an object passed $type configured with $config.
      *
      * @param WindowsAzure\Common\Configuration $config The configuration.
-     * @param string                          $type   The type name.
+     * @param string                            $type   The type name.
      * 
      * @return WindowsAzure\Queue\Internal\IQueue
      *       | WindowsAzure\Blob\Internal\IBlob

WindowsAzure/Common/Internal/Utilities.php

@@ -354,7 +354,8 @@ public static function rfc1123ToDateTime($date)
      *
      * @return boolean
      */
-    public static function arrayKeyExistsIgnoreCase($key, array $search) {
+    public static function arrayKeyExistsIgnoreCase($key, array $search)
+    {
         return array_key_exists(strtolower($key), array_change_key_case($search));
     }
 

WindowsAzure/Queue/QueueService.php

@@ -44,8 +44,10 @@ class QueueService
     /**
      * Creates new object based on the builder type in the $config.
      *
-     * @param WindowsAzure\Common\Configuration    $config  The config object.
-     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder object.
+     * @param WindowsAzure\Common\Configuration             $config  The config
+     * object.
+     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder
+     * object.
      * 
      * @return WindowsAzure\Queue\Internal\IQueue
      */

WindowsAzure/ServiceBus/Models/ActiveToken.php

@@ -59,7 +59,6 @@ class ActiveToken
      * access token result.
      *
      * @param array $wrapAccessTokenResult A WRAP access token result.
-     * 
      */
     public function __construct($wrapAccessTokenResult)
     {

WindowsAzure/ServiceBus/ServiceBusService.php

@@ -42,8 +42,10 @@ class ServiceBusService
     /**
      * Creates new object based on the builder type in the $config.
      *
-     * @param WindowsAzure\Common\Configuration    $config  The config object.
-     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder object.
+     * @param WindowsAzure\Common\Configuration             $config  The config 
+     * object.
+     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder
+     * object.
      * 
      * @return WindowsAzure\ServiceBus\Internal\IServiceBus
      */

WindowsAzure/ServiceBus/WrapService.php

@@ -42,8 +42,10 @@ class WrapService
     /**
      * Creates new object based on the builder type in the $config.
      *
-     * @param WindowsAzure\Common\Configuration    $config  The config object.
-     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder object.
+     * @param WindowsAzure\Common\Configuration             $config  The config 
+     * object.
+     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder 
+     * object.
      * 
      * @return WindowsAzure\ServiceBus\Internal\IWrap
      */

WindowsAzure/ServiceManagement/Internal/ServiceManagementRestProxy.php

@@ -141,14 +141,10 @@ private function _getOperationPath($name = null)
     /**
      * Initializes new ServiceManagementRestProxy object.
      * 
-     * @param WindowsAzure\Common\Internal\Http\IHttpClient          $channel        The HTTP
-     * channel.
-     * @param string                                      $subscriptionId The user
-     * subscription id.
-     * @param string                                      $uri            The service
-     * URI.
-     * @param WindowsAzure\Common\Internal\Serialization\ISerializer $dataSerializer The data
-     * serializer.
+     * @param IHttpClient $channel        The HTTP channel.
+     * @param string      $subscriptionId The user subscription id.
+     * @param string      $uri            The service URI.
+     * @param ISerializer $dataSerializer The data serializer.
      */
     public function __construct($channel, $subscriptionId, $uri, $dataSerializer)
     {

WindowsAzure/ServiceManagement/ServiceManagementService.php

@@ -44,8 +44,10 @@ class ServiceManagementService
     /**
      * Creates new object based on the builder type in the $config.
      *
-     * @param WindowsAzure\Common\Configuration    $config  The config object.
-     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder object.
+     * @param WindowsAzure\Common\Configuration             $config  The config 
+     * object.
+     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder 
+     * object.
      * 
      * @return WindowsAzure\ServiceManagement\Internal\IServiceManagement
      */

WindowsAzure/ServiceRuntime/Internal/ChunkedGoalStateDeserializer.php

@@ -76,11 +76,13 @@ public function deserialize()
     {
         do {
             $lengthString = stream_get_line($this->_inputStream, 100, "\n");
-        } while (empty($lengthString) || $lengthString == "\n" || $lengthString == "\r");
+        } while (
+            empty($lengthString) || $lengthString == "\n" || $lengthString == "\r"
+        );
 
         $intLengthString = hexdec(trim($lengthString));
+
         $chunkData = stream_get_contents($this->_inputStream, $intLengthString);
-
         $goalState = $this->_deserializer->deserialize($chunkData);
 
         return $goalState;

WindowsAzure/ServiceRuntime/Internal/FileInputChannel.php

@@ -37,6 +37,8 @@
  */
 class FileInputChannel implements IInputChannel
 {
+    // @codingStandardsIgnoreStart
+
     /**
      * @var Resource
      */
@@ -71,6 +73,8 @@ public function closeInputStream()
             $this->_inputStream = null;
         }
     }
+
+    // @codingStandardsIgnoreEnd
 }
 
 ?>

WindowsAzure/ServiceRuntime/Internal/FileOutputChannel.php

@@ -37,6 +37,8 @@
  */
 class FileOutputChannel implements IOutputChannel
 {
+    // @codingStandardsIgnoreStart
+
     /**
      * Gets the output stream.
      * 
@@ -53,6 +55,8 @@ public function getOutputStream($name)
             throw new ChannelNotAvailableException();
         }
     }
+
+    // @codingStandardsIgnoreEnd
 }
 
 ?>

WindowsAzure/Table/Internal/TableRestProxy.php

@@ -607,16 +607,11 @@ private function _encodeODataUriValue($value)
     /**
      * Initializes new TableRestProxy object.
      * 
-     * @param WindowsAzure\Common\Internal\Http\IHttpClient            $channel        The HTTP
-     * client channel.
-     * @param string                                        $uri            The 
-     * storage account uri.
-     * @param Table\Utilities\IAtomReaderWriter             $atomSerializer The atom 
-     * serializer.
-     * @param Table\Utilities\IMimeReaderWriter             $mimeSerializer The MIME 
-     * serializer.
-     * @param WindowsAzure\Common\Internal\Serialization\ISerializable $dataSerializer The data
-     * serializer.
+     * @param IHttpClient       $channel        The HTTP client channel.
+     * @param string            $uri            The storage account uri.
+     * @param IAtomReaderWriter $atomSerializer The atom serializer.
+     * @param IMimeReaderWriter $mimeSerializer The MIME serializer.
+     * @param ISerializable     $dataSerializer The data serializer.
      */
     public function __construct($channel, $uri, $atomSerializer, $mimeSerializer, 
         $dataSerializer
@@ -994,8 +989,8 @@ public function queryEntities($table, $options = null)
         if (is_null($options)) {
             $options = new QueryEntitiesOptions();
         } else if (is_string($options)) {
-            $queryString  = $options;
-            $options      = new QueryEntitiesOptions();
+            $queryString = $options;
+            $options     = new QueryEntitiesOptions();
             $options->setFilter(Filter::applyQueryString($queryString));
         } else if ($options instanceof Filter) {
             $filter  = $options;

WindowsAzure/Table/Models/BatchError.php

@@ -54,8 +54,10 @@ class BatchError
     /**
      * Creates BatchError object.
      * 
-     * @param WindowsAzure\Common\Internal\ServiceException $error   The error object.
-     * @param array                              $headers The response headers.
+     * @param WindowsAzure\Common\Internal\ServiceException $error   The error 
+     * object.
+     * @param array                                         $headers The response 
+     * headers.
      * 
      * @return \WindowsAzure\Table\Models\BatchError 
      */

WindowsAzure/Table/Models/EdmType.php

@@ -40,6 +40,8 @@
  */
 class EdmType
 {
+    // @codingStandardsIgnoreStart
+
     const DATETIME = 'Edm.DateTime';
     const BINARY   = 'Edm.Binary';
     const BOOLEAN  = 'Edm.Boolean';
@@ -108,10 +110,6 @@ public static function validateEdmValue($type, $value, &$condition = null)
                 $condition = 'is_bool';
                 return is_bool($value);
 
-            case null:
-                $condition = 'is_null';
-                return is_null($value);
-
             default:
                 throw new \InvalidArgumentException();
             }
@@ -271,6 +269,8 @@ public static function isValid($type)
 
         }
     }
+
+    // @codingStandardsIgnoreEnd
 }
 
 ?>

WindowsAzure/Table/TableService.php

@@ -44,8 +44,10 @@ class TableService
     /**
      * Creates new object based on the builder type in the $config.
      *
-     * @param WindowsAzure\Common\Configuration    $config  The config object.
-     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder object.
+     * @param WindowsAzure\Common\Configuration             $config  The config 
+     * object.
+     * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder 
+     * object.
      * 
      * @return WindowsAzure\Table\Internal\ITable
      */