balint777 / POData

src/POData/ObjectModel/ObjectModelSerializer.php

Doc Comments +1 added lines, -1 removed lines

@@ -378,7 +378,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

@@ -67,7 +67,7 @@ 
         $needPop = $this->pushSegmentForRoot();
         $entry = $this->_writeEntryElement(
             $entryObject,
-	        $resourceType,
+            $resourceType,
             $this->request->getRequestUrl()->getUrlAsString(),
             $this->request->getContainerName()
         );
@@ -190,18 +190,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;
     }
 
     /**
@@ -217,19 +217,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;
     }
 
     /**
@@ -245,18 +245,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;
     }
 
     /**
@@ -275,8 +275,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
@@ -297,27 +297,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;
     }
 
     /**
@@ -390,7 +390,7 @@ 
      * @return void
      */
     private function _writeObjectProperties(
-	    $customObject,
+        $customObject,
         ResourceType &$resourceType,
         $absoluteUri,
         $relativeUri,
@@ -488,14 +488,14 @@ 
                     ) {
                         continue;
                     } else {
-                         $this->assert(
-                             ($resourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE)
+                            $this->assert(
+                                ($resourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE)
                              || ($resourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE)
                              || ($resourcePropertyKind == ResourcePropertyKind::KEY_RESOURCE_REFERENCE),
-                             '($resourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE)
+                                '($resourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE)
                              || ($resourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE)
                              || ($resourcePropertyKind == ResourcePropertyKind::KEY_RESOURCE_REFERENCE)'
-                         );
+                            );
 
                         $navigationProperties[$i] = new NavigationPropertyInfo($resourceProperty, $this->shouldExpandSegment($resourceProperty->getName()));
                         if ($navigationProperties[$i]->expanded) {
@@ -617,10 +617,10 @@ 
                             $currentResourceType1 = $currentResourceSetWrapper->getResourceType();
 
                             $link->expandedResult = $this->_writeEntryElement(
-	                            $navigationPropertyInfo->value,
-	                            $currentResourceType1,
-	                            $propertyAbsoluteUri,
-	                            $propertyRelativeUri
+                                $navigationPropertyInfo->value,
+                                $currentResourceType1,
+                                $propertyAbsoluteUri,
+                                $propertyRelativeUri
                             );
                         }
                     } else {

Spacing +20 added lines, -21 removed lines

@@ -192,7 +192,7 @@ 
     public function writeTopLevelComplexObject(
 	    &$complexValue,
         $propertyName,
-        ResourceType &$resourceType
+        ResourceType & $resourceType
     ) {
 	    $propertyContent = new ODataPropertyContent();
         $this->_writeComplexValue(
@@ -219,7 +219,7 @@ 
     public function writeTopLevelBagObject(
 	    &$BagValue,
         $propertyName,
-        ResourceType &$resourceType
+        ResourceType & $resourceType
     ) {
 
 	    $propertyContent = new ODataPropertyContent();
@@ -246,7 +246,7 @@ 
      */
     public function writeTopLevelPrimitive(
 	    &$primitiveValue,
-        ResourceProperty &$resourceProperty
+        ResourceProperty & $resourceProperty
     ) {
 	    $propertyContent = new ODataPropertyContent();
 	    $propertyContent->properties[] = new ODataProperty();
@@ -335,18 +335,18 @@ 
      */
     private function _writeFeedElements(
         &$entryObjects,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $title,
         $absoluteUri,
         $relativeUri,
-        ODataFeed &$feed
+        ODataFeed & $feed
     ) {
         $this->assert(is_array($entryObjects) || $entryObjects instanceof ArrayAccess, '_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)) {
@@ -391,11 +391,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)
@@ -573,8 +573,7 @@ 
             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->title = $propertyName;
@@ -651,7 +650,7 @@ 
      * @return void
      */
     private function _writePrimitiveValue(&$primitiveValue,
-        ResourceProperty &$resourceProperty, ODataProperty &$odataProperty
+        ResourceProperty & $resourceProperty, ODataProperty & $odataProperty
     ) {
         if (is_object($primitiveValue)) {
             //TODO ERROR: The property 'PropertyName'
@@ -690,8 +689,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;
@@ -730,8 +729,8 @@ 
      * @return void
      */
     private function _writeBagValue(&$BagValue,
-        $propertyName, ResourceType &$resourceType, $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        $propertyName, ResourceType & $resourceType, $relativeUri,
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $bagItemResourceTypeKind = $resourceType->getResourceTypeKind();
         $this->assert(
@@ -743,7 +742,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 {
@@ -790,10 +789,10 @@ 
      */
     private function _writeMediaResourceMetadata(
         $entryObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $title,
         $relativeUri,
-        ODataEntry &$odataEntry
+        ODataEntry & $odataEntry
     ) {
         if ($resourceType->isMediaLinkEntry()) {
             $odataEntry->isMediaLinkEntry = true;
@@ -839,7 +838,7 @@ 
      *
      * @return void
      */
-    private function _primitiveToString(ResourceType &$primtiveResourceType,
+    private function _primitiveToString(ResourceType & $primtiveResourceType,
         $primitiveValue, &$stringValue
     ) {
         $type = $primtiveResourceType->getInstanceType();
@@ -876,8 +875,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++) {

src/POData/ObjectModel/ObjectModelSerializerBase.php

Doc Comments +3 added lines, -1 removed lines

@@ -422,7 +422,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)
     {
@@ -635,6 +635,8 @@ 
      *                                                        true if any expansion
      *                                                        defined under this node
      *                                                        false otherwise.
+     * @param boolean $foundSelections
+     * @param boolean $foundExpansions
      *
      * @return void
      */

Indentation +6 added lines, -6 removed lines

@@ -160,11 +160,11 @@ 
     protected function getPropertyValue($entity, ResourceType $resourceType, ResourceProperty $resourceProperty)
     {
         try {
-	        //Is this slow?  See #88
-            	$reflectionClass = new \ReflectionClass(get_class($entity));
-            	$reflectionProperty = $reflectionClass->getProperty($resourceProperty->getName());
-            	$reflectionProperty->setAccessible(true);
-            	return $reflectionProperty->getValue($entity);
+            //Is this slow?  See #88
+                $reflectionClass = new \ReflectionClass(get_class($entity));
+                $reflectionProperty = $reflectionClass->getProperty($resourceProperty->getName());
+                $reflectionProperty->setAccessible(true);
+                return $reflectionProperty->getValue($entity);
         } catch (\ReflectionException $reflectionException) {
             throw ODataException::createInternalServerError(
                 Messages::objectModelSerializerFailedToAccessProperty(
@@ -561,7 +561,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 +6 added lines, -6 removed lines

@@ -137,7 +137,7 @@ 
             }
 
             $keyValue = $keyType->convertToOData($keyValue);
-            $keyString .= $comma . $keyName.'='.$keyValue;
+            $keyString .= $comma . $keyName . '=' . $keyValue;
             $comma = ',';
         }
 
@@ -225,7 +225,7 @@ 
             );
             $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);
             }
@@ -273,7 +273,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');
@@ -386,7 +386,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
@@ -474,7 +474,7 @@ 
 
         $topCountValue = $this->request->getTopOptionCount();
         if (!is_null($topCountValue)) {
-            $remainingCount  = $topCountValue - $this->request->getTopCount();
+            $remainingCount = $topCountValue - $this->request->getTopCount();
             if (!is_null($queryParameterString)) {
                 $queryParameterString .= '&';
             }
@@ -640,7 +640,7 @@ 
      */
     private function _buildSelectionAndExpansionPathsForNode(&$parentPathSegments,
         &$selectionPaths, &$expansionPaths,
-        ExpandedProjectionNode &$expandedProjectionNode,
+        ExpandedProjectionNode & $expandedProjectionNode,
         &$foundSelections, &$foundExpansions
     ) {
         $foundSelections = false;

Braces +3 added lines, -1 removed lines

@@ -128,7 +128,9 @@
         $comma = null;
         foreach ($keyProperties as $keyName => $resourceProperty) {
             $keyType = $resourceProperty->getInstanceType();
-            if (!$keyType instanceof IType) continue;
+            if (!$keyType instanceof IType) {
+                continue;
+            }
             // $this->assert($keyType instanceof IType, '$keyType instanceof IType');
 
             $keyValue = $this->getPropertyValue($entityInstance, $resourceType, $resourceProperty);