@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | protected $changeSetBoundary; |
| 21 | 21 | protected $rawRequests = []; |
| 22 | 22 | protected $service; |
| 23 | - protected $contentIDToLocationLookup =[]; |
|
| 23 | + protected $contentIDToLocationLookup = []; |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * ChangeSetParser constructor. |
@@ -77,8 +77,7 @@ discard block |
||
| 77 | 77 | { |
| 78 | 78 | $response = ''; |
| 79 | 79 | $splitter = false === $this->changeSetBoundary ? |
| 80 | - '' : |
|
| 81 | - '--' . $this->changeSetBoundary . $this->getService()->getConfiguration()->getLineEndings(); |
|
| 80 | + '' : '--' . $this->changeSetBoundary . $this->getService()->getConfiguration()->getLineEndings(); |
|
| 82 | 81 | $raw = $this->getRawRequests(); |
| 83 | 82 | foreach ($raw as $contentID => &$workingObject) { |
| 84 | 83 | $headers = $workingObject->Response->getHeaders(); |
@@ -100,16 +99,14 @@ discard block |
||
| 100 | 99 | } |
| 101 | 100 | $response .= trim($splitter); |
| 102 | 101 | $response .= false === $this->changeSetBoundary ? |
| 103 | - $this->getService()->getConfiguration()->getLineEndings() : |
|
| 104 | - '--' . $this->getService()->getConfiguration()->getLineEndings(); |
|
| 102 | + $this->getService()->getConfiguration()->getLineEndings() : '--' . $this->getService()->getConfiguration()->getLineEndings(); |
|
| 105 | 103 | $response = 'Content-Length: ' . |
| 106 | 104 | strlen($response) . |
| 107 | 105 | $this->getService()->getConfiguration()->getLineEndings() . |
| 108 | 106 | $this->getService()->getConfiguration()->getLineEndings() . |
| 109 | 107 | $response; |
| 110 | 108 | $response = false === $this->changeSetBoundary ? |
| 111 | - $response : |
|
| 112 | - 'Content-Type: multipart/mixed; boundary=' . |
|
| 109 | + $response : 'Content-Type: multipart/mixed; boundary=' . |
|
| 113 | 110 | $this->changeSetBoundary . |
| 114 | 111 | $this->getService()->getConfiguration()->getLineEndings() . |
| 115 | 112 | $response; |
@@ -121,7 +118,7 @@ discard block |
||
| 121 | 118 | */ |
| 122 | 119 | public function handleData() |
| 123 | 120 | { |
| 124 | - $firstLine = trim(strtok($this->getData(), $this->getService()->getConfiguration()->getLineEndings()));// with trim matches both crlf and lf |
|
| 121 | + $firstLine = trim(strtok($this->getData(), $this->getService()->getConfiguration()->getLineEndings())); // with trim matches both crlf and lf |
|
| 125 | 122 | $this->changeSetBoundary = substr($firstLine, 40); |
| 126 | 123 | |
| 127 | 124 | $prefix = 'HTTP_'; |
@@ -197,7 +194,7 @@ discard block |
||
| 197 | 194 | $contentIDinit--; |
| 198 | 195 | } |
| 199 | 196 | |
| 200 | - $this->rawRequests[$contentID] = (object)[ |
|
| 197 | + $this->rawRequests[$contentID] = (object) [ |
|
| 201 | 198 | 'RequestVerb' => $requestPathParts[0], |
| 202 | 199 | 'RequestURL' => $requestPathParts[1], |
| 203 | 200 | 'ServerParams' => $serverParts, |
@@ -400,16 +400,16 @@ discard block |
||
| 400 | 400 | |
| 401 | 401 | //We always register the v1 stuff |
| 402 | 402 | $registry->register(new JsonODataV1Writer($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput())); |
| 403 | - $registry->register(new AtomODataWriter($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput(),$serviceURI)); |
|
| 403 | + $registry->register(new AtomODataWriter($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput(), $serviceURI)); |
|
| 404 | 404 | |
| 405 | 405 | if (-1 < $serviceVersion->compare(Version::v2())) { |
| 406 | 406 | $registry->register(new JsonODataV2Writer($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput())); |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | 409 | if (-1 < $serviceVersion->compare(Version::v3())) { |
| 410 | - $registry->register(new JsonLightODataWriter($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput(),JsonLightMetadataLevel::NONE(), $serviceURI)); |
|
| 411 | - $registry->register(new JsonLightODataWriter($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput(),JsonLightMetadataLevel::MINIMAL(), $serviceURI)); |
|
| 412 | - $registry->register(new JsonLightODataWriter($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput(),JsonLightMetadataLevel::FULL(), $serviceURI)); |
|
| 410 | + $registry->register(new JsonLightODataWriter($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput(), JsonLightMetadataLevel::NONE(), $serviceURI)); |
|
| 411 | + $registry->register(new JsonLightODataWriter($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput(), JsonLightMetadataLevel::MINIMAL(), $serviceURI)); |
|
| 412 | + $registry->register(new JsonLightODataWriter($this->getConfiguration()->getLineEndings(), $this->getConfiguration()->getPrettyOutput(), JsonLightMetadataLevel::FULL(), $serviceURI)); |
|
| 413 | 413 | } |
| 414 | 414 | } |
| 415 | 415 | |
@@ -659,7 +659,7 @@ discard block |
||
| 659 | 659 | |
| 660 | 660 | //The response format can be dictated by the target resource kind. IE a $value will be different then expected |
| 661 | 661 | //getTargetKind doesn't deal with link resources directly and this can change things |
| 662 | - $targetKind = $request->isLinkUri() ? TargetKind::LINK() : $request->getTargetKind(); |
|
| 662 | + $targetKind = $request->isLinkUri() ? TargetKind::LINK() : $request->getTargetKind(); |
|
| 663 | 663 | |
| 664 | 664 | switch ($targetKind) { |
| 665 | 665 | case TargetKind::METADATA(): |