@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | public static function requestVersionTooLow($requestedVersion, $requiredVersion) |
18 | 18 | { |
19 | 19 | return 'Request version \''.$requestedVersion.'\' is not supported for the request payload. The only' |
20 | - .' supported version is \''.$requiredVersion.'\'.'; |
|
20 | + .' supported version is \''.$requiredVersion.'\'.'; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | public static function requestVersionIsBiggerThanProtocolVersion($requiredVersion, $configuredVersion) |
33 | 33 | { |
34 | 34 | return 'The response requires that version '.$requiredVersion.' of the protocol be used, but the' |
35 | - .' MaxProtocolVersion of the data service is set to '.$configuredVersion.'.'; |
|
35 | + .' MaxProtocolVersion of the data service is set to '.$configuredVersion.'.'; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | /** |
@@ -65,6 +65,6 @@ discard block |
||
65 | 65 | $availableVersions |
66 | 66 | ) { |
67 | 67 | return 'The version value '.$requestedVersion.' in the header '.$requestHeaderName.' is not' |
68 | - .' supported, available versions are '.$availableVersions; |
|
68 | + .' supported, available versions are '.$availableVersions; |
|
69 | 69 | } |
70 | 70 | } |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public static function requestVersionTooLow($requestedVersion, $requiredVersion) |
18 | 18 | { |
19 | - return 'Request version \''.$requestedVersion.'\' is not supported for the request payload. The only' |
|
20 | - .' supported version is \''.$requiredVersion.'\'.'; |
|
19 | + return 'Request version \'' . $requestedVersion . '\' is not supported for the request payload. The only' |
|
20 | + .' supported version is \'' . $requiredVersion . '\'.'; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public static function requestVersionIsBiggerThanProtocolVersion($requiredVersion, $configuredVersion) |
33 | 33 | { |
34 | - return 'The response requires that version '.$requiredVersion.' of the protocol be used, but the' |
|
35 | - .' MaxProtocolVersion of the data service is set to '.$configuredVersion.'.'; |
|
34 | + return 'The response requires that version ' . $requiredVersion . ' of the protocol be used, but the' |
|
35 | + .' MaxProtocolVersion of the data service is set to ' . $configuredVersion . '.'; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | /** |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public static function requestDescriptionInvalidVersionHeader($versionAsString, $headerName) |
48 | 48 | { |
49 | - return 'The header '.$headerName.' has malformed version value '.$versionAsString; |
|
49 | + return 'The header ' . $headerName . ' has malformed version value ' . $versionAsString; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $requestedVersion, |
65 | 65 | $availableVersions |
66 | 66 | ) { |
67 | - return 'The version value '.$requestedVersion.' in the header '.$requestHeaderName.' is not' |
|
68 | - .' supported, available versions are '.$availableVersions; |
|
67 | + return 'The version value ' . $requestedVersion . ' in the header ' . $requestHeaderName . ' is not' |
|
68 | + .' supported, available versions are ' . $availableVersions; |
|
69 | 69 | } |
70 | 70 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | public static function orderByParserPropertyNotFound($resourceTypeName, $propertyName) |
51 | 51 | { |
52 | 52 | return 'Error in the \'orderby\' clause. Type ' . $resourceTypeName |
53 | - . ' does not have a property named \'' . $propertyName . '\'.'; |
|
53 | + . ' does not have a property named \'' . $propertyName . '\'.'; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | /** |
@@ -179,6 +179,6 @@ discard block |
||
179 | 179 | public static function orderByParserFailedToAccessOrInitializeProperty($propertyName, $parentObjectName) |
180 | 180 | { |
181 | 181 | return 'OrderBy parser failed to access or initialize the property ' . $propertyName . |
182 | - ' of ' . $parentObjectName; |
|
182 | + ' of ' . $parentObjectName; |
|
183 | 183 | } |
184 | 184 | } |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * |
195 | 195 | * @return bool true if a segment was pushed, false otherwise |
196 | 196 | */ |
197 | - private function pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty) |
|
197 | + private function pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty) |
|
198 | 198 | { |
199 | 199 | if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY()) { |
200 | 200 | assert(!empty($this->getStack()->getSegmentNames()), '!is_empty($this->getStack()->getSegmentNames())'); |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | * |
280 | 280 | * @return bool true if the segment was push, false otherwise |
281 | 281 | */ |
282 | - private function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper) |
|
282 | + private function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper) |
|
283 | 283 | { |
284 | 284 | return $this->getStack()->pushSegment($segmentName, $resourceSetWrapper); |
285 | 285 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | ); |
223 | 223 | } |
224 | 224 | |
225 | - $builtServiceUri = $requestUriScheme .'://' . $this->getAbsoluteRequestUri()->getHost(); |
|
225 | + $builtServiceUri = $requestUriScheme . '://' . $this->getAbsoluteRequestUri()->getHost(); |
|
226 | 226 | |
227 | 227 | if (($requestUriScheme == 'http' && $requestUriPort != '80') || |
228 | 228 | ($requestUriScheme == 'https' && $requestUriPort != '443') |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | $this->getOperationContext()->outgoingResponse()->setContentLength($value); |
512 | 512 | } else { |
513 | 513 | throw ODataException::notAcceptableError( |
514 | - 'ContentLength: '.$value.' is invalid' |
|
514 | + 'ContentLength: ' . $value . ' is invalid' |
|
515 | 515 | ); |
516 | 516 | } |
517 | 517 | } |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | public function setResponseStatusCode($value) |
557 | 557 | { |
558 | 558 | if (!is_numeric($value)) { |
559 | - $msg = 'Invalid, non-numeric, status code: '.$value; |
|
559 | + $msg = 'Invalid, non-numeric, status code: ' . $value; |
|
560 | 560 | throw ODataException::createInternalServerError($msg); |
561 | 561 | } |
562 | 562 | $floor = floor($value/100); |
@@ -565,10 +565,10 @@ |
||
565 | 565 | { |
566 | 566 | $queryParameterString = null; |
567 | 567 | foreach ([ODataConstants::HTTPQUERY_STRING_FILTER, |
568 | - ODataConstants::HTTPQUERY_STRING_EXPAND, |
|
569 | - ODataConstants::HTTPQUERY_STRING_ORDERBY, |
|
570 | - ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
|
571 | - ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) { |
|
568 | + ODataConstants::HTTPQUERY_STRING_EXPAND, |
|
569 | + ODataConstants::HTTPQUERY_STRING_ORDERBY, |
|
570 | + ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
|
571 | + ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) { |
|
572 | 572 | $value = $this->getService()->getHost()->getQueryStringItem($queryOption); |
573 | 573 | if (null !== $value) { |
574 | 574 | if (null !== $queryParameterString) { |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $this->loadStackIfEmpty(); |
120 | 120 | |
121 | 121 | $stackCount = count($this->lightStack); |
122 | - $topOfStack = $this->lightStack[$stackCount-1]; |
|
122 | + $topOfStack = $this->lightStack[$stackCount - 1]; |
|
123 | 123 | $resourceType = $this->getService()->getProvidersWrapper()->resolveResourceType($topOfStack[0]); |
124 | 124 | assert($resourceType instanceof ResourceType, get_class($resourceType)); |
125 | 125 | $rawProp = $resourceType->getAllProperties(); |
@@ -141,8 +141,8 @@ discard block |
||
141 | 141 | $nonRelCount = count($nonRelProp); |
142 | 142 | assert( |
143 | 143 | $rawCount == $relCount + $nonRelCount, |
144 | - 'Raw property count '.$rawCount.', does not equal sum of relProp count, '.$relCount |
|
145 | - .', and nonRelPropCount,'.$nonRelCount |
|
144 | + 'Raw property count ' . $rawCount . ', does not equal sum of relProp count, ' . $relCount |
|
145 | + .', and nonRelPropCount,' . $nonRelCount |
|
146 | 146 | ); |
147 | 147 | |
148 | 148 | // now mask off against projNodes |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | .' $propKind != ResourcePropertyKind::RESOURCE_REFERENCE' |
190 | 190 | ); |
191 | 191 | $propTail = ResourcePropertyKind::RESOURCE_REFERENCE == $propKind ? 'entry' : 'feed'; |
192 | - $propType = 'application/atom+xml;type='.$propTail; |
|
192 | + $propType = 'application/atom+xml;type=' . $propTail; |
|
193 | 193 | $propName = $prop->getName(); |
194 | 194 | $nuLink->title = $propName; |
195 | 195 | $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propName; |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | * |
237 | 237 | * @return ODataFeed |
238 | 238 | */ |
239 | - public function writeTopLevelElements(QueryResult &$entryObjects) |
|
239 | + public function writeTopLevelElements(QueryResult & $entryObjects) |
|
240 | 240 | { |
241 | 241 | assert(is_array($entryObjects->results), '!is_array($entryObjects->results)'); |
242 | 242 | |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | * |
360 | 360 | * @return ODataPropertyContent |
361 | 361 | */ |
362 | - public function writeTopLevelComplexObject(QueryResult &$complexValue, $propertyName, ResourceType &$resourceType) |
|
362 | + public function writeTopLevelComplexObject(QueryResult & $complexValue, $propertyName, ResourceType & $resourceType) |
|
363 | 363 | { |
364 | 364 | $result = $complexValue->results; |
365 | 365 | |
@@ -387,14 +387,14 @@ discard block |
||
387 | 387 | * |
388 | 388 | * @return ODataPropertyContent |
389 | 389 | */ |
390 | - public function writeTopLevelBagObject(QueryResult &$bagValue, $propertyName, ResourceType &$resourceType) |
|
390 | + public function writeTopLevelBagObject(QueryResult & $bagValue, $propertyName, ResourceType & $resourceType) |
|
391 | 391 | { |
392 | 392 | $result = $bagValue->results; |
393 | 393 | |
394 | 394 | $propertyContent = new ODataPropertyContent(); |
395 | 395 | $odataProperty = new ODataProperty(); |
396 | 396 | $odataProperty->name = $propertyName; |
397 | - $odataProperty->typeName = 'Collection('.$resourceType->getFullName().')'; |
|
397 | + $odataProperty->typeName = 'Collection(' . $resourceType->getFullName() . ')'; |
|
398 | 398 | $odataProperty->value = $this->writeBagValue($resourceType, $result); |
399 | 399 | |
400 | 400 | $propertyContent->properties[$propertyName] = $odataProperty; |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | * |
410 | 410 | * @return ODataPropertyContent |
411 | 411 | */ |
412 | - public function writeTopLevelPrimitive(QueryResult &$primitiveValue, ResourceProperty &$resourceProperty = null) |
|
412 | + public function writeTopLevelPrimitive(QueryResult & $primitiveValue, ResourceProperty & $resourceProperty = null) |
|
413 | 413 | { |
414 | 414 | assert(null !== $resourceProperty, 'Resource property must not be null'); |
415 | 415 | $result = new ODataPropertyContent(); |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | * @param $result |
502 | 502 | * @return ODataBagContent|null |
503 | 503 | */ |
504 | - protected function writeBagValue(ResourceType &$resourceType, $result) |
|
504 | + protected function writeBagValue(ResourceType & $resourceType, $result) |
|
505 | 505 | { |
506 | 506 | assert(null === $result || is_array($result), 'Bag parameter must be null or array'); |
507 | 507 | $typeKind = $resourceType->getResourceTypeKind(); |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | * @param string|null $propertyName |
535 | 535 | * @return ODataPropertyContent |
536 | 536 | */ |
537 | - protected function writeComplexValue(ResourceType &$resourceType, &$result, $propertyName = null) |
|
537 | + protected function writeComplexValue(ResourceType & $resourceType, &$result, $propertyName = null) |
|
538 | 538 | { |
539 | 539 | assert(is_object($result), 'Supplied $customObject must be an object'); |
540 | 540 | |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | $skipToken = $internalOrderByInfo->buildSkipTokenValue($lastObject); |
689 | 689 | assert(null !== $skipToken, '!is_null($skipToken)'); |
690 | 690 | $token = (1 < $numSegments) ? '$skiptoken=' : '$skip='; |
691 | - $skipToken = '?'.$queryParameterString.$token.$skipToken; |
|
691 | + $skipToken = '?' . $queryParameterString . $token . $skipToken; |
|
692 | 692 | |
693 | 693 | return $skipToken; |
694 | 694 | } |
@@ -938,7 +938,7 @@ discard block |
||
938 | 938 | * |
939 | 939 | * @return string |
940 | 940 | */ |
941 | - private function primitiveToString(IType &$type, $primitiveValue) |
|
941 | + private function primitiveToString(IType & $type, $primitiveValue) |
|
942 | 942 | { |
943 | 943 | if ($type instanceof Boolean) { |
944 | 944 | $stringValue = (true === $primitiveValue) ? 'true' : 'false'; |
@@ -963,6 +963,6 @@ discard block |
||
963 | 963 | if (28 < $resourceKind) { |
964 | 964 | return false; |
965 | 965 | } |
966 | - return 0 == ($resourceKind % 4); |
|
966 | + return 0 == ($resourceKind%4); |
|
967 | 967 | } |
968 | 968 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | * @throws InvalidOperationException |
51 | 51 | * @return bool true if the segment was push, false otherwise |
52 | 52 | */ |
53 | - public function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper) |
|
53 | + public function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper) |
|
54 | 54 | { |
55 | 55 | if (!is_string($segmentName)) { |
56 | 56 | throw new InvalidOperationException('segmentName must be a string'); |
@@ -681,7 +681,7 @@ discard block |
||
681 | 681 | */ |
682 | 682 | protected function compareETag( |
683 | 683 | &$entryObject, |
684 | - ResourceType &$resourceType, |
|
684 | + ResourceType & $resourceType, |
|
685 | 685 | &$needToSerializeResponse |
686 | 686 | ) { |
687 | 687 | $needToSerializeResponse = true; |
@@ -775,7 +775,7 @@ discard block |
||
775 | 775 | * for use in a URI) there are etag properties, NULL if |
776 | 776 | * there is no etag property |
777 | 777 | */ |
778 | - protected function getETagForEntry(&$entryObject, ResourceType &$resourceType) |
|
778 | + protected function getETagForEntry(&$entryObject, ResourceType & $resourceType) |
|
779 | 779 | { |
780 | 780 | $eTag = null; |
781 | 781 | $comma = null; |
@@ -24,7 +24,7 @@ |
||
24 | 24 | $namespaceName = implode('.', $bitz); |
25 | 25 | } |
26 | 26 | $rawType = $entity->getBaseType(); |
27 | - $metaNamespace = $meta->getContainerNamespace().'.'; |
|
27 | + $metaNamespace = $meta->getContainerNamespace() . '.'; |
|
28 | 28 | |
29 | 29 | $rawType = (null !== $rawType) ? str_replace($metaNamespace, '', $rawType) : null; |
30 | 30 | $baseType = null === $rawType ? null : $meta->resolveResourceType($rawType); |
@@ -627,7 +627,7 @@ |
||
627 | 627 | $many = false |
628 | 628 | ) { |
629 | 629 | $allowedMult = ['*', '1', '0..1']; |
630 | - $backMultArray = [ '*' => '*', '1' => '0..1', '0..1' => '1']; |
|
630 | + $backMultArray = ['*' => '*', '1' => '0..1', '0..1' => '1']; |
|
631 | 631 | $this->checkInstanceProperty($name, $sourceResourceType); |
632 | 632 | |
633 | 633 | // check that property and resource name don't up and collide - would violate OData spec |