@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $this->service = $service; |
95 | 95 | $this->request = $request; |
96 | 96 | $this->absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri()->getUrlAsString(); |
97 | - $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/') . '/'; |
|
97 | + $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/').'/'; |
|
98 | 98 | $this->stack = new SegmentStack($request); |
99 | 99 | $this->complexTypeInstanceCollection = []; |
100 | 100 | $this->modelSerialiser = new ModelSerialiser(); |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $resourceType, |
141 | 141 | $resourceSet->getName() |
142 | 142 | ); |
143 | - $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri; |
|
143 | + $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri; |
|
144 | 144 | |
145 | 145 | list($mediaLink, $mediaLinks) = $this->writeMediaData($entryObject, $type, $relativeUri, $resourceType); |
146 | 146 | |
@@ -173,8 +173,8 @@ discard block |
||
173 | 173 | $propType = 'application/atom+xml;type='.$propTail; |
174 | 174 | $propName = $prop->getName(); |
175 | 175 | $nuLink->title = $propName; |
176 | - $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propName; |
|
177 | - $nuLink->url = $relativeUri . '/' . $propName; |
|
176 | + $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE.$propName; |
|
177 | + $nuLink->url = $relativeUri.'/'.$propName; |
|
178 | 178 | $nuLink->type = $propType; |
179 | 179 | |
180 | 180 | $navProp = new ODataNavigationPropertyInfo($prop, $this->shouldExpandSegment($propName)); |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | $nuLink->expandedResult->selfLink->title = $propName; |
200 | 200 | $nuLink->expandedResult->selfLink->url = $nuLink->url; |
201 | 201 | $nuLink->expandedResult->title = $propName; |
202 | - $nuLink->expandedResult->id = rtrim($this->absoluteServiceUri, '/') . '/' . $nuLink->url; |
|
202 | + $nuLink->expandedResult->id = rtrim($this->absoluteServiceUri, '/').'/'.$nuLink->url; |
|
203 | 203 | } |
204 | 204 | } |
205 | 205 | } |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | $segment = $this->getNextLinkUri($lastObject, $absoluteUri); |
268 | 268 | $nextLink = new ODataLink(); |
269 | 269 | $nextLink->name = ODataConstants::ATOM_LINK_NEXT_ATTRIBUTE_STRING; |
270 | - $nextLink->url = rtrim($this->absoluteServiceUri, '/') . '/' . $stackSegment . $segment; |
|
270 | + $nextLink->url = rtrim($this->absoluteServiceUri, '/').'/'.$stackSegment.$segment; |
|
271 | 271 | $odata->nextPageLink = $nextLink; |
272 | 272 | } |
273 | 273 | |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | $this->getCurrentResourceSetWrapper()->getName() |
293 | 293 | ); |
294 | 294 | |
295 | - $url->url = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri; |
|
295 | + $url->url = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri; |
|
296 | 296 | } |
297 | 297 | |
298 | 298 | return $url; |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | $segment = $this->getNextLinkUri($lastObject, $this->getRequest()->getRequestUrl()->getUrlAsString()); |
323 | 323 | $nextLink = new ODataLink(); |
324 | 324 | $nextLink->name = ODataConstants::ATOM_LINK_NEXT_ATTRIBUTE_STRING; |
325 | - $nextLink->url = rtrim($this->absoluteServiceUri, '/') . '/' . $stackSegment . $segment; |
|
325 | + $nextLink->url = rtrim($this->absoluteServiceUri, '/').'/'.$stackSegment.$segment; |
|
326 | 326 | $urls->nextPageLink = $nextLink; |
327 | 327 | } |
328 | 328 | } |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | * @return ODataPropertyContent |
348 | 348 | * @codeCoverageIgnore |
349 | 349 | */ |
350 | - public function writeTopLevelComplexObject(&$complexValue, $propertyName, ResourceType &$resourceType) |
|
350 | + public function writeTopLevelComplexObject(&$complexValue, $propertyName, ResourceType & $resourceType) |
|
351 | 351 | { |
352 | 352 | // TODO: Figure out if we need to bother implementing this |
353 | 353 | } |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | * @codeCoverageIgnore |
365 | 365 | * @return ODataPropertyContent |
366 | 366 | */ |
367 | - public function writeTopLevelBagObject(&$BagValue, $propertyName, ResourceType &$resourceType) |
|
367 | + public function writeTopLevelBagObject(&$BagValue, $propertyName, ResourceType & $resourceType) |
|
368 | 368 | { |
369 | 369 | // TODO: Figure out if we need to bother implementing this |
370 | 370 | } |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | * @codeCoverageIgnore |
382 | 382 | * @return ODataPropertyContent |
383 | 383 | */ |
384 | - public function writeTopLevelPrimitive(&$primitiveValue, ResourceProperty &$resourceProperty = null) |
|
384 | + public function writeTopLevelPrimitive(&$primitiveValue, ResourceProperty & $resourceProperty = null) |
|
385 | 385 | { |
386 | 386 | // TODO: Figure out if we need to bother implementing this |
387 | 387 | } |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | $typeName = $resourceType->getName(); |
435 | 435 | $keyProperties = $resourceType->getKeyProperties(); |
436 | 436 | assert(count($keyProperties) != 0, 'count($keyProperties) == 0'); |
437 | - $keyString = $containerName . '('; |
|
437 | + $keyString = $containerName.'('; |
|
438 | 438 | $comma = null; |
439 | 439 | foreach ($keyProperties as $keyName => $resourceProperty) { |
440 | 440 | $keyType = $resourceProperty->getInstanceType(); |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | } |
449 | 449 | |
450 | 450 | $keyValue = $keyType->convertToOData($keyValue); |
451 | - $keyString .= $comma . $keyName . '=' . $keyValue; |
|
451 | + $keyString .= $comma.$keyName.'='.$keyValue; |
|
452 | 452 | $comma = ','; |
453 | 453 | } |
454 | 454 | |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | $mediaLink = null; |
474 | 474 | if ($resourceType->isMediaLinkEntry()) { |
475 | 475 | $eTag = $streamProviderWrapper->getStreamETag2($entryObject, null, $context); |
476 | - $mediaLink = new ODataMediaLink($type, '/$value', $relativeUri . '/$value', '*/*', $eTag); |
|
476 | + $mediaLink = new ODataMediaLink($type, '/$value', $relativeUri.'/$value', '*/*', $eTag); |
|
477 | 477 | } |
478 | 478 | $mediaLinks = []; |
479 | 479 | if ($resourceType->hasNamedStream()) { |
@@ -614,7 +614,7 @@ discard block |
||
614 | 614 | $segmentWrappers = $this->getStack()->getSegmentWrappers(); |
615 | 615 | $count = count($segmentWrappers); |
616 | 616 | |
617 | - return 0 == $count ? $this->getRequest()->getTargetResourceSetWrapper() : $segmentWrappers[$count - 1]; |
|
617 | + return 0 == $count ? $this->getRequest()->getTargetResourceSetWrapper() : $segmentWrappers[$count-1]; |
|
618 | 618 | } |
619 | 619 | |
620 | 620 | /** |
@@ -654,7 +654,7 @@ discard block |
||
654 | 654 | * |
655 | 655 | * @return string |
656 | 656 | */ |
657 | - private function primitiveToString(IType &$type, $primitiveValue) |
|
657 | + private function primitiveToString(IType & $type, $primitiveValue) |
|
658 | 658 | { |
659 | 659 | if ($type instanceof Boolean) { |
660 | 660 | $stringValue = (true === $primitiveValue) ? 'true' : 'false'; |