@@ -116,8 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | $response = ''; |
118 | 118 | $splitter = false === $this->changeSetBoundary ? |
119 | - '' : |
|
120 | - '--' . $this->changeSetBoundary . $ODataEOL; |
|
119 | + '' : '--' . $this->changeSetBoundary . $ODataEOL; |
|
121 | 120 | $raw = $this->getRawRequests(); |
122 | 121 | foreach ($raw as $contentID => &$workingObject) { |
123 | 122 | $headers = $workingObject->outgoingResponse()->getHeaders(); |
@@ -139,16 +138,14 @@ discard block |
||
139 | 138 | } |
140 | 139 | $response .= trim($splitter); |
141 | 140 | $response .= false === $this->changeSetBoundary ? |
142 | - $ODataEOL : |
|
143 | - '--' . $ODataEOL; |
|
141 | + $ODataEOL : '--' . $ODataEOL; |
|
144 | 142 | $response = 'Content-Length: ' . |
145 | 143 | strlen($response) . |
146 | 144 | $ODataEOL . |
147 | 145 | $ODataEOL . |
148 | 146 | $response; |
149 | 147 | $response = false === $this->changeSetBoundary ? |
150 | - $response : |
|
151 | - 'Content-Type: multipart/mixed; boundary=' . |
|
148 | + $response : 'Content-Type: multipart/mixed; boundary=' . |
|
152 | 149 | $this->changeSetBoundary . |
153 | 150 | $ODataEOL . |
154 | 151 | $response; |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | $inboundRequestHeaders = $this->setupHeaders(strtok("\n")); |
22 | 22 | |
23 | - $RequestBody = trim($RequestBody); |
|
23 | + $RequestBody = trim($RequestBody); |
|
24 | 24 | |
25 | 25 | $host = $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? $_SERVER['SERVER_ADDR'] ?? 'localhost'; |
26 | 26 | $protocol = $_SERVER['PROTOCOL'] = isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) ? 'https' : 'http'; |
@@ -414,7 +414,7 @@ |
||
414 | 414 | |
415 | 415 | $textLen = strlen($text); |
416 | 416 | if ($textIndex >= $textLen || '.' != $text[$textIndex]) { |
417 | - return $qualityValue * 1000; |
|
417 | + return $qualityValue*1000; |
|
418 | 418 | } |
419 | 419 | |
420 | 420 | ++$textIndex; |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $pageSize = $this->getService()->getConfiguration()->getEntitySetPageSize( |
137 | 137 | $this->getRequest()->getTargetResourceSetWrapper()->getResourceSet() |
138 | 138 | ); |
139 | - $requestTop = $this->getRequest()->getTopOptionCount() ?? PHP_INT_MAX ; |
|
139 | + $requestTop = $this->getRequest()->getTopOptionCount() ?? PHP_INT_MAX; |
|
140 | 140 | $entryObjects->hasMore &= $requestTop > $pageSize; |
141 | 141 | |
142 | 142 | $this->loadStackIfEmpty(); |
@@ -155,8 +155,7 @@ discard block |
||
155 | 155 | $request->getIdentifier() |
156 | 156 | ), |
157 | 157 | $request->queryType == QueryType::ENTITIES_WITH_COUNT() ? |
158 | - $request->getCountValue() : |
|
159 | - null, |
|
158 | + $request->getCountValue() : null, |
|
160 | 159 | $entryObjects->hasMore ? new ODataLink( |
161 | 160 | ODataConstants::ATOM_LINK_NEXT_ATTRIBUTE_STRING, |
162 | 161 | null, |
@@ -737,7 +736,7 @@ discard block |
||
737 | 736 | return false; |
738 | 737 | } |
739 | 738 | |
740 | - return 0 == ($value % 4); |
|
739 | + return 0 == ($value%4); |
|
741 | 740 | } |
742 | 741 | |
743 | 742 | /** |
@@ -868,7 +867,7 @@ discard block |
||
868 | 867 | ODataConstants::HTTPQUERY_STRING_EXPAND, |
869 | 868 | ODataConstants::HTTPQUERY_STRING_ORDERBY, |
870 | 869 | ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
871 | - ODataConstants::HTTPQUERY_STRING_SELECT,] as $queryOption) { |
|
870 | + ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) { |
|
872 | 871 | $value = $this->getService()->getHost()->getQueryStringItem($queryOption); |
873 | 872 | if (null !== $value) { |
874 | 873 | if (null !== $queryParameterString) { |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | assert($odataModelInstance instanceof ODataURLCollection, '$odataModelInstance instanceof ODataURLCollection'); |
516 | 516 | } else { |
517 | 517 | $odataModelInstance = $objectModelSerializer->writeTopLevelElements($entryObjects); |
518 | - assert ($odataModelInstance instanceof ODataFeed , '!$odataModelInstance instanceof ODataFeed'); |
|
518 | + assert($odataModelInstance instanceof ODataFeed, '!$odataModelInstance instanceof ODataFeed'); |
|
519 | 519 | } |
520 | 520 | } else { |
521 | 521 | // Code path for entity, complex, bag, resource reference link, |
@@ -637,7 +637,7 @@ discard block |
||
637 | 637 | MimeTypes::MIME_APPLICATION_JSON_FULL_META, |
638 | 638 | MimeTypes::MIME_APPLICATION_JSON_NO_META, |
639 | 639 | MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META, |
640 | - MimeTypes::MIME_APPLICATION_JSON_VERBOSE,]; |
|
640 | + MimeTypes::MIME_APPLICATION_JSON_VERBOSE, ]; |
|
641 | 641 | |
642 | 642 | // The Accept request-header field specifies media types which are acceptable for the response |
643 | 643 | |
@@ -665,15 +665,15 @@ discard block |
||
665 | 665 | $availableMimeTypesByTarget = [ |
666 | 666 | TargetKind::METADATA()->getValue() => [MimeTypes::MIME_APPLICATION_XML], |
667 | 667 | TargetKind::SERVICE_DIRECTORY()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_ATOMSERVICE], $baseMimeTypes), |
668 | - TargetKind::PRIMITIVE()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML,], $baseMimeTypes), |
|
669 | - TargetKind::COMPLEX_OBJECT()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML,], $baseMimeTypes), |
|
670 | - TargetKind::BAG()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML,], $baseMimeTypes), |
|
671 | - TargetKind::LINK()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML,], $baseMimeTypes), |
|
668 | + TargetKind::PRIMITIVE()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML, ], $baseMimeTypes), |
|
669 | + TargetKind::COMPLEX_OBJECT()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML, ], $baseMimeTypes), |
|
670 | + TargetKind::BAG()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML, ], $baseMimeTypes), |
|
671 | + TargetKind::LINK()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML, ], $baseMimeTypes), |
|
672 | 672 | TargetKind::SINGLETON()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_ATOM], $baseMimeTypes), |
673 | 673 | TargetKind::RESOURCE()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_ATOM], $baseMimeTypes), |
674 | 674 | ]; |
675 | 675 | |
676 | - if($targetKind && array_key_exists($targetKind->getValue(),$availableMimeTypesByTarget)){ |
|
676 | + if ($targetKind && array_key_exists($targetKind->getValue(), $availableMimeTypesByTarget)) { |
|
677 | 677 | return HttpProcessUtility::selectMimeType($requestAcceptText, $availableMimeTypesByTarget[$targetKind->getValue()]); |
678 | 678 | |
679 | 679 | } |
@@ -599,8 +599,7 @@ discard block |
||
599 | 599 | //Note: Response content type can be null for named stream |
600 | 600 | if ($hasResponseBody && null !== $responseContentType && |
601 | 601 | TargetKind::MEDIA_RESOURCE() != $request->getTargetKind() && |
602 | - MimeTypes::MIME_APPLICATION_OCTETSTREAM != $responseContentType) |
|
603 | - { |
|
602 | + MimeTypes::MIME_APPLICATION_OCTETSTREAM != $responseContentType) { |
|
604 | 603 | //append charset for everything except: |
605 | 604 | //stream resources as they have their own content type |
606 | 605 | //binary properties (they content type will be App Octet for those...is this a good way? |
@@ -673,7 +672,7 @@ discard block |
||
673 | 672 | TargetKind::RESOURCE()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_ATOM], $baseMimeTypes), |
674 | 673 | ]; |
675 | 674 | |
676 | - if($targetKind && array_key_exists($targetKind->getValue(),$availableMimeTypesByTarget)){ |
|
675 | + if($targetKind && array_key_exists($targetKind->getValue(),$availableMimeTypesByTarget)) { |
|
677 | 676 | return HttpProcessUtility::selectMimeType($requestAcceptText, $availableMimeTypesByTarget[$targetKind->getValue()]); |
678 | 677 | |
679 | 678 | } |