@@ -627,7 +627,7 @@ |
||
627 | 627 | $responseContentType = $this->getStreamProviderWrapper() |
628 | 628 | ->getStreamContentType2( |
629 | 629 | $request->getTargetResult(), |
630 | - $request->getResourceStreamInfo(),$this->getOperationContext() |
|
630 | + $request->getResourceStreamInfo(), $this->getOperationContext() |
|
631 | 631 | ); |
632 | 632 | |
633 | 633 | // Note StreamWrapper::getStreamContentType can return NULL if the requested named stream has not |
@@ -49,9 +49,9 @@ |
||
49 | 49 | $result = $request->getTargetResult(); |
50 | 50 | $streamInfo = $request->getResourceStreamInfo(); |
51 | 51 | $provider = $service->getStreamProviderWrapper(); |
52 | - $eTag = $provider->getStreamETag2($result, $streamInfo,$service->getOperationContext()); |
|
52 | + $eTag = $provider->getStreamETag2($result, $streamInfo, $service->getOperationContext()); |
|
53 | 53 | $service->getHost()->setResponseETag($eTag); |
54 | - $responseBody = $provider->getReadStream2($result, $streamInfo ,null,null,$service->getOperationContext()); |
|
54 | + $responseBody = $provider->getReadStream2($result, $streamInfo, null, null, $service->getOperationContext()); |
|
55 | 55 | } else { |
56 | 56 | $responseBody = $request->getTargetResult(); |
57 | 57 | } |
@@ -653,8 +653,8 @@ discard block |
||
653 | 653 | if ($resourceType->isMediaLinkEntry()) { |
654 | 654 | $odataEntry->isMediaLinkEntry = true; |
655 | 655 | $streamProvider = $this->getService()->getStreamProvider(); |
656 | - $eTag = $streamProvider->getStreamETag2($entryObject,null, $this->service->getOperationContext()); |
|
657 | - $readStreamUri = $streamProvider->getReadStreamUri2($entryObject,null , $this->service->getOperationContext(), $relativeUri); |
|
656 | + $eTag = $streamProvider->getStreamETag2($entryObject, null, $this->service->getOperationContext()); |
|
657 | + $readStreamUri = $streamProvider->getReadStreamUri2($entryObject, null, $this->service->getOperationContext(), $relativeUri); |
|
658 | 658 | $mediaContentType = $streamProvider->getStreamContentType2($entryObject, null, $this->service->getOperationContext()); |
659 | 659 | $mediaLink = new ODataMediaLink( |
660 | 660 | $title, |
@@ -669,9 +669,9 @@ discard block |
||
669 | 669 | |
670 | 670 | if ($resourceType->hasNamedStream()) { |
671 | 671 | foreach ($resourceType->getAllNamedStreams() as $title => $resourceStreamInfo) { |
672 | - $eTag = $streamProvider->getStreamETag2($entryObject, $resourceStreamInfo,$this->service->getOperationContext()); |
|
672 | + $eTag = $streamProvider->getStreamETag2($entryObject, $resourceStreamInfo, $this->service->getOperationContext()); |
|
673 | 673 | $readStreamUri = $streamProvider->getReadStreamUri2($entryObject, $resourceStreamInfo, $this->service->getOperationContext(), $relativeUri); |
674 | - $mediaContentType = $streamProvider->getStreamContentType2($entryObject, $resourceStreamInfo,$this->service->getOperationContext()); |
|
674 | + $mediaContentType = $streamProvider->getStreamContentType2($entryObject, $resourceStreamInfo, $this->service->getOperationContext()); |
|
675 | 675 | $mediaLink = new ODataMediaLink( |
676 | 676 | $title, |
677 | 677 | $streamProvider->getReadStreamUri2($relativeUri, $resourceStreamInfo, $this->service->getOperationContext(), $relativeUri), |
@@ -18,9 +18,9 @@ |
||
18 | 18 | } |
19 | 19 | |
20 | 20 | public function getDefaultStreamEditMediaUri($entity, ResourceType $resourceType, ResourceStreamInfo $resourceStreamInfo = null, IOperationContext $operationContext, $relativeUri = null){ |
21 | - if(null == $resourceStreamInfo){ |
|
22 | - return $relativeUri . '/$value'; |
|
23 | - } |
|
21 | + if(null == $resourceStreamInfo){ |
|
22 | + return $relativeUri . '/$value'; |
|
23 | + } |
|
24 | 24 | return $relativeUri . '/' . $resourceStreamInfo->getName(); |
25 | 25 | |
26 | 26 | } |
@@ -10,15 +10,15 @@ discard block |
||
10 | 10 | { |
11 | 11 | public function getReadStream2($entity, ResourceStreamInfo $resourceStreamInfo = null, $eTag, $checkETagForEquality, IOperationContext $operationContext) |
12 | 12 | { |
13 | - if(null == $resourceStreamInfo){ |
|
14 | - return "stream for " . get_class ($entity); |
|
13 | + if (null == $resourceStreamInfo) { |
|
14 | + return "stream for " . get_class($entity); |
|
15 | 15 | } |
16 | 16 | $name = $resourceStreamInfo->getName(); |
17 | 17 | return $entity->$name; |
18 | 18 | } |
19 | 19 | |
20 | - public function getDefaultStreamEditMediaUri($entity, ResourceType $resourceType, ResourceStreamInfo $resourceStreamInfo = null, IOperationContext $operationContext, $relativeUri = null){ |
|
21 | - if(null == $resourceStreamInfo){ |
|
20 | + public function getDefaultStreamEditMediaUri($entity, ResourceType $resourceType, ResourceStreamInfo $resourceStreamInfo = null, IOperationContext $operationContext, $relativeUri = null) { |
|
21 | + if (null == $resourceStreamInfo) { |
|
22 | 22 | return $relativeUri . '/$value'; |
23 | 23 | } |
24 | 24 | return $relativeUri . '/' . $resourceStreamInfo->getName(); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | public function getStreamContentType2($entity, ResourceStreamInfo $resourceStreamInfo = null, IOperationContext $operationContext) |
29 | 29 | { |
30 | - if(null == $resourceStreamInfo){ |
|
30 | + if (null == $resourceStreamInfo) { |
|
31 | 31 | return "*/*"; |
32 | 32 | } |
33 | 33 | return 'application/octet-stream'; |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | ResourceStreamInfo $resourceStreamInfo = null, |
39 | 39 | IOperationContext $operationContext |
40 | 40 | ) { |
41 | - if(null == $resourceStreamInfo){ |
|
41 | + if (null == $resourceStreamInfo) { |
|
42 | 42 | return spl_object_hash($entity); |
43 | 43 | } |
44 | 44 | $name = $resourceStreamInfo->getName(); |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | public function getReadStreamUri2( |
50 | 50 | $entity, |
51 | 51 | ResourceStreamInfo $resourceStreamInfo = null, |
52 | - IOperationContext $operationContext,$relativeUri=null |
|
52 | + IOperationContext $operationContext, $relativeUri = null |
|
53 | 53 | ) { |
54 | - if(null == $resourceStreamInfo){ |
|
54 | + if (null == $resourceStreamInfo) { |
|
55 | 55 | return $relativeUri . '/$value'; |
56 | 56 | } |
57 | 57 | return $relativeUri . '/' . $resourceStreamInfo->getName(); |