Completed
Pull Request — master (#267)
by Alex
08:55
created
src/POData/BaseService.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
 
539 539
                         // Resource is not modified so set status code
540 540
                         // to 304 => 'Not Modified'
541
-                        $status = $needToSerializeResponse ? HttpStatus::CODE_NOCONTENT : HttpStatus::CODE_NOT_MODIFIED ;
541
+                        $status = $needToSerializeResponse ? HttpStatus::CODE_NOCONTENT : HttpStatus::CODE_NOT_MODIFIED;
542 542
 
543 543
                         $this->getHost()->setResponseStatusCode($status);
544 544
                         $hasResponseBody = false;
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
                     }
551 551
                 } elseif ($requestTargetKind->isCOMPLEX_OBJECT() ||
552 552
                     $requestTargetKind->isBAG()) {
553
-                    if ( null === $requestProperty) {
553
+                    if (null === $requestProperty) {
554 554
                         throw new InvalidOperationException('Projected request property cannot be null');
555 555
                     }
556 556
 
@@ -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
@@ -618,7 +618,7 @@  discard block
 block discarded – undo
618 618
             MimeTypes::MIME_APPLICATION_JSON_FULL_META,
619 619
             MimeTypes::MIME_APPLICATION_JSON_NO_META,
620 620
             MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META,
621
-            MimeTypes::MIME_APPLICATION_JSON_VERBOSE,];
621
+            MimeTypes::MIME_APPLICATION_JSON_VERBOSE, ];
622 622
 
623 623
         // The Accept request-header field specifies media types which are acceptable for the response
624 624
 
@@ -646,15 +646,15 @@  discard block
 block discarded – undo
646 646
         $availableMimeTypesByTarget = [
647 647
             TargetKind::METADATA()->getValue()          => [MimeTypes::MIME_APPLICATION_XML],
648 648
             TargetKind::SERVICE_DIRECTORY()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_ATOMSERVICE], $baseMimeTypes),
649
-            TargetKind::PRIMITIVE()->getValue()              => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML,], $baseMimeTypes),
650
-            TargetKind::COMPLEX_OBJECT()->getValue()              => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML,], $baseMimeTypes),
651
-            TargetKind::BAG()->getValue()              => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML,], $baseMimeTypes),
652
-            TargetKind::LINK()->getValue()              => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML,], $baseMimeTypes),
649
+            TargetKind::PRIMITIVE()->getValue()              => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML, ], $baseMimeTypes),
650
+            TargetKind::COMPLEX_OBJECT()->getValue()              => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML, ], $baseMimeTypes),
651
+            TargetKind::BAG()->getValue()              => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML, ], $baseMimeTypes),
652
+            TargetKind::LINK()->getValue()              => array_merge([MimeTypes::MIME_APPLICATION_XML, MimeTypes::MIME_TEXTXML, ], $baseMimeTypes),
653 653
             TargetKind::SINGLETON()->getValue()          => array_merge([MimeTypes::MIME_APPLICATION_ATOM], $baseMimeTypes),
654 654
             TargetKind::RESOURCE()->getValue()          => array_merge([MimeTypes::MIME_APPLICATION_ATOM], $baseMimeTypes),
655 655
         ];
656 656
 
657
-        if($targetKind && array_key_exists($targetKind->getValue(),$availableMimeTypesByTarget)){
657
+        if ($targetKind && array_key_exists($targetKind->getValue(), $availableMimeTypesByTarget)) {
658 658
             return HttpProcessUtility::selectMimeType($requestAcceptText, $availableMimeTypesByTarget[$targetKind->getValue()]);
659 659
 
660 660
         }
Please login to merge, or discard this patch.
Braces   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -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.