|
@@ -560,7 +560,7 @@ discard block |
|
|
block discarded – undo |
|
560
|
560
|
$requestProperty->getName(), |
|
561
|
561
|
$targetResourceType |
|
562
|
562
|
); |
|
563
|
|
- } elseif ($requestTargetKind->isPRIMITIVE()){ |
|
|
563
|
+ } elseif ($requestTargetKind->isPRIMITIVE()) { |
|
564
|
564
|
$odataModelInstance = $objectModelSerializer->writeTopLevelPrimitive( |
|
565
|
565
|
$result, |
|
566
|
566
|
$requestProperty |
|
@@ -580,8 +580,7 @@ discard block |
|
|
block discarded – undo |
|
580
|
580
|
//Note: Response content type can be null for named stream |
|
581
|
581
|
if ($hasResponseBody && null !== $responseContentType && |
|
582
|
582
|
TargetKind::MEDIA_RESOURCE() != $request->getTargetKind() && |
|
583
|
|
- MimeTypes::MIME_APPLICATION_OCTETSTREAM != $responseContentType) |
|
584
|
|
- { |
|
|
583
|
+ MimeTypes::MIME_APPLICATION_OCTETSTREAM != $responseContentType) { |
|
585
|
584
|
//append charset for everything except: |
|
586
|
585
|
//stream resources as they have their own content type |
|
587
|
586
|
//binary properties (they content type will be App Octet for those...is this a good way? |
|
@@ -654,7 +653,7 @@ discard block |
|
|
block discarded – undo |
|
654
|
653
|
TargetKind::RESOURCE()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_ATOM], $baseMimeTypes), |
|
655
|
654
|
]; |
|
656
|
655
|
|
|
657
|
|
- if($targetKind && array_key_exists($targetKind->getValue(),$availableMimeTypesByTarget)){ |
|
|
656
|
+ if($targetKind && array_key_exists($targetKind->getValue(),$availableMimeTypesByTarget)) { |
|
658
|
657
|
return HttpProcessUtility::selectMimeType($requestAcceptText, $availableMimeTypesByTarget[$targetKind->getValue()]); |
|
659
|
658
|
|
|
660
|
659
|
} |
Please login to merge, or discard this patch.