@@ -56,7 +56,7 @@ |
||
| 56 | 56 | public function getResponse() |
| 57 | 57 | { |
| 58 | 58 | $response = ''; |
| 59 | - $splitter = '--' . $this->batchBoundary . "\r\n"; |
|
| 59 | + $splitter = '--' . $this->batchBoundary . "\r\n"; |
|
| 60 | 60 | $raw = $this->changeSetProcessors; |
| 61 | 61 | foreach ($raw as $contentID => &$workingObject) { |
| 62 | 62 | $response .= $splitter; |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | protected $changeSetBoundary; |
| 14 | 14 | protected $rawRequests = []; |
| 15 | 15 | protected $service; |
| 16 | - protected $contentIDToLocationLookup =[]; |
|
| 16 | + protected $contentIDToLocationLookup = []; |
|
| 17 | 17 | |
| 18 | 18 | public function __construct(BaseService $service, $body) |
| 19 | 19 | { |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | $this->processSubRequest($workingObject); |
| 51 | 51 | if ('GET' != $workingObject->RequestVerb && !Str::contains($workingObject->RequestURL, '/$links/')) { |
| 52 | 52 | if (null === $workingObject->Response->getHeaders()['Location']) { |
| 53 | - $msg = 'Location header not set in subrequest response for '. $workingObject->RequestVerb |
|
| 54 | - .' request url '.$workingObject->RequestURL; |
|
| 53 | + $msg = 'Location header not set in subrequest response for ' . $workingObject->RequestVerb |
|
| 54 | + .' request url ' . $workingObject->RequestURL; |
|
| 55 | 55 | throw new \Exception($msg); |
| 56 | 56 | } |
| 57 | 57 | $this->contentIDToLocationLookup[$contentID] = $workingObject->Response->getHeaders()['Location']; |
@@ -71,8 +71,8 @@ discard block |
||
| 71 | 71 | $response .= 'Content-Type: application/http' . "\r\n"; |
| 72 | 72 | $response .= 'Content-Transfer-Encoding: binary' . "\r\n"; |
| 73 | 73 | $response .= "\r\n"; |
| 74 | - $response .= 'HTTP/1.1 '.$headers['Status']."\r\n"; |
|
| 75 | - $response .= 'Content-ID: '.$contentID . "\r\n"; |
|
| 74 | + $response .= 'HTTP/1.1 ' . $headers['Status'] . "\r\n"; |
|
| 75 | + $response .= 'Content-ID: ' . $contentID . "\r\n"; |
|
| 76 | 76 | |
| 77 | 77 | foreach ($headers as $headerName => $headerValue) { |
| 78 | 78 | if (null !== $headerValue) { |
@@ -86,8 +86,7 @@ discard block |
||
| 86 | 86 | $response .= false === $this->changeSetBoundary ? "\r\n" : "--\r\n"; |
| 87 | 87 | $response = 'Content-Length: ' . strlen($response) . "\r\n\r\n" . $response; |
| 88 | 88 | $response = false === $this->changeSetBoundary ? |
| 89 | - $response : |
|
| 90 | - 'Content-Type: multipart/mixed; boundary=' . $this->changeSetBoundary . "\r\n" . $response; |
|
| 89 | + $response : 'Content-Type: multipart/mixed; boundary=' . $this->changeSetBoundary . "\r\n" . $response; |
|
| 91 | 90 | return $response; |
| 92 | 91 | } |
| 93 | 92 | |
@@ -141,7 +140,7 @@ discard block |
||
| 141 | 140 | } |
| 142 | 141 | $headerSides = explode(':', $line); |
| 143 | 142 | if (count($headerSides) != 2) { |
| 144 | - throw new \Exception('Malformed header line: '.$line); |
|
| 143 | + throw new \Exception('Malformed header line: ' . $line); |
|
| 145 | 144 | } |
| 146 | 145 | if (strtolower(trim($headerSides[0])) == strtolower('Content-ID')) { |
| 147 | 146 | $contentID = trim($headerSides[1]); |
@@ -168,7 +167,7 @@ discard block |
||
| 168 | 167 | if ($contentIDinit == $contentID) { |
| 169 | 168 | $contentIDinit--; |
| 170 | 169 | } |
| 171 | - $this->rawRequests[$contentID] = (object)[ |
|
| 170 | + $this->rawRequests[$contentID] = (object) [ |
|
| 172 | 171 | 'RequestVerb' => $requestPathParts[0], |
| 173 | 172 | 'RequestURL' => $requestPathParts[1], |
| 174 | 173 | 'ServerParams' => $serverParts, |
@@ -207,9 +207,9 @@ |
||
| 207 | 207 | $keyPredicate[strlen($keyPredicate) - 2] = ' '; |
| 208 | 208 | } else { |
| 209 | 209 | $idBits = explode('/', $id); |
| 210 | - $keyRaw = $idBits[count($idBits)-1]; |
|
| 210 | + $keyRaw = $idBits[count($idBits) - 1]; |
|
| 211 | 211 | $rawBits = explode('(', $keyRaw, 2); |
| 212 | - $rawBits = explode(')', $rawBits[count($rawBits)-1]); |
|
| 212 | + $rawBits = explode(')', $rawBits[count($rawBits) - 1]); |
|
| 213 | 213 | $keyPredicate = $rawBits[0]; |
| 214 | 214 | } |
| 215 | 215 | $keyPredicate = trim($keyPredicate); |
@@ -567,7 +567,7 @@ |
||
| 567 | 567 | $comma = null; |
| 568 | 568 | foreach ($keys as $keyName => $resourceProperty) { |
| 569 | 569 | if (!array_key_exists($keyName, $namedKeys)) { |
| 570 | - $msg = 'Key predicate '.$keyName.' not present in named values'; |
|
| 570 | + $msg = 'Key predicate ' . $keyName . ' not present in named values'; |
|
| 571 | 571 | throw new \InvalidArgumentException($msg); |
| 572 | 572 | } |
| 573 | 573 | $keyType = $resourceProperty->getInstanceType(); |
@@ -174,7 +174,7 @@ |
||
| 174 | 174 | if (null !== $type) { |
| 175 | 175 | $rawTerm = $type->term; |
| 176 | 176 | $termArray = explode('.', $rawTerm); |
| 177 | - $final = $termArray[count($termArray)-1]; |
|
| 177 | + $final = $termArray[count($termArray) - 1]; |
|
| 178 | 178 | $this->resourceSetName = MetadataManager::getResourceSetNameFromResourceType($final); |
| 179 | 179 | } |
| 180 | 180 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | $namespaceName = implode('.', $bitz); |
| 25 | 25 | } |
| 26 | 26 | $rawType = $entity->getBaseType(); |
| 27 | - $metaNamespace = $namespaceName.'.'; |
|
| 27 | + $metaNamespace = $namespaceName . '.'; |
|
| 28 | 28 | |
| 29 | 29 | $rawType = (null !== $rawType) ? str_replace($metaNamespace, '', $rawType) : null; |
| 30 | 30 | $baseType = null === $rawType ? null : $meta->resolveResourceType($rawType); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | $this->service = $service; |
| 104 | 104 | $this->request = $request; |
| 105 | 105 | $this->absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri()->getUrlAsString(); |
| 106 | - $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/').'/'; |
|
| 106 | + $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/') . '/'; |
|
| 107 | 107 | $this->stack = new SegmentStack($request); |
| 108 | 108 | $this->complexTypeInstanceCollection = []; |
| 109 | 109 | $this->updated = Carbon::now(); |
@@ -153,8 +153,8 @@ discard block |
||
| 153 | 153 | $nonRelCount = count($nonRelProp); |
| 154 | 154 | assert( |
| 155 | 155 | $rawCount == $relCount + $nonRelCount, |
| 156 | - 'Raw property count '.$rawCount.', does not equal sum of relProp count, '.$relCount |
|
| 157 | - .', and nonRelPropCount,'.$nonRelCount |
|
| 156 | + 'Raw property count ' . $rawCount . ', does not equal sum of relProp count, ' . $relCount |
|
| 157 | + .', and nonRelPropCount,' . $nonRelCount |
|
| 158 | 158 | ); |
| 159 | 159 | |
| 160 | 160 | // now mask off against projNodes |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $resourceType, |
| 179 | 179 | $resourceSet->getName() |
| 180 | 180 | ); |
| 181 | - $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri; |
|
| 181 | + $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri; |
|
| 182 | 182 | |
| 183 | 183 | list($mediaLink, $mediaLinks) = $this->writeMediaData( |
| 184 | 184 | $entryObject->results, |
@@ -202,11 +202,11 @@ discard block |
||
| 202 | 202 | ); |
| 203 | 203 | $propTail = ResourcePropertyKind::RESOURCE_REFERENCE == $propKind ? 'entry' : 'feed'; |
| 204 | 204 | $nuLink->isCollection = 'feed' === $propTail; |
| 205 | - $propType = 'application/atom+xml;type='.$propTail; |
|
| 205 | + $propType = 'application/atom+xml;type=' . $propTail; |
|
| 206 | 206 | $propName = $prop->getName(); |
| 207 | 207 | $nuLink->title = $propName; |
| 208 | - $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE.$propName; |
|
| 209 | - $nuLink->url = $relativeUri.'/'.$propName; |
|
| 208 | + $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propName; |
|
| 209 | + $nuLink->url = $relativeUri . '/' . $propName; |
|
| 210 | 210 | $nuLink->type = $propType; |
| 211 | 211 | |
| 212 | 212 | $shouldExpand = $this->shouldExpandSegment($propName); |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | $newCount = count($this->lightStack); |
| 242 | 242 | assert( |
| 243 | 243 | $newCount == $stackCount, |
| 244 | - 'Should have '.$stackCount.'elements in stack, have '.$newCount.'elements' |
|
| 244 | + 'Should have ' . $stackCount . 'elements in stack, have ' . $newCount . 'elements' |
|
| 245 | 245 | ); |
| 246 | 246 | --$this->lightStack[$newCount - 1]['count']; |
| 247 | 247 | if (0 == $this->lightStack[$newCount - 1]['count']) { |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | $segment = $this->getNextLinkUri($lastObject); |
| 317 | 317 | $nextLink = new ODataLink(); |
| 318 | 318 | $nextLink->name = ODataConstants::ATOM_LINK_NEXT_ATTRIBUTE_STRING; |
| 319 | - $nextLink->url = rtrim($this->absoluteServiceUri, '/').'/'.$stackSegment.$segment; |
|
| 319 | + $nextLink->url = rtrim($this->absoluteServiceUri, '/') . '/' . $stackSegment . $segment; |
|
| 320 | 320 | $odata->nextPageLink = $nextLink; |
| 321 | 321 | } |
| 322 | 322 | |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | $this->getCurrentResourceSetWrapper()->getName() |
| 342 | 342 | ); |
| 343 | 343 | |
| 344 | - $url->url = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri; |
|
| 344 | + $url->url = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri; |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | return $url; |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | $segment = $this->getNextLinkUri($lastObject); |
| 378 | 378 | $nextLink = new ODataLink(); |
| 379 | 379 | $nextLink->name = ODataConstants::ATOM_LINK_NEXT_ATTRIBUTE_STRING; |
| 380 | - $nextLink->url = rtrim($this->absoluteServiceUri, '/').'/'.$stackSegment.$segment; |
|
| 380 | + $nextLink->url = rtrim($this->absoluteServiceUri, '/') . '/' . $stackSegment . $segment; |
|
| 381 | 381 | $nextLink->url = ltrim($nextLink->url, '/'); |
| 382 | 382 | $urls->nextPageLink = $nextLink; |
| 383 | 383 | } |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | $propertyContent = new ODataPropertyContent(); |
| 437 | 437 | $odataProperty = new ODataProperty(); |
| 438 | 438 | $odataProperty->name = $propertyName; |
| 439 | - $odataProperty->typeName = 'Collection('.$resourceType->getFullName().')'; |
|
| 439 | + $odataProperty->typeName = 'Collection(' . $resourceType->getFullName() . ')'; |
|
| 440 | 440 | $odataProperty->value = $this->writeBagValue($resourceType, $result); |
| 441 | 441 | |
| 442 | 442 | $propertyContent->properties[$propertyName] = $odataProperty; |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | { |
| 522 | 522 | $this->service = $service; |
| 523 | 523 | $this->absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri()->getUrlAsString(); |
| 524 | - $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/').'/'; |
|
| 524 | + $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/') . '/'; |
|
| 525 | 525 | } |
| 526 | 526 | |
| 527 | 527 | /** |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | $typeName = $resourceType->getName(); |
| 672 | 672 | $keyProperties = $resourceType->getKeyProperties(); |
| 673 | 673 | assert(0 != count($keyProperties), 'count($keyProperties) == 0'); |
| 674 | - $keyString = $containerName.'('; |
|
| 674 | + $keyString = $containerName . '('; |
|
| 675 | 675 | $comma = null; |
| 676 | 676 | foreach ($keyProperties as $keyName => $resourceProperty) { |
| 677 | 677 | $keyType = $resourceProperty->getInstanceType(); |
@@ -684,7 +684,7 @@ discard block |
||
| 684 | 684 | } |
| 685 | 685 | |
| 686 | 686 | $keyValue = $keyType->convertToOData($keyValue); |
| 687 | - $keyString .= $comma.$keyName.'='.$keyValue; |
|
| 687 | + $keyString .= $comma . $keyName . '=' . $keyValue; |
|
| 688 | 688 | $comma = ','; |
| 689 | 689 | } |
| 690 | 690 | |
@@ -753,7 +753,7 @@ discard block |
||
| 753 | 753 | $skipToken = $internalOrderByInfo->buildSkipTokenValue($lastObject); |
| 754 | 754 | assert(null !== $skipToken, '!is_null($skipToken)'); |
| 755 | 755 | $token = (1 < $numSegments) ? '$skiptoken=' : '$skip='; |
| 756 | - $skipToken = '?'.$queryParameterString.$token.$skipToken; |
|
| 756 | + $skipToken = '?' . $queryParameterString . $token . $skipToken; |
|
| 757 | 757 | |
| 758 | 758 | return $skipToken; |
| 759 | 759 | } |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | $mediaLink = null; |
| 776 | 776 | if ($resourceType->isMediaLinkEntry()) { |
| 777 | 777 | $eTag = $streamProviderWrapper->getStreamETag2($entryObject, null, $context); |
| 778 | - $mediaLink = new ODataMediaLink($type, '/$value', $relativeUri.'/$value', '*/*', $eTag, 'edit-media'); |
|
| 778 | + $mediaLink = new ODataMediaLink($type, '/$value', $relativeUri . '/$value', '*/*', $eTag, 'edit-media'); |
|
| 779 | 779 | } |
| 780 | 780 | $mediaLinks = []; |
| 781 | 781 | if ($resourceType->hasNamedStream()) { |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | $nuLink->expandedResult->selfLink->title = $propName; |
| 857 | 857 | $nuLink->expandedResult->selfLink->url = $nuLink->url; |
| 858 | 858 | $nuLink->expandedResult->title = new ODataTitle($propName); |
| 859 | - $nuLink->expandedResult->id = rtrim($this->absoluteServiceUri, '/').'/'.$nuLink->url; |
|
| 859 | + $nuLink->expandedResult->id = rtrim($this->absoluteServiceUri, '/') . '/' . $nuLink->url; |
|
| 860 | 860 | } |
| 861 | 861 | } |
| 862 | 862 | |
@@ -937,10 +937,10 @@ discard block |
||
| 937 | 937 | $value = $this->getService()->getHost()->getQueryStringItem($queryOption); |
| 938 | 938 | if (null !== $value) { |
| 939 | 939 | if (null !== $queryParameterString) { |
| 940 | - $queryParameterString = $queryParameterString.'&'; |
|
| 940 | + $queryParameterString = $queryParameterString . '&'; |
|
| 941 | 941 | } |
| 942 | 942 | |
| 943 | - $queryParameterString .= $queryOption.'='.$value; |
|
| 943 | + $queryParameterString .= $queryOption . '=' . $value; |
|
| 944 | 944 | } |
| 945 | 945 | } |
| 946 | 946 | |
@@ -952,7 +952,7 @@ discard block |
||
| 952 | 952 | $queryParameterString .= '&'; |
| 953 | 953 | } |
| 954 | 954 | |
| 955 | - $queryParameterString .= ODataConstants::HTTPQUERY_STRING_TOP.'='.$remainingCount; |
|
| 955 | + $queryParameterString .= ODataConstants::HTTPQUERY_STRING_TOP . '=' . $remainingCount; |
|
| 956 | 956 | } |
| 957 | 957 | } |
| 958 | 958 | |
@@ -984,7 +984,7 @@ discard block |
||
| 984 | 984 | $nonNull = null !== $result; |
| 985 | 985 | $subProp = new ODataProperty(); |
| 986 | 986 | $subProp->name = strval($corn); |
| 987 | - $subProp->typeName = $typePrepend.$resource->getFullName().$typeAppend; |
|
| 987 | + $subProp->typeName = $typePrepend . $resource->getFullName() . $typeAppend; |
|
| 988 | 988 | |
| 989 | 989 | if ($nonNull && is_array($result)) { |
| 990 | 990 | $subProp->value = $this->writeBagValue($resource, $result); |
@@ -1047,6 +1047,6 @@ discard block |
||
| 1047 | 1047 | return false; |
| 1048 | 1048 | } |
| 1049 | 1049 | |
| 1050 | - return 0 == ($resourceKind % 4); |
|
| 1050 | + return 0 == ($resourceKind%4); |
|
| 1051 | 1051 | } |
| 1052 | 1052 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | */ |
| 94 | 94 | public function setContentType($value) |
| 95 | 95 | { |
| 96 | - $this->headers[ODataConstants::HTTPRESPONSE_HEADER_CONTENTTYPE] = $value.';charset=UTF-8'; |
|
| 96 | + $this->headers[ODataConstants::HTTPRESPONSE_HEADER_CONTENTTYPE] = $value . ';charset=UTF-8'; |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | /** |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | public function setStatusCode($value) |
| 166 | 166 | { |
| 167 | 167 | $rawCode = substr($value, 0, 3); |
| 168 | - assert(is_numeric($rawCode), 'Raw HTTP status code is not numeric - is '.$rawCode); |
|
| 168 | + assert(is_numeric($rawCode), 'Raw HTTP status code is not numeric - is ' . $rawCode); |
|
| 169 | 169 | $this->headers[ODataConstants::HTTPRESPONSE_HEADER_STATUS] = $value; |
| 170 | 170 | $this->headers[ODataConstants::HTTPRESPONSE_HEADER_STATUS_CODE] = intval($rawCode); |
| 171 | 171 | } |