@@ -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 | } |