| @@ -362,6 +362,9 @@ discard block | ||
| 362 | 362 | return $this->stack; | 
| 363 | 363 | } | 
| 364 | 364 | |
| 365 | + /** | |
| 366 | + * @param string $containerName | |
| 367 | + */ | |
| 365 | 368 | protected function getEntryInstanceKey($entityInstance, ResourceType $resourceType, $containerName) | 
| 366 | 369 |      { | 
| 367 | 370 | $typeName = $resourceType->getName(); | 
| @@ -394,7 +397,7 @@ discard block | ||
| 394 | 397 | /** | 
| 395 | 398 | * @param $entryObject | 
| 396 | 399 | * @param $type | 
| 397 | - * @param $relativeUri | |
| 400 | + * @param string $relativeUri | |
| 398 | 401 | * @param $resourceType | 
| 399 | 402 | * @return array | 
| 400 | 403 | */ | 
| @@ -461,7 +464,7 @@ discard block | ||
| 461 | 464 | * Find a 'ExpandedProjectionNode' instance in the projection tree | 
| 462 | 465 | * which describes the current segment. | 
| 463 | 466 | * | 
| 464 | - * @return ExpandedProjectionNode|null | |
| 467 | + * @return null|\POData\UriProcessor\QueryProcessor\ExpandProjectionParser\RootProjectionNode|ExpandedProjectionNode | |
| 465 | 468 | */ | 
| 466 | 469 | protected function getCurrentExpandedProjectionNode() | 
| 467 | 470 |      { | 
| @@ -86,7 +86,7 @@ discard block | ||
| 86 | 86 | $this->service = $service; | 
| 87 | 87 | $this->request = $request; | 
| 88 | 88 | $this->absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri()->getUrlAsString(); | 
| 89 | - $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/') . '/'; | |
| 89 | + $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/').'/'; | |
| 90 | 90 | $this->stack = new SegmentStack($request); | 
| 91 | 91 | $this->complexTypeInstanceCollection = []; | 
| 92 | 92 | } | 
| @@ -131,7 +131,7 @@ discard block | ||
| 131 | 131 | $resourceType, | 
| 132 | 132 | $resourceSet->getName() | 
| 133 | 133 | ); | 
| 134 | - $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri; | |
| 134 | + $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri; | |
| 135 | 135 | |
| 136 | 136 | list($mediaLink, $mediaLinks) = $this->writeMediaData($entryObject, $type, $relativeUri, $resourceType); | 
| 137 | 137 | |
| @@ -152,8 +152,8 @@ discard block | ||
| 152 | 152 | $propType = 'application/atom+xml;type='.$propTail; | 
| 153 | 153 | $propName = $prop->getName(); | 
| 154 | 154 | $nuLink->title = $propName; | 
| 155 | - $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propName; | |
| 156 | - $nuLink->url = $relativeUri . '/' . $propName; | |
| 155 | + $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE.$propName; | |
| 156 | + $nuLink->url = $relativeUri.'/'.$propName; | |
| 157 | 157 | $nuLink->type = $propType; | 
| 158 | 158 | |
| 159 | 159 | $navProp = new ODataNavigationPropertyInfo($prop, $this->shouldExpandSegment($propName)); | 
| @@ -178,7 +178,7 @@ discard block | ||
| 178 | 178 | $nuLink->expandedResult->selfLink->title = $propName; | 
| 179 | 179 | $nuLink->expandedResult->selfLink->url = $nuLink->url; | 
| 180 | 180 | $nuLink->expandedResult->title = $propName; | 
| 181 | - $nuLink->expandedResult->id = rtrim($this->absoluteServiceUri, '/') . '/' . $nuLink->url; | |
| 181 | + $nuLink->expandedResult->id = rtrim($this->absoluteServiceUri, '/').'/'.$nuLink->url; | |
| 182 | 182 | } | 
| 183 | 183 | } | 
| 184 | 184 | } | 
| @@ -280,7 +280,7 @@ discard block | ||
| 280 | 280 | * | 
| 281 | 281 | * @return ODataPropertyContent | 
| 282 | 282 | */ | 
| 283 | - public function writeTopLevelComplexObject(&$complexValue, $propertyName, ResourceType &$resourceType) | |
| 283 | + public function writeTopLevelComplexObject(&$complexValue, $propertyName, ResourceType & $resourceType) | |
| 284 | 284 |      { | 
| 285 | 285 | // TODO: Implement writeTopLevelComplexObject() method. | 
| 286 | 286 | } | 
| @@ -297,7 +297,7 @@ discard block | ||
| 297 | 297 | * | 
| 298 | 298 | * @return ODataPropertyContent | 
| 299 | 299 | */ | 
| 300 | - public function writeTopLevelBagObject(&$BagValue, $propertyName, ResourceType &$resourceType) | |
| 300 | + public function writeTopLevelBagObject(&$BagValue, $propertyName, ResourceType & $resourceType) | |
| 301 | 301 |      { | 
| 302 | 302 | // TODO: Implement writeTopLevelBagObject() method. | 
| 303 | 303 | } | 
| @@ -314,7 +314,7 @@ discard block | ||
| 314 | 314 | * | 
| 315 | 315 | * @return ODataPropertyContent | 
| 316 | 316 | */ | 
| 317 | - public function writeTopLevelPrimitive(&$primitiveValue, ResourceProperty &$resourceProperty = null) | |
| 317 | + public function writeTopLevelPrimitive(&$primitiveValue, ResourceProperty & $resourceProperty = null) | |
| 318 | 318 |      { | 
| 319 | 319 | // TODO: Implement writeTopLevelPrimitive() method. | 
| 320 | 320 | } | 
| @@ -367,7 +367,7 @@ discard block | ||
| 367 | 367 | $typeName = $resourceType->getName(); | 
| 368 | 368 | $keyProperties = $resourceType->getKeyProperties(); | 
| 369 | 369 | assert(count($keyProperties) != 0, 'count($keyProperties) == 0'); | 
| 370 | -        $keyString = $containerName . '('; | |
| 370 | +        $keyString = $containerName.'('; | |
| 371 | 371 | $comma = null; | 
| 372 | 372 |          foreach ($keyProperties as $keyName => $resourceProperty) { | 
| 373 | 373 | $keyType = $resourceProperty->getInstanceType(); | 
| @@ -381,7 +381,7 @@ discard block | ||
| 381 | 381 | } | 
| 382 | 382 | |
| 383 | 383 | $keyValue = $keyType->convertToOData($keyValue); | 
| 384 | - $keyString .= $comma . $keyName . '=' . $keyValue; | |
| 384 | + $keyString .= $comma.$keyName.'='.$keyValue; | |
| 385 | 385 | $comma = ','; | 
| 386 | 386 | } | 
| 387 | 387 | |
| @@ -407,7 +407,7 @@ discard block | ||
| 407 | 407 | $mediaLink = null; | 
| 408 | 408 |          if ($resourceType->isMediaLinkEntry()) { | 
| 409 | 409 | $eTag = $streamProviderWrapper->getStreamETag2($entryObject, null, $context); | 
| 410 | - $mediaLink = new ODataMediaLink($type, '/$value', $relativeUri . '/$value', '*/*', $eTag); | |
| 410 | + $mediaLink = new ODataMediaLink($type, '/$value', $relativeUri.'/$value', '*/*', $eTag); | |
| 411 | 411 | } | 
| 412 | 412 | $mediaLinks = []; | 
| 413 | 413 |          if ($resourceType->hasNamedStream()) { |