Qeti / POData

src/POData/Common/ODataException.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      * @param string $statusCode The status code
      * @param string $errorCode  The error code
      * 
-     * @return void
+     * @return ODataException
      */
     public function __construct($message, $statusCode, $errorCode= null)
     {

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      * 
      * @return void
      */
-    public function __construct($message, $statusCode, $errorCode= null)
+    public function __construct($message, $statusCode, $errorCode = null)
     {
         $this->_errorCode = $errorCode;
         $this->_statusCode = $statusCode;        

src/POData/HttpProcessUtility.php

Doc Comments +3 added lines, -2 removed lines

@@ -463,7 +463,7 @@ 
      * To check whether the given character is a HTTP token character
      * or not.
      * 
-     * @param char $char The character to inspect.
+     * @param string $char The character to inspect.
      * 
      * @return boolean True if the given character is a valid HTTP token
      *                 character, False otherwise.
@@ -606,6 +606,7 @@ 
      * @param string $text          Text to read qvalue from.
      * @param int    &$textIndex    Index into text where the qvalue starts.
      * @param int    &$qualityValue After the method executes, the normalized qvalue.
+     * @param integer $textIndex
      *
      * @throws HttpHeaderFailure If any error occured while reading and processing
      *                           the quality factor.
@@ -659,7 +660,7 @@ 
     /**
      * Converts the specified character from the ASCII range to a digit.
      * 
-     * @param char $c Character to convert
+     * @param string $c Character to convert
      *
      * @return int The Int32 value for $c, or -1 if it is an element separator.
      *

Indentation +4 added lines, -4 removed lines

@@ -103,7 +103,7 @@ 
                 //the rest look like QSPs..kinda so we can do this
                 parse_str(implode("&", $candidateParts), $candidateParts);
                 if(array_key_exists('odata', $candidateParts)){
-                   $candidateODataValue = $candidateParts['odata'];
+                    $candidateODataValue = $candidateParts['odata'];
                 }
             }
 
@@ -697,7 +697,7 @@ 
     }
 
 
-	public static function headerToServerKey($headerName){
-		return 'HTTP_' . strtoupper(str_replace('-', '_', $headerName));
-	}
+    public static function headerToServerKey($headerName){
+        return 'HTTP_' . strtoupper(str_replace('-', '_', $headerName));
+    }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
      */
     public function getMimeType()
     {
-        return $this->_type . '/' . $this->_subType;
+        return $this->_type.'/'.$this->_subType;
     }
 
     /**
@@ -97,18 +97,18 @@ 
             //get the odata parameter (if there is one)
             $candidateODataValue = null;
             $candidateParts = explode(';', $candidate);
-            if(count($candidateParts) > 1){
+            if (count($candidateParts) > 1) {
                 //is it safe to assume the mime type is always the first part?
                 $candidate = array_shift($candidateParts); //move off the first type matcher
                 //the rest look like QSPs..kinda so we can do this
                 parse_str(implode("&", $candidateParts), $candidateParts);
-                if(array_key_exists('odata', $candidateParts)){
+                if (array_key_exists('odata', $candidateParts)) {
                    $candidateODataValue = $candidateParts['odata'];
                 }
             }
 
             //ensure that the odata parameter values match
-            if($this->getODataValue() !== $candidateODataValue){
+            if ($this->getODataValue() !== $candidateODataValue) {
                 return -1;
             }
 
@@ -697,7 +697,7 @@ 
     }
 
 
-	public static function headerToServerKey($headerName){
-		return 'HTTP_' . strtoupper(str_replace('-', '_', $headerName));
+	public static function headerToServerKey($headerName) {
+		return 'HTTP_'.strtoupper(str_replace('-', '_', $headerName));
 	}
 }
\ No newline at end of file

src/POData/ObjectModel/ObjectModelSerializer.php

Doc Comments +1 added lines, -1 removed lines

@@ -376,7 +376,7 @@
      *                                                    NULL for complex object.
      * @param string               $relativeUri           Relative uri for the given 
      *                                                    custom object.
-     * @param ODataEntry           &$odataEntry           ODataEntry instance to 
+     * @param ODataEntry           ODataEntry|null           ODataEntry instance to 
      *                                                    place links and
      *                                                    expansion of the 
      *                                                    entry object, 

Indentation +34 added lines, -34 removed lines

@@ -66,7 +66,7 @@ 
         $needPop = $this->pushSegmentForRoot();
         $entry = $this->_writeEntryElement(
             $entryObject,
-	        $resourceType,
+            $resourceType,
             $this->request->getRequestUrl()->getUrlAsString(),
             $this->request->getContainerName()
         );
@@ -189,18 +189,18 @@ 
      * @return ODataPropertyContent
      */
     public function writeTopLevelComplexObject(
-	    &$complexValue,
+        &$complexValue,
         $propertyName,
         ResourceType &$resourceType
     ) {
-	    $propertyContent = new ODataPropertyContent();
+        $propertyContent = new ODataPropertyContent();
         $this->_writeComplexValue(
             $complexValue,
             $propertyName, $resourceType, null,
-	        $propertyContent
+            $propertyContent
         );
 
-	    return $propertyContent;
+        return $propertyContent;
     }
 
     /**
@@ -216,19 +216,19 @@ 
      * @return ODataPropertyContent
      */
     public function writeTopLevelBagObject(
-	    &$BagValue,
+        &$BagValue,
         $propertyName,
         ResourceType &$resourceType
     ) {
 
-	    $propertyContent = new ODataPropertyContent();
+        $propertyContent = new ODataPropertyContent();
         $this->_writeBagValue(
             $BagValue,
             $propertyName, $resourceType, null,
-	        $propertyContent
+            $propertyContent
         );
 
-	    return $propertyContent;
+        return $propertyContent;
     }
 
     /**
@@ -244,18 +244,18 @@ 
      * @return ODataPropertyContent
      */
     public function writeTopLevelPrimitive(
-	    &$primitiveValue,
+        &$primitiveValue,
         ResourceProperty &$resourceProperty
     ) {
-	    $propertyContent = new ODataPropertyContent();
-	    $propertyContent->properties[] = new ODataProperty();
+        $propertyContent = new ODataPropertyContent();
+        $propertyContent->properties[] = new ODataProperty();
         $this->_writePrimitiveValue(
             $primitiveValue, 
             $resourceProperty,
-	        $propertyContent->properties[0]
+            $propertyContent->properties[0]
         );
 
-	    return $propertyContent;
+        return $propertyContent;
     }
 
     /**
@@ -274,8 +274,8 @@ 
         $absoluteUri,
         $relativeUri
     ) {
-	    $entry = new ODataEntry();
-	    $entry->resourceSetName = $this->getCurrentResourceSetWrapper()->getName();
+        $entry = new ODataEntry();
+        $entry->resourceSetName = $this->getCurrentResourceSetWrapper()->getName();
 
         if (is_null($entryObject)) {
             //According to atom standard an empty entry must have an Author
@@ -296,27 +296,27 @@ 
                 $actualResourceType,
                 $title,
                 $relativeUri,
-	            $entry
+                $entry
             );
 
-	        $entry->id = $absoluteUri;
-	        $entry->eTag = $this->getETagForEntry($entryObject, $resourceType);
-	        $entry->title = $title;
-	        $entry->editLink = $relativeUri;
-	        $entry->type = $actualResourceType->getFullName();
+            $entry->id = $absoluteUri;
+            $entry->eTag = $this->getETagForEntry($entryObject, $resourceType);
+            $entry->title = $title;
+            $entry->editLink = $relativeUri;
+            $entry->type = $actualResourceType->getFullName();
             $odataPropertyContent = new ODataPropertyContent();
             $this->_writeObjectProperties(
                 $entryObject, 
                 $actualResourceType,
                 $absoluteUri,
                 $relativeUri,
-	            $entry,
+                $entry,
                 $odataPropertyContent
             );
-	        $entry->propertyContent = $odataPropertyContent;
+            $entry->propertyContent = $odataPropertyContent;
         }
 
-	    return $entry;
+        return $entry;
     }
 
     /**
@@ -388,7 +388,7 @@ 
      * @return void
      */
     private function _writeObjectProperties(
-	    $customObject,
+        $customObject,
         ResourceType &$resourceType, 
         $absoluteUri, 
         $relativeUri, 
@@ -486,12 +486,12 @@ 
                     ) {
                         continue;  
                     } else {
-                         $this->assert(
-                             ($resourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE)
+                            $this->assert(
+                                ($resourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE)
                              || ($resourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE), 
-                             '($resourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE)
+                                '($resourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE)
                              || ($resourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE)'
-                         );
+                            );
 
                         $navigationProperties[$i] = new NavigationPropertyInfo($resourceProperty, $this->shouldExpandSegment($resourceProperty->getName()));
                         if ($navigationProperties[$i]->expanded) {
@@ -611,10 +611,10 @@ 
                             $currentResourceType1 = $currentResourceSetWrapper->getResourceType();
 
                             $link->expandedResult = $this->_writeEntryElement(
-	                            $navigationPropertyInfo->value,
-	                            $currentResourceType1,
-	                            $propertyAbsoluteUri,
-	                            $propertyRelativeUri
+                                $navigationPropertyInfo->value,
+                                $currentResourceType1,
+                                $propertyAbsoluteUri,
+                                $propertyRelativeUri
                             );
                         }
                     } else {

Spacing +30 added lines, -31 removed lines

@@ -140,7 +140,7 @@ 
                 $this->getCurrentResourceSetWrapper()->getName()
             );
             
-            $url->url = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+            $url->url = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
         }
 
         return $url;
@@ -191,7 +191,7 @@ 
     public function writeTopLevelComplexObject(
 	    &$complexValue,
         $propertyName,
-        ResourceType &$resourceType
+        ResourceType & $resourceType
     ) {
 	    $propertyContent = new ODataPropertyContent();
         $this->_writeComplexValue(
@@ -218,7 +218,7 @@ 
     public function writeTopLevelBagObject(
 	    &$BagValue,
         $propertyName,
-        ResourceType &$resourceType
+        ResourceType & $resourceType
     ) {
 
 	    $propertyContent = new ODataPropertyContent();
@@ -245,7 +245,7 @@ 
      */
     public function writeTopLevelPrimitive(
 	    &$primitiveValue,
-        ResourceProperty &$resourceProperty
+        ResourceProperty & $resourceProperty
     ) {
 	    $propertyContent = new ODataPropertyContent();
 	    $propertyContent->properties[] = new ODataProperty();
@@ -287,7 +287,7 @@ 
                 $this->getCurrentResourceSetWrapper()->getName()
             );
 
-            $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+            $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
             $title = $resourceType->getName();
             //TODO Resolve actual resource type
             $actualResourceType = $resourceType;
@@ -334,18 +334,18 @@ 
      */
     private function _writeFeedElements(
         &$entryObjects,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $title,
         $absoluteUri,
         $relativeUri,
-        ODataFeed &$feed
+        ODataFeed & $feed
     ) {
         $this->assert(is_array($entryObjects), '_writeFeedElements::is_array($entryObjects)');
         $feed->id = $absoluteUri;
         $feed->title = $title;
         $feed->selfLink = new ODataLink();
         $feed->selfLink->name = ODataConstants::ATOM_SELF_RELATION_ATTRIBUTE_VALUE;
-        $feed->selfLink->title =  $title;
+        $feed->selfLink->title = $title;
         $feed->selfLink->url = $relativeUri;
         
         if (empty($entryObjects)) {
@@ -389,11 +389,11 @@ 
      */
     private function _writeObjectProperties(
 	    $customObject,
-        ResourceType &$resourceType, 
+        ResourceType & $resourceType, 
         $absoluteUri, 
         $relativeUri, 
         &$odataEntry, 
-        ODataPropertyContent &$odataPropertyContent
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $resourceTypeKind = $resourceType->getResourceTypeKind();
         if (is_null($absoluteUri) == ($resourceTypeKind == ResourceTypeKind::ENTITY)
@@ -464,7 +464,7 @@ 
                         $propertyValue,
                         $resourceProperty->getName(),
                         $resourceType2,
-                        $relativeUri . '/' . $resourceProperty->getName(),
+                        $relativeUri.'/'.$resourceProperty->getName(),
                         $odataPropertyContent
                     );
                 } else {
@@ -476,7 +476,7 @@ 
                             $propertyValue,
                             $resourceProperty->getName(),
                             $resourceType1,
-                            $relativeUri . '/' . $resourceProperty->getName(),
+                            $relativeUri.'/'.$resourceProperty->getName(),
                             $odataPropertyContent
                         );
                     } else if ($resourceProperty->getKind() == ResourcePropertyKind::PRIMITIVE 
@@ -541,7 +541,7 @@ 
                         $propertyValue,
                         $propertyName,
                         $bagResourceType,
-                        $relativeUri . '/' . $propertyName,
+                        $relativeUri.'/'.$propertyName,
                         $odataPropertyContent
                     );
                 } else if (ResourceProperty::sIsKindOf($propertyTypeKind, ResourcePropertyKind::PRIMITIVE)) {
@@ -554,7 +554,7 @@ 
                         $propertyValue,
                         $propertyName,
                         $complexResourceType,
-                        $relativeUri . '/' . $propertyName,
+                        $relativeUri.'/'.$propertyName,
                         $odataPropertyContent
                     );
                 } else {
@@ -569,17 +569,16 @@ 
             foreach ($navigationProperties as $navigationPropertyInfo) {
                 $propertyName = $navigationPropertyInfo->resourceProperty->getName();
                 $type = $navigationPropertyInfo->resourceProperty->getKind() == ResourcePropertyKind::RESOURCE_REFERENCE ? 
-                    'application/atom+xml;type=entry':
-                    'application/atom+xml;type=feed';
+                    'application/atom+xml;type=entry' : 'application/atom+xml;type=feed';
                 $link = new ODataLink();
-                $link->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propertyName; 
+                $link->name = ODataConstants::ODATA_RELATED_NAMESPACE.$propertyName; 
                 $link->title = $propertyName;
                 $link->type = $type;
-                $link->url = $relativeUri . '/' . $propertyName;
+                $link->url = $relativeUri.'/'.$propertyName;
 
                 if ($navigationPropertyInfo->expanded) {
-                    $propertyRelativeUri = $relativeUri . '/' . $propertyName;
-                    $propertyAbsoluteUri = trim($absoluteUri, '/') . '/' . $propertyName;
+                    $propertyRelativeUri = $relativeUri.'/'.$propertyName;
+                    $propertyAbsoluteUri = trim($absoluteUri, '/').'/'.$propertyName;
                     $needPop = $this->pushSegmentForNavigationProperty($navigationPropertyInfo->resourceProperty);
                     $navigationPropertyKind = $navigationPropertyInfo->resourceProperty->getKind();
                     $this->assert(
@@ -645,7 +644,7 @@ 
      * @return void
      */
     private function _writePrimitiveValue(&$primitiveValue, 
-        ResourceProperty &$resourceProperty, ODataProperty &$odataProperty
+        ResourceProperty & $resourceProperty, ODataProperty & $odataProperty
     ) {
         if (is_object($primitiveValue)) {
             //TODO ERROR: The property 'PropertyName' 
@@ -684,8 +683,8 @@ 
      * @return void
      */
     private function _writeComplexValue(&$complexValue,
-        $propertyName, ResourceType &$resourceType, $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        $propertyName, ResourceType & $resourceType, $relativeUri,
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $odataProperty = new ODataProperty();
         $odataProperty->name = $propertyName;
@@ -724,8 +723,8 @@ 
      * @return void
      */
     private function _writeBagValue(&$BagValue,
-        $propertyName, ResourceType &$resourceType, $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        $propertyName, ResourceType & $resourceType, $relativeUri,
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $bagItemResourceTypeKind = $resourceType->getResourceTypeKind();
         $this->assert(
@@ -737,7 +736,7 @@ 
 
         $odataProperty = new ODataProperty();
         $odataProperty->name = $propertyName;
-        $odataProperty->typeName = 'Collection(' . $resourceType->getFullName() .')';
+        $odataProperty->typeName = 'Collection('.$resourceType->getFullName().')';
         if (is_null($BagValue) || (is_array($BagValue) && empty ($BagValue))) {
             $odataProperty->value = null;
         } else {
@@ -784,10 +783,10 @@ 
      */
     private function _writeMediaResourceMetadata(
         $entryObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $title,
         $relativeUri,
-        ODataEntry &$odataEntry
+        ODataEntry & $odataEntry
     ) {
         if ($resourceType->isMediaLinkEntry()) {
             $odataEntry->isMediaLinkEntry = true;
@@ -833,7 +832,7 @@ 
      *                                            
      * @return void
      */
-    private function _primitiveToString(ResourceType &$primtiveResourceType,
+    private function _primitiveToString(ResourceType & $primtiveResourceType,
         $primitiveValue, &$stringValue
     ) {
         $type = $primtiveResourceType->getInstanceType();
@@ -868,8 +867,8 @@ 
      * @return void
      */
     private function _complexObjectToContent(&$complexValue,
-        $propertyName, ResourceType &$resourceType, $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        $propertyName, ResourceType & $resourceType, $relativeUri,
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $count = count($this->complexTypeInstanceCollection);
         for ($i = 0; $i < $count; $i++) {

Unused Use Statements -2 removed lines

@@ -12,10 +12,8 @@
 use POData\Providers\Metadata\ResourceTypeKind;
 use POData\Providers\Metadata\ResourcePropertyKind;
 use POData\Providers\Metadata\ResourceProperty;
-use POData\Providers\ProvidersWrapper;
 use POData\Providers\Metadata\Type\Binary;
 use POData\Providers\Metadata\Type\Boolean;
-use POData\Providers\Metadata\Type\StringType;
 use POData\Providers\Metadata\Type\DateTime;
 use POData\Common\ODataException;
 use POData\Common\Messages;

src/POData/ObjectModel/ObjectModelSerializerBase.php

Doc Comments +3 added lines, -1 removed lines

@@ -419,7 +419,7 @@ 
      *                            used for generating $skiptoken.
      * @param string $absoluteUri Absolute response URI.
      * 
-     * @return URI for the link for next page.
+     * @return ODataLink for the link for next page.
      */
     protected function getNextLinkUri(&$lastObject, $absoluteUri)
     {
@@ -632,6 +632,8 @@ 
      *                                                        true if any expansion
      *                                                        defined under this node
      *                                                        false otherwise.
+     * @param boolean $foundSelections
+     * @param boolean $foundExpansions
      *
      * @return void
      */

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 
 use POData\Common\ODataConstants;
 use POData\IService;
-use POData\Providers\ProvidersWrapper;
 use POData\Providers\Metadata\ResourceSetWrapper;
 use POData\Providers\Metadata\ResourceProperty;
 use POData\Providers\Metadata\ResourceTypeKind;

Indentation +4 added lines, -4 removed lines

@@ -159,9 +159,9 @@ 
     protected function getPropertyValue($entity, ResourceType $resourceType, ResourceProperty $resourceProperty)
     {
         try {
-	        //Is this slow?  See #88
-			$reflectionProperty = new \ReflectionProperty($entity, $resourceProperty->getName());
-	        return $reflectionProperty->getValue($entity);
+            //Is this slow?  See #88
+            $reflectionProperty = new \ReflectionProperty($entity, $resourceProperty->getName());
+            return $reflectionProperty->getValue($entity);
         } catch (\ReflectionException $reflectionException) {
             throw ODataException::createInternalServerError(
                 Messages::objectModelSerializerFailedToAccessProperty(
@@ -558,7 +558,7 @@ 
             //presence of $top option affect next link for root container
             $topValueCount = $this->request->getTopOptionCount();
             if (!is_null($topValueCount) && ($topValueCount <= $pageSize)) {
-                 return false;
+                    return false;
             }            
         }
 

Spacing +19 added lines, -19 removed lines

@@ -96,7 +96,7 @@ 
         $this->service = $service;
         $this->request = $request;
         $this->absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri()->getUrlAsString();
-        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/') . '/';
+        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/').'/';
         $this->_segmentNames = array();
         $this->_segmentResourceSetWrappers = array();
         $this->_segmentResultCounts = array();
@@ -124,7 +124,7 @@ 
     {
         $keyProperties = $resourceType->getKeyProperties();
         $this->assert(count($keyProperties) != 0, 'count($keyProperties) != 0');
-        $keyString = $containerName . '(';
+        $keyString = $containerName.'(';
         $comma = null;
         foreach ($keyProperties as $keyName => $resourceProperty) {
             $keyType = $resourceProperty->getInstanceType();            
@@ -136,7 +136,7 @@ 
             }
             
             $keyValue = $keyType->convertToOData($keyValue);
-            $keyString .= $comma . $keyName.'='.$keyValue;
+            $keyString .= $comma.$keyName.'='.$keyValue;
             $comma = ',';
         }
 
@@ -222,9 +222,9 @@ 
             );
             $value = $this->getPropertyValue($entryObject, $resourceType, $eTagProperty);
             if (is_null($value)) {
-                $eTag = $eTag . $comma. 'null';
+                $eTag = $eTag.$comma.'null';
             } else {
-                $eTag = $eTag . $comma . $type->convertToOData($value);
+                $eTag = $eTag.$comma.$type->convertToOData($value);
             }
 
             $comma = ',';
@@ -235,7 +235,7 @@ 
             // IType::converToOData will perform utf8 and url encode. But we don't
             // want this for eTag value.
             $eTag = urldecode(utf8_decode($eTag));
-            return ODataConstants::HTTP_WEAK_ETAG_PREFIX . rtrim($eTag, ',') . '"';
+            return ODataConstants::HTTP_WEAK_ETAG_PREFIX.rtrim($eTag, ',').'"';
         }
 
         return null;
@@ -270,7 +270,7 @@ 
      * @throws InvalidOperationException If this function invoked with non-navigation
      *                                   property instance.
      */
-    protected function pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty)
+    protected function pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty)
     {
         if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY) {
             $this->assert(!empty($this->_segmentNames), '!is_empty($this->_segmentNames');
@@ -383,7 +383,7 @@ 
      * 
      * @return bool true if the segment was push, false otherwise
      */
-    private function _pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
+    private function _pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
     {
         $rootProjectionNode = $this->request->getRootProjectionNode();
         // Even though there is no expand in the request URI, still we need to push
@@ -434,10 +434,10 @@ 
             $queryParameterString = $this->getNextPageLinkQueryParametersForExpandedResourceSet();
         }
 
-        $queryParameterString .= '$skiptoken=' . $skipToken;        
+        $queryParameterString .= '$skiptoken='.$skipToken;        
         $odalaLink = new ODataLink();
         $odalaLink->name = ODataConstants::ATOM_LINK_NEXT_ATTRIBUTE_STRING;
-        $odalaLink->url = rtrim($absoluteUri, '/') . '?' . $queryParameterString;
+        $odalaLink->url = rtrim($absoluteUri, '/').'?'.$queryParameterString;
         return $odalaLink;
     }
 
@@ -462,21 +462,21 @@ 
             $value = $this->service->getHost()->getQueryStringItem($queryOption);
             if (!is_null($value)) {
                 if (!is_null($queryParameterString)) {
-                    $queryParameterString = $queryParameterString . '&';
+                    $queryParameterString = $queryParameterString.'&';
                 }
 
-                $queryParameterString .= $queryOption . '=' . $value;
+                $queryParameterString .= $queryOption.'='.$value;
             }            
         }
 
         $topCountValue = $this->request->getTopOptionCount();
         if (!is_null($topCountValue)) {
-            $remainingCount  = $topCountValue - $this->request->getTopCount();
+            $remainingCount = $topCountValue - $this->request->getTopCount();
             if (!is_null($queryParameterString)) {
                 $queryParameterString .= '&';
             }
 
-            $queryParameterString .= ODataConstants::HTTPQUERY_STRING_TOP . '=' . $remainingCount;
+            $queryParameterString .= ODataConstants::HTTPQUERY_STRING_TOP.'='.$remainingCount;
         }
 
         if (!is_null($queryParameterString)) {
@@ -519,7 +519,7 @@ 
             }
 
             if (!is_null($selectionPaths)) {
-                $queryParameterString = '$select=' . $selectionPaths;
+                $queryParameterString = '$select='.$selectionPaths;
             }
 
             if (!is_null($expansionPaths)) {
@@ -527,7 +527,7 @@ 
                     $queryParameterString .= '&';
                 }
 
-                $queryParameterString = '$expand=' . $expansionPaths;
+                $queryParameterString = '$expand='.$expansionPaths;
             }
 
             if (!is_null($queryParameterString)) {
@@ -637,7 +637,7 @@ 
      */
     private function _buildSelectionAndExpansionPathsForNode(&$parentPathSegments, 
         &$selectionPaths, &$expansionPaths, 
-        ExpandedProjectionNode &$expandedProjectionNode, 
+        ExpandedProjectionNode & $expandedProjectionNode, 
         &$foundSelections, &$foundExpansions
     ) {
         $foundSelections = false;
@@ -668,7 +668,7 @@ 
                         $this->_appendSelectionOrExpandPath(
                             $selectionPaths, 
                             $parentPathSegments, 
-                            $childNode->getPropertyName() . '/*'
+                            $childNode->getPropertyName().'/*'
                         );
                     } else {
                         $expandedChildrenNeededToBeSelected[] = $childNode;
@@ -714,7 +714,7 @@ 
         }
 
         foreach ($parentPathSegments as $parentPathSegment) {
-            $path .= $parentPathSegment . '/';
+            $path .= $parentPathSegment.'/';
         }
 
         $path .= $segmentToAppend;

src/POData/OperationContext/ServiceHost.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use POData\Common\Url;
 use POData\Common\UrlFormatException;
 use POData\Common\ODataException;
-use POData\Common\InvalidOperationException;
 use POData\OperationContext\Web\WebOperationContext;
 use POData\OperationContext\IOperationContext;
 use POData\Common\Version;

Indentation +39 added lines, -39 removed lines

@@ -80,16 +80,16 @@ 
         return $this->_operationContext;
     }
 
-	/**
-	 * @param IOperationContext $context the OperationContext implementation to use.  If null the WebOperationContext
-	 * will be used.  Defaults to null.
-	 */
-	public function __construct(IOperationContext $context = null)
+    /**
+     * @param IOperationContext $context the OperationContext implementation to use.  If null the WebOperationContext
+     * will be used.  Defaults to null.
+     */
+    public function __construct(IOperationContext $context = null)
     {
         if(is_null($context)){
-	        $this->_operationContext = new WebOperationContext();
+            $this->_operationContext = new WebOperationContext();
         } else {
-	        $this->_operationContext = $context;
+            $this->_operationContext = $context;
         }
 
         // getAbsoluteRequestUri can throw UrlFormatException 
@@ -99,13 +99,13 @@ 
     }
 
     /**
-      * Gets the absolute request Uri as Url instance
-      * Note: This method will be called first time from constructor.
-      * 
-      * @throws ODataException if AbsoluteRequestUri is not a valid URI
-      * 
-      * @return Url
-      */
+     * Gets the absolute request Uri as Url instance
+     * Note: This method will be called first time from constructor.
+     * 
+     * @throws ODataException if AbsoluteRequestUri is not a valid URI
+     * 
+     * @return Url
+     */
     public function getAbsoluteRequestUri()
     {
         if (is_null($this->_absoluteRequestUri)) {
@@ -114,7 +114,7 @@ 
             try {
                 new Url($this->_absoluteRequestUriAsString);
             } catch (UrlFormatException $exception) {
-				throw ODataException::createBadRequestError($exception->getMessage());
+                throw ODataException::createBadRequestError($exception->getMessage());
             }
 
             $queryStartIndex = strpos($this->_absoluteRequestUriAsString, '?');
@@ -194,7 +194,7 @@ 
                 $j = count($segments) - 1;
                 $k = $i;
                 if ($j > $i) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::hostRequestUriIsNotBasedOnRelativeUriInConfig(
                             $this->_absoluteRequestUriAsString,
                             $serviceUri
@@ -207,7 +207,7 @@ 
                 }
 
                 if ($j != -1) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::hostRequestUriIsNotBasedOnRelativeUriInConfig(
                             $this->_absoluteRequestUriAsString,
                             $serviceUri
@@ -280,13 +280,13 @@ 
                 if (!empty($optionValue)) {
                     if ($optionValue[0] == '$') {
                         if ($this->_isODataQueryOption($optionValue)) {
-							throw ODataException::createBadRequestError(
+                            throw ODataException::createBadRequestError(
                                 Messages::hostODataQueryOptionFoundWithoutValue(
                                     $optionValue
                                 )
                             );
                         } else {
-							throw ODataException::createBadRequestError(
+                            throw ODataException::createBadRequestError(
                                 Messages::hostNonODataOptionBeginsWithSystemCharacter(
                                     $optionValue
                                 )
@@ -297,7 +297,7 @@ 
             } else {
                 if ($optionName[0] == '$') {
                     if (!$this->_isODataQueryOption($optionName)) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::hostNonODataOptionBeginsWithSystemCharacter(
                                 $optionName
                             )
@@ -305,7 +305,7 @@ 
                     }
 
                     if (array_search($optionName, $namesFound) !== false) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::hostODataQueryOptionCannotBeSpecifiedMoreThanOnce(
                                 $optionName
                             )
@@ -313,7 +313,7 @@ 
                     }
                     
                     if (empty($optionValue) && $optionValue !== '0') {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::hostODataQueryOptionFoundWithoutValue(
                                 $optionName
                             )
@@ -629,29 +629,29 @@ 
             ->outgoingResponse()->addHeader($headerName, $headerValue);
     }
 
-	/**
-	 * Translates the short $format forms into the full mime type forms
-	 * @param Version $responseVersion the version scheme to interpret the short form with
-	 * @param string $format the short $format form
-	 * @return string the full mime type corresponding to the short format form for the given version
-	 */
-	public static function translateFormatToMime(Version $responseVersion, $format){
+    /**
+     * Translates the short $format forms into the full mime type forms
+     * @param Version $responseVersion the version scheme to interpret the short form with
+     * @param string $format the short $format form
+     * @return string the full mime type corresponding to the short format form for the given version
+     */
+    public static function translateFormatToMime(Version $responseVersion, $format){
         //TODO: should the version switches be off of the requestVersion, not the response version? see #91
 
         switch($format) {
 
-	        case ODataConstants::FORMAT_XML:
-		        $format = MimeTypes::MIME_APPLICATION_XML;
-		        break;
+            case ODataConstants::FORMAT_XML:
+                $format = MimeTypes::MIME_APPLICATION_XML;
+                break;
 
             case ODataConstants::FORMAT_ATOM:
-	            $format = MimeTypes::MIME_APPLICATION_ATOM ;
-		        break;
+                $format = MimeTypes::MIME_APPLICATION_ATOM ;
+                break;
 
             case ODataConstants::FORMAT_VERBOSE_JSON:
                 if($responseVersion == Version::v3()){
-	                //only translatable in 3.0 systems
-	                $format = MimeTypes::MIME_APPLICATION_JSON_VERBOSE;
+                    //only translatable in 3.0 systems
+                    $format = MimeTypes::MIME_APPLICATION_JSON_VERBOSE;
                 }
                 break;
 
@@ -659,13 +659,13 @@ 
                 if($responseVersion == Version::v3()){
                     $format = MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META;
                 } else{
-	                $format = MimeTypes::MIME_APPLICATION_JSON;
+                    $format = MimeTypes::MIME_APPLICATION_JSON;
                 }
-		        break;
+                break;
 
         }
 
-	    return $format . ';q=1.0';
+        return $format . ';q=1.0';
     }
 
 

Spacing +15 added lines, -15 removed lines

@@ -86,7 +86,7 @@ 
 	 */
 	public function __construct(IOperationContext $context = null)
     {
-        if(is_null($context)){
+        if (is_null($context)) {
 	        $this->_operationContext = new WebOperationContext();
         } else {
 	        $this->_operationContext = $context;
@@ -162,7 +162,7 @@ 
             $isAbsoluteServiceUri = (strpos($serviceUri, 'http://') === 0)
                 || (strpos($serviceUri, 'https://') === 0);
             try {
-                $this->_absoluteServiceUri = new Url($serviceUri, $isAbsoluteServiceUri );
+                $this->_absoluteServiceUri = new Url($serviceUri, $isAbsoluteServiceUri);
             } catch (UrlFormatException $exception) {
                 throw ODataException::createInternalServerError(Messages::hostMalFormedBaseUriInConfig());
             }
@@ -184,7 +184,7 @@ 
                 // Find index of segment in the request uri that end with .svc
                 // There will be always a .svc segment in the request uri otherwise
                 // uri redirection will not happen.
-                for (; $i >=0; $i--) {
+                for (; $i >= 0; $i--) {
                     $endsWithSvc = (substr_compare($requestUriSegments[$i], '.svc', -strlen('.svc'), strlen('.svc')) === 0);
                     if ($endsWithSvc) {
                         break;
@@ -222,7 +222,7 @@ 
                     . $this->_absoluteRequestUri->getPort();
 
                 for ($l = 0; $l <= $k; $l++) {
-                    $serviceUri .= '/' . $requestUriSegments[$l];
+                    $serviceUri .= '/'.$requestUriSegments[$l];
                 }
                 
                 $this->_absoluteServiceUri = new Url($serviceUri);
@@ -552,18 +552,18 @@ 
      */
     public function setResponseStatusCode($value)
     {
-        $floor = floor($value / 100);
+        $floor = floor($value/100);
         if ($floor >= 1 && $floor <= 5) {
             $statusDescription = HttpStatus::getStatusDescription($value);
             if (!is_null($statusDescription)) {
-                $statusDescription = ' ' . $statusDescription;
+                $statusDescription = ' '.$statusDescription;
             }
 
             $this->_operationContext
-                ->outgoingResponse()->setStatusCode($value . $statusDescription);
+                ->outgoingResponse()->setStatusCode($value.$statusDescription);
         } else {
             throw ODataException::createInternalServerError(
-                'Invalid Status Code' . $value
+                'Invalid Status Code'.$value
             );
         }
     }
@@ -635,37 +635,37 @@ 
 	 * @param string $format the short $format form
 	 * @return string the full mime type corresponding to the short format form for the given version
 	 */
-	public static function translateFormatToMime(Version $responseVersion, $format){
+	public static function translateFormatToMime(Version $responseVersion, $format) {
         //TODO: should the version switches be off of the requestVersion, not the response version? see #91
 
-        switch($format) {
+        switch ($format) {
 
 	        case ODataConstants::FORMAT_XML:
 		        $format = MimeTypes::MIME_APPLICATION_XML;
 		        break;
 
             case ODataConstants::FORMAT_ATOM:
-	            $format = MimeTypes::MIME_APPLICATION_ATOM ;
+	            $format = MimeTypes::MIME_APPLICATION_ATOM;
 		        break;
 
             case ODataConstants::FORMAT_VERBOSE_JSON:
-                if($responseVersion == Version::v3()){
+                if ($responseVersion == Version::v3()) {
 	                //only translatable in 3.0 systems
 	                $format = MimeTypes::MIME_APPLICATION_JSON_VERBOSE;
                 }
                 break;
 
             case ODataConstants::FORMAT_JSON:
-                if($responseVersion == Version::v3()){
+                if ($responseVersion == Version::v3()) {
                     $format = MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META;
-                } else{
+                } else {
 	                $format = MimeTypes::MIME_APPLICATION_JSON;
                 }
 		        break;
 
         }
 
-	    return $format . ';q=1.0';
+	    return $format.';q=1.0';
     }
 
 

src/POData/OperationContext/Web/IncomingRequest.php

Unused Use Statements -2 removed lines

@@ -2,9 +2,7 @@
 
 namespace POData\OperationContext\Web;
 
-use POData\Common\ODataException;
 use POData\Common\ODataConstants;
-use POData\Common\Url;
 use POData\HttpProcessUtility;
 use POData\OperationContext\HTTPRequestMethod;
 use POData\OperationContext\IHTTPRequest;

Indentation +3 added lines, -3 removed lines

@@ -152,10 +152,10 @@
      */
     public function getRequestHeader($key)
     {
-	    //PHP normalizes header keys
-	    $trimmedKey = HttpProcessUtility::headerToServerKey(trim($key));
+        //PHP normalizes header keys
+        $trimmedKey = HttpProcessUtility::headerToServerKey(trim($key));
 
-	    if (array_key_exists($trimmedKey, $this->_headers)) {
+        if (array_key_exists($trimmedKey, $this->_headers)) {
             return $this->_headers[$trimmedKey];
         }
 

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      * 
      * @var string
      */
-    private $_rawUrl  = null;
+    private $_rawUrl = null;
     
 
     /**
@@ -195,7 +195,7 @@ 
                     $isNamedOptions = count($result) == 2;
                     if ($isNamedOptions) {
                         $this->_queryOptions[]
-                            = array (rawurldecode($result[0]) => trim(rawurldecode($result[1])));
+                            = array(rawurldecode($result[0]) => trim(rawurldecode($result[1])));
                     } else {
                         $this->_queryOptions[]
                             = array(null => trim(rawurldecode($result[0])));

src/POData/OperationContext/Web/OutgoingResponse.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace POData\OperationContext\Web;
 
 use POData\Common\ODataConstants;
-use POData\Common\ODataException;
 
 
 /**

src/POData/Providers/Expression/PHPExpressionProvider.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use POData\Providers\Metadata\ResourceType;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\ExpressionType;
 use POData\Providers\Metadata\Type\IType;
-use POData\Common\NotImplementedException;
 use POData\Common\ODataConstants;
 use POData\UriProcessor\QueryProcessor\FunctionDescription;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\PropertyAccessExpression;

Indentation +93 added lines, -93 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function setResourceType(ResourceType $resourceType)
     {
-    	$this->_resourceType = $resourceType;
+        $this->_resourceType = $resourceType;
     }
 
     /**
@@ -95,14 +95,14 @@ 
     public function onLogicalExpression($expressionType, $left, $right)
     {
         switch($expressionType) {
-	        case ExpressionType::AND_LOGICAL:
-	            return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
+            case ExpressionType::AND_LOGICAL:
+                return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
 
-	        case ExpressionType::OR_LOGICAL:
-	            return $this->_prepareBinaryExpression(self::LOGICAL_OR, $left, $right);
+            case ExpressionType::OR_LOGICAL:
+                return $this->_prepareBinaryExpression(self::LOGICAL_OR, $left, $right);
 
-	        default:
-	            throw new \InvalidArgumentException('onLogicalExpression');
+            default:
+                throw new \InvalidArgumentException('onLogicalExpression');
         }
     }
 
@@ -118,23 +118,23 @@ 
     public function onArithmeticExpression($expressionType, $left, $right)
     {
         switch($expressionType) {
-	        case ExpressionType::MULTIPLY:
-	            return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
+            case ExpressionType::MULTIPLY:
+                return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
 
-	        case ExpressionType::DIVIDE:
-	            return $this->_prepareBinaryExpression(self::DIVIDE, $left, $right);
+            case ExpressionType::DIVIDE:
+                return $this->_prepareBinaryExpression(self::DIVIDE, $left, $right);
 
-	        case ExpressionType::MODULO:
-	            return $this->_prepareBinaryExpression(self::MODULO, $left, $right);
+            case ExpressionType::MODULO:
+                return $this->_prepareBinaryExpression(self::MODULO, $left, $right);
 
-	        case ExpressionType::ADD:
-	            return $this->_prepareBinaryExpression(self::ADD, $left, $right);
+            case ExpressionType::ADD:
+                return $this->_prepareBinaryExpression(self::ADD, $left, $right);
 
-	        case ExpressionType::SUBTRACT:
-	            return $this->_prepareBinaryExpression(self::SUBTRACT, $left, $right);
+            case ExpressionType::SUBTRACT:
+                return $this->_prepareBinaryExpression(self::SUBTRACT, $left, $right);
 
-	        default:
-	            throw new \InvalidArgumentException('onArithmeticExpression');
+            default:
+                throw new \InvalidArgumentException('onArithmeticExpression');
         }
     }
 
@@ -150,26 +150,26 @@ 
     public function onRelationalExpression($expressionType, $left, $right)
     {
         switch($expressionType) {
-	        case ExpressionType::GREATERTHAN:
-	            return $this->_prepareBinaryExpression(self::GREATER_THAN, $left, $right);
+            case ExpressionType::GREATERTHAN:
+                return $this->_prepareBinaryExpression(self::GREATER_THAN, $left, $right);
 
-	        case ExpressionType::GREATERTHAN_OR_EQUAL:
-	            return $this->_prepareBinaryExpression(self::GREATER_THAN_OR_EQUAL, $left, $right);
+            case ExpressionType::GREATERTHAN_OR_EQUAL:
+                return $this->_prepareBinaryExpression(self::GREATER_THAN_OR_EQUAL, $left, $right);
 
-	        case ExpressionType::LESSTHAN:
-	            return $this->_prepareBinaryExpression(self::LESS_THAN, $left, $right);
+            case ExpressionType::LESSTHAN:
+                return $this->_prepareBinaryExpression(self::LESS_THAN, $left, $right);
 
-	        case ExpressionType::LESSTHAN_OR_EQUAL:
-	            return $this->_prepareBinaryExpression(self::LESS_THAN_OR_EQUAL, $left, $right);
+            case ExpressionType::LESSTHAN_OR_EQUAL:
+                return $this->_prepareBinaryExpression(self::LESS_THAN_OR_EQUAL, $left, $right);
 
-	        case ExpressionType::EQUAL:
-	            return $this->_prepareBinaryExpression(self::EQUAL, $left, $right);
+            case ExpressionType::EQUAL:
+                return $this->_prepareBinaryExpression(self::EQUAL, $left, $right);
 
-	        case ExpressionType::NOTEQUAL:
-	            return $this->_prepareBinaryExpression(self::NOT_EQUAL, $left, $right);
+            case ExpressionType::NOTEQUAL:
+                return $this->_prepareBinaryExpression(self::NOT_EQUAL, $left, $right);
 
-	        default:
-	            throw new \InvalidArgumentException('onArithmeticExpression');
+            default:
+                throw new \InvalidArgumentException('onArithmeticExpression');
         }
     }
 
@@ -184,14 +184,14 @@ 
     public function onUnaryExpression($expressionType, $child)
     {
         switch($expressionType) {
-	        case ExpressionType::NEGATE:
-	            return $this->_prepareUnaryExpression(self::NEGATE, $child);
+            case ExpressionType::NEGATE:
+                return $this->_prepareUnaryExpression(self::NEGATE, $child);
 
-	        case ExpressionType::NOT_LOGICAL:
-	            return $this->_prepareUnaryExpression(self::LOGICAL_NOT, $child);
+            case ExpressionType::NOT_LOGICAL:
+                return $this->_prepareUnaryExpression(self::LOGICAL_NOT, $child);
 
-	        default:
-	            throw new \InvalidArgumentException('onUnaryExpression');
+            default:
+                throw new \InvalidArgumentException('onUnaryExpression');
         }
     }
 
@@ -247,85 +247,85 @@ 
     public function onFunctionCallExpression($functionDescription, $params)
     {
         switch($functionDescription->name) {
-	        case ODataConstants::STRFUN_COMPARE:
-	            return "strcmp($params[0], $params[1])";
+            case ODataConstants::STRFUN_COMPARE:
+                return "strcmp($params[0], $params[1])";
 
-	        case ODataConstants::STRFUN_ENDSWITH:
-	            return "(strcmp(substr($params[0], strlen($params[0]) - strlen($params[1])), $params[1]) === 0)";
+            case ODataConstants::STRFUN_ENDSWITH:
+                return "(strcmp(substr($params[0], strlen($params[0]) - strlen($params[1])), $params[1]) === 0)";
 
-	        case ODataConstants::STRFUN_INDEXOF:
-	            return "strpos($params[0], $params[1])";
+            case ODataConstants::STRFUN_INDEXOF:
+                return "strpos($params[0], $params[1])";
 
-	        case ODataConstants::STRFUN_REPLACE:
-	            return "str_replace($params[1], $params[2], $params[0])";
+            case ODataConstants::STRFUN_REPLACE:
+                return "str_replace($params[1], $params[2], $params[0])";
 
-	        case ODataConstants::STRFUN_STARTSWITH:
-	            return "(strpos($params[0], $params[1]) === 0)";
+            case ODataConstants::STRFUN_STARTSWITH:
+                return "(strpos($params[0], $params[1]) === 0)";
 
-	        case ODataConstants::STRFUN_TOLOWER:
-	            return "strtolower($params[0])";
+            case ODataConstants::STRFUN_TOLOWER:
+                return "strtolower($params[0])";
 
-	        case ODataConstants::STRFUN_TOUPPER:
-	            return "strtoupper($params[0])";
+            case ODataConstants::STRFUN_TOUPPER:
+                return "strtoupper($params[0])";
 
-	        case ODataConstants::STRFUN_TRIM:
-	            return "trim($params[0])";
+            case ODataConstants::STRFUN_TRIM:
+                return "trim($params[0])";
 
-	        case ODataConstants::STRFUN_SUBSTRING:
-	            return count($params) == 3 ?
-	                "substr($params[0], $params[1], $params[2])" :
-	                "substr($params[0], $params[1])";
+            case ODataConstants::STRFUN_SUBSTRING:
+                return count($params) == 3 ?
+                    "substr($params[0], $params[1], $params[2])" :
+                    "substr($params[0], $params[1])";
 
-	        case ODataConstants::STRFUN_SUBSTRINGOF:
-	            return "(strpos($params[1], $params[0]) !== false)";
+            case ODataConstants::STRFUN_SUBSTRINGOF:
+                return "(strpos($params[1], $params[0]) !== false)";
 
-	        case ODataConstants::STRFUN_CONCAT:
-	            return $params[0] . ' . ' . $params[1];
+            case ODataConstants::STRFUN_CONCAT:
+                return $params[0] . ' . ' . $params[1];
 
-	        case ODataConstants::STRFUN_LENGTH:
-	            return "strlen($params[0])";
+            case ODataConstants::STRFUN_LENGTH:
+                return "strlen($params[0])";
 
-	        case ODataConstants::GUIDFUN_EQUAL:
-	            return self::TYPE_NAMESPACE . "Guid::guidEqual($params[0], $params[1])";
+            case ODataConstants::GUIDFUN_EQUAL:
+                return self::TYPE_NAMESPACE . "Guid::guidEqual($params[0], $params[1])";
 
-	        case ODataConstants::DATETIME_COMPARE:
-	            return self::TYPE_NAMESPACE . "DateTime::dateTimeCmp($params[0], $params[1])";
+            case ODataConstants::DATETIME_COMPARE:
+                return self::TYPE_NAMESPACE . "DateTime::dateTimeCmp($params[0], $params[1])";
 
-	        case ODataConstants::DATETIME_YEAR:
-	            return self::TYPE_NAMESPACE . "DateTime::year($params[0])";
+            case ODataConstants::DATETIME_YEAR:
+                return self::TYPE_NAMESPACE . "DateTime::year($params[0])";
 
-	        case ODataConstants::DATETIME_MONTH:
-	            return self::TYPE_NAMESPACE . "DateTime::month($params[0])";
+            case ODataConstants::DATETIME_MONTH:
+                return self::TYPE_NAMESPACE . "DateTime::month($params[0])";
 
-	        case ODataConstants::DATETIME_DAY:
-	            return self::TYPE_NAMESPACE . "DateTime::day($params[0])";
+            case ODataConstants::DATETIME_DAY:
+                return self::TYPE_NAMESPACE . "DateTime::day($params[0])";
 
-	        case ODataConstants::DATETIME_HOUR:
-	            return self::TYPE_NAMESPACE . "DateTime::hour($params[0])";
+            case ODataConstants::DATETIME_HOUR:
+                return self::TYPE_NAMESPACE . "DateTime::hour($params[0])";
 
-	        case ODataConstants::DATETIME_MINUTE:
-	            return self::TYPE_NAMESPACE . "DateTime::minute($params[0])";
+            case ODataConstants::DATETIME_MINUTE:
+                return self::TYPE_NAMESPACE . "DateTime::minute($params[0])";
 
-	        case ODataConstants::DATETIME_SECOND:
-	            return self::TYPE_NAMESPACE . "DateTime::second($params[0])";
+            case ODataConstants::DATETIME_SECOND:
+                return self::TYPE_NAMESPACE . "DateTime::second($params[0])";
 
-	        case ODataConstants::MATHFUN_ROUND:
-	            return "round($params[0])";
+            case ODataConstants::MATHFUN_ROUND:
+                return "round($params[0])";
 
-	        case ODataConstants::MATHFUN_CEILING:
-	            return "ceil($params[0])";
+            case ODataConstants::MATHFUN_CEILING:
+                return "ceil($params[0])";
 
-	        case ODataConstants::MATHFUN_FLOOR:
-	            return "floor($params[0])";
+            case ODataConstants::MATHFUN_FLOOR:
+                return "floor($params[0])";
 
-	        case ODataConstants::BINFUL_EQUAL:
-	            return self::TYPE_NAMESPACE . "Binary::binaryEqual($params[0], $params[1])";
+            case ODataConstants::BINFUL_EQUAL:
+                return self::TYPE_NAMESPACE . "Binary::binaryEqual($params[0], $params[1])";
 
-	        case 'is_null':
-	            return "is_null($params[0])";
+            case 'is_null':
+                return "is_null($params[0])";
 
-	        default:
-	            throw new \InvalidArgumentException('onFunctionCallExpression');
+            default:
+                throw new \InvalidArgumentException('onFunctionCallExpression');
         }
     }
 

Spacing +20 added lines, -21 removed lines

@@ -94,7 +94,7 @@ 
      */
     public function onLogicalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
 	        case ExpressionType::AND_LOGICAL:
 	            return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
 
@@ -117,7 +117,7 @@ 
      */
     public function onArithmeticExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
 	        case ExpressionType::MULTIPLY:
 	            return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
 
@@ -149,7 +149,7 @@ 
      */
     public function onRelationalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
 	        case ExpressionType::GREATERTHAN:
 	            return $this->_prepareBinaryExpression(self::GREATER_THAN, $left, $right);
 
@@ -183,7 +183,7 @@ 
      */
     public function onUnaryExpression($expressionType, $child)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
 	        case ExpressionType::NEGATE:
 	            return $this->_prepareUnaryExpression(self::NEGATE, $child);
 
@@ -227,12 +227,12 @@ 
         $variable = null;
         
         do {
-            $variable = $parent->getResourceProperty()->getName() . self::MEMBER_ACCESS . $variable;
+            $variable = $parent->getResourceProperty()->getName().self::MEMBER_ACCESS.$variable;
             $parent = $parent->getParent();
         } while ($parent != null);
  
         $variable = rtrim($variable, self::MEMBER_ACCESS);
-        $variable = $this->getIteratorName() . self::MEMBER_ACCESS . $variable;
+        $variable = $this->getIteratorName().self::MEMBER_ACCESS.$variable;
         return $variable;
     }
 
@@ -246,7 +246,7 @@ 
      */
     public function onFunctionCallExpression($functionDescription, $params)
     {
-        switch($functionDescription->name) {
+        switch ($functionDescription->name) {
 	        case ODataConstants::STRFUN_COMPARE:
 	            return "strcmp($params[0], $params[1])";
 
@@ -273,41 +273,40 @@ 
 
 	        case ODataConstants::STRFUN_SUBSTRING:
 	            return count($params) == 3 ?
-	                "substr($params[0], $params[1], $params[2])" :
-	                "substr($params[0], $params[1])";
+	                "substr($params[0], $params[1], $params[2])" : "substr($params[0], $params[1])";
 
 	        case ODataConstants::STRFUN_SUBSTRINGOF:
 	            return "(strpos($params[1], $params[0]) !== false)";
 
 	        case ODataConstants::STRFUN_CONCAT:
-	            return $params[0] . ' . ' . $params[1];
+	            return $params[0].' . '.$params[1];
 
 	        case ODataConstants::STRFUN_LENGTH:
 	            return "strlen($params[0])";
 
 	        case ODataConstants::GUIDFUN_EQUAL:
-	            return self::TYPE_NAMESPACE . "Guid::guidEqual($params[0], $params[1])";
+	            return self::TYPE_NAMESPACE."Guid::guidEqual($params[0], $params[1])";
 
 	        case ODataConstants::DATETIME_COMPARE:
-	            return self::TYPE_NAMESPACE . "DateTime::dateTimeCmp($params[0], $params[1])";
+	            return self::TYPE_NAMESPACE."DateTime::dateTimeCmp($params[0], $params[1])";
 
 	        case ODataConstants::DATETIME_YEAR:
-	            return self::TYPE_NAMESPACE . "DateTime::year($params[0])";
+	            return self::TYPE_NAMESPACE."DateTime::year($params[0])";
 
 	        case ODataConstants::DATETIME_MONTH:
-	            return self::TYPE_NAMESPACE . "DateTime::month($params[0])";
+	            return self::TYPE_NAMESPACE."DateTime::month($params[0])";
 
 	        case ODataConstants::DATETIME_DAY:
-	            return self::TYPE_NAMESPACE . "DateTime::day($params[0])";
+	            return self::TYPE_NAMESPACE."DateTime::day($params[0])";
 
 	        case ODataConstants::DATETIME_HOUR:
-	            return self::TYPE_NAMESPACE . "DateTime::hour($params[0])";
+	            return self::TYPE_NAMESPACE."DateTime::hour($params[0])";
 
 	        case ODataConstants::DATETIME_MINUTE:
-	            return self::TYPE_NAMESPACE . "DateTime::minute($params[0])";
+	            return self::TYPE_NAMESPACE."DateTime::minute($params[0])";
 
 	        case ODataConstants::DATETIME_SECOND:
-	            return self::TYPE_NAMESPACE . "DateTime::second($params[0])";
+	            return self::TYPE_NAMESPACE."DateTime::second($params[0])";
 
 	        case ODataConstants::MATHFUN_ROUND:
 	            return "round($params[0])";
@@ -319,7 +318,7 @@ 
 	            return "floor($params[0])";
 
 	        case ODataConstants::BINFUL_EQUAL:
-	            return self::TYPE_NAMESPACE . "Binary::binaryEqual($params[0], $params[1])";
+	            return self::TYPE_NAMESPACE."Binary::binaryEqual($params[0], $params[1])";
 
 	        case 'is_null':
 	            return "is_null($params[0])";
@@ -341,7 +340,7 @@ 
     private function _prepareBinaryExpression($operator, $left, $right)
     {
         return 
-            self::OPEN_BRACKET . $left . ' ' . $operator . ' ' . $right . self::CLOSE_BRACKET;
+            self::OPEN_BRACKET.$left.' '.$operator.' '.$right.self::CLOSE_BRACKET;
     }
 
     /**
@@ -354,6 +353,6 @@ 
      */
     private function _prepareUnaryExpression($operator, $child)
     {
-        return $operator . self::OPEN_BRACKET . $child . self::CLOSE_BRACKET;
+        return $operator.self::OPEN_BRACKET.$child.self::CLOSE_BRACKET;
     }
 }
\ No newline at end of file

src/POData/Providers/Metadata/ResourceType.php

Doc Comments +2 added lines, -2 removed lines

@@ -274,7 +274,7 @@ 
     /**
      * To set custom state object for this type
      * 
-     * @param Object $object The custom object.
+     * @param ResourceSet $object The custom object.
      * 
      * @return void
      */
@@ -696,7 +696,7 @@ 
      * 
      * @param array &$arrayToDetectLoopInComplexType array for detecting loop.
      * 
-     * @return boolean true if resource type instance has bag property else false
+     * @return boolean|null true if resource type instance has bag property else false
      */
     public function hasBagProperty(&$arrayToDetectLoopInComplexType)
     {        

Indentation +3 added lines, -3 removed lines

@@ -194,9 +194,9 @@
      * @throws \InvalidArgumentException
      */
     public function __construct(
-	    $instanceType,
-	    $resourceTypeKind,
-	    $name,
+        $instanceType,
+        $resourceTypeKind,
+        $name,
         $namespaceName = null,
         ResourceType $baseType = null,
         $isAbstract = false

Spacing +2 added lines, -2 removed lines

@@ -233,7 +233,7 @@ 
         $this->_baseType = $baseType;        
         $this->_namespaceName = $namespaceName; 
         $this->_fullName 
-            = is_null($namespaceName) ? $name : $namespaceName . '.' . $name;
+            = is_null($namespaceName) ? $name : $namespaceName.'.'.$name;
         $this->_abstractType = $isAbstract;
         $this->_isMediaLinkEntry = false;
         $this->_customState = null;
@@ -825,7 +825,7 @@ 
      */
     public static function getPrimitiveResourceType($typeCode)
     {
-        switch($typeCode) {
+        switch ($typeCode) {
         case EdmPrimitiveType::BINARY:
             return new ResourceType(
                 new Binary(), ResourceTypeKind::PRIMITIVE, 

Unused Use Statements -2 removed lines

@@ -15,12 +15,10 @@
 use POData\Providers\Metadata\Type\SByte;
 use POData\Providers\Metadata\Type\Single;
 use POData\Providers\Metadata\Type\StringType;
-use POData\Providers\Metadata\Type\TypeCode;
 use POData\Providers\Metadata\Type\EdmPrimitiveType;
 use POData\Providers\Metadata\Type\IType;
 use POData\Common\Messages;
 use POData\Common\InvalidOperationException;
-use POData\Common;
 
 /**
  * Class ResourceType

Switch Indentation +96 added lines, -96 removed lines

@@ -826,102 +826,102 @@
     public static function getPrimitiveResourceType($typeCode)
     {
         switch($typeCode) {
-        case EdmPrimitiveType::BINARY:
-            return new ResourceType(
-                new Binary(), ResourceTypeKind::PRIMITIVE, 
-                'Binary', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::BOOLEAN:
-            return new ResourceType(
-                new Boolean(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'Boolean', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::BYTE:
-            return new ResourceType(
-                new Byte(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'Byte', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::DATETIME:
-            return new ResourceType(
-                new DateTime(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'DateTime', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::DECIMAL:
-            return new ResourceType(
-                new Decimal(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'Decimal', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::DOUBLE:
-            return new ResourceType(
-                new Double(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'Double', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::GUID:
-            return new ResourceType(
-                new Guid(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'Guid', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::INT16:
-            return new ResourceType(
-                new Int16(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'Int16', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::INT32:
-            return new ResourceType(
-                new Int32(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'Int32', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::INT64:
-            return new ResourceType(
-                new Int64(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'Int64', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::SBYTE:
-            return new ResourceType(
-                new SByte(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'SByte', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::SINGLE:
-            return new ResourceType(
-                new Single(), 
-                ResourceTypeKind::PRIMITIVE, 
-                'Single', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::STRING:
-            return new ResourceType(
-                new StringType(),
-                ResourceTypeKind::PRIMITIVE, 
-                'String', 'Edm'
-            );
-            break;
-        default:
-            throw new \InvalidArgumentException(
-                Messages::commonNotValidPrimitiveEDMType(
-                    '$typeCode', 'getPrimitiveResourceType'
-                )
-            );
+            case EdmPrimitiveType::BINARY:
+                return new ResourceType(
+                    new Binary(), ResourceTypeKind::PRIMITIVE, 
+                    'Binary', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::BOOLEAN:
+                return new ResourceType(
+                    new Boolean(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'Boolean', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::BYTE:
+                return new ResourceType(
+                    new Byte(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'Byte', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::DATETIME:
+                return new ResourceType(
+                    new DateTime(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'DateTime', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::DECIMAL:
+                return new ResourceType(
+                    new Decimal(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'Decimal', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::DOUBLE:
+                return new ResourceType(
+                    new Double(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'Double', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::GUID:
+                return new ResourceType(
+                    new Guid(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'Guid', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::INT16:
+                return new ResourceType(
+                    new Int16(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'Int16', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::INT32:
+                return new ResourceType(
+                    new Int32(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'Int32', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::INT64:
+                return new ResourceType(
+                    new Int64(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'Int64', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::SBYTE:
+                return new ResourceType(
+                    new SByte(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'SByte', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::SINGLE:
+                return new ResourceType(
+                    new Single(), 
+                    ResourceTypeKind::PRIMITIVE, 
+                    'Single', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::STRING:
+                return new ResourceType(
+                    new StringType(),
+                    ResourceTypeKind::PRIMITIVE, 
+                    'String', 'Edm'
+                );
+                break;
+            default:
+                throw new \InvalidArgumentException(
+                    Messages::commonNotValidPrimitiveEDMType(
+                        '$typeCode', 'getPrimitiveResourceType'
+                    )
+                );
         }    
     }
 }
\ No newline at end of file