@@ -132,7 +132,7 @@ |
||
132 | 132 | } |
133 | 133 | |
134 | 134 | $this->rawUrl .= '://' . |
135 | - $_SERVER[HttpProcessUtility::headerToServerKey(ODataConstants::HTTPREQUEST_HEADER_HOST)]; |
|
135 | + $_SERVER[HttpProcessUtility::headerToServerKey(ODataConstants::HTTPREQUEST_HEADER_HOST)]; |
|
136 | 136 | $this->rawUrl .= utf8_decode(urldecode($_SERVER[ODataConstants::HTTPREQUEST_URI])); |
137 | 137 | } |
138 | 138 |
@@ -410,7 +410,7 @@ |
||
410 | 410 | $this->topLevelComparisonFunction = $this->comparisonFunctions[0]; |
411 | 411 | } else { |
412 | 412 | $funcList = $this->comparisonFunctions; |
413 | - $this->topLevelComparisonFunction = function ($object1, $object2) use ($funcList) { |
|
413 | + $this->topLevelComparisonFunction = function($object1, $object2) use ($funcList) { |
|
414 | 414 | $ret = 0; |
415 | 415 | foreach ($funcList as $f) { |
416 | 416 | $ret = $f($object1, $object2); |
@@ -329,11 +329,11 @@ discard block |
||
329 | 329 | */ |
330 | 330 | private function writeFeedElements( |
331 | 331 | &$entryObjects, |
332 | - ResourceType &$resourceType, |
|
332 | + ResourceType & $resourceType, |
|
333 | 333 | $title, |
334 | 334 | $absoluteUri, |
335 | 335 | $relativeUri, |
336 | - ODataFeed &$feed |
|
336 | + ODataFeed & $feed |
|
337 | 337 | ) { |
338 | 338 | assert(is_array($entryObjects), '!_writeFeedElements::is_array($entryObjects)'); |
339 | 339 | $feed->id = $absoluteUri; |
@@ -383,11 +383,11 @@ discard block |
||
383 | 383 | */ |
384 | 384 | private function writeObjectProperties( |
385 | 385 | $customObject, |
386 | - ResourceType &$resourceType, |
|
386 | + ResourceType & $resourceType, |
|
387 | 387 | $absoluteUri, |
388 | 388 | $relativeUri, |
389 | 389 | &$odataEntry, |
390 | - ODataPropertyContent &$odataPropertyContent |
|
390 | + ODataPropertyContent & $odataPropertyContent |
|
391 | 391 | ) { |
392 | 392 | $resourceTypeKind = $resourceType->getResourceTypeKind(); |
393 | 393 | if (is_null($absoluteUri) == (ResourceTypeKind::ENTITY == $resourceTypeKind) |
@@ -508,8 +508,8 @@ discard block |
||
508 | 508 | */ |
509 | 509 | private function writePrimitiveValue( |
510 | 510 | &$primitiveValue, |
511 | - ODataProperty &$odataProperty, |
|
512 | - ResourceProperty &$resourceProperty |
|
511 | + ODataProperty & $odataProperty, |
|
512 | + ResourceProperty & $resourceProperty |
|
513 | 513 | ) { |
514 | 514 | if (is_object($primitiveValue)) { |
515 | 515 | //TODO ERROR: The property 'PropertyName' |
@@ -543,9 +543,9 @@ discard block |
||
543 | 543 | private function writeComplexValue( |
544 | 544 | &$complexValue, |
545 | 545 | $propertyName, |
546 | - ResourceType &$resourceType, |
|
546 | + ResourceType & $resourceType, |
|
547 | 547 | $relativeUri, |
548 | - ODataPropertyContent &$odataPropertyContent |
|
548 | + ODataPropertyContent & $odataPropertyContent |
|
549 | 549 | ) { |
550 | 550 | $odataProperty = new ODataProperty(); |
551 | 551 | $odataProperty->name = $propertyName; |
@@ -584,9 +584,9 @@ discard block |
||
584 | 584 | private function writeBagValue( |
585 | 585 | &$BagValue, |
586 | 586 | $propertyName, |
587 | - ResourceType &$resourceType, |
|
587 | + ResourceType & $resourceType, |
|
588 | 588 | $relativeUri, |
589 | - ODataPropertyContent &$odataPropertyContent |
|
589 | + ODataPropertyContent & $odataPropertyContent |
|
590 | 590 | ) { |
591 | 591 | assert(null == $BagValue || is_array($BagValue), 'Bag parameter must be null or array'); |
592 | 592 | $bagItemResourceTypeKind = $resourceType->getResourceTypeKind(); |
@@ -643,10 +643,10 @@ discard block |
||
643 | 643 | */ |
644 | 644 | private function writeMediaResourceMetadata( |
645 | 645 | $entryObject, |
646 | - ResourceType &$resourceType, |
|
646 | + ResourceType & $resourceType, |
|
647 | 647 | $title, |
648 | 648 | $relativeUri, |
649 | - ODataEntry &$odataEntry |
|
649 | + ODataEntry & $odataEntry |
|
650 | 650 | ) { |
651 | 651 | $streamProviderWrapper = $this->getService()->getStreamProviderWrapper(); |
652 | 652 | assert(null != $streamProviderWrapper, "Retrieved stream provider must not be null"); |
@@ -712,7 +712,7 @@ discard block |
||
712 | 712 | * @return string |
713 | 713 | */ |
714 | 714 | private function primitiveToString( |
715 | - ResourceType &$primitiveResourceType, |
|
715 | + ResourceType & $primitiveResourceType, |
|
716 | 716 | $primitiveValue |
717 | 717 | ) { |
718 | 718 | $type = $primitiveResourceType->getInstanceType(); |
@@ -751,9 +751,9 @@ discard block |
||
751 | 751 | private function complexObjectToContent( |
752 | 752 | &$complexValue, |
753 | 753 | $propertyName, |
754 | - ResourceType &$resourceType, |
|
754 | + ResourceType & $resourceType, |
|
755 | 755 | $relativeUri, |
756 | - ODataPropertyContent &$odataPropertyContent |
|
756 | + ODataPropertyContent & $odataPropertyContent |
|
757 | 757 | ) { |
758 | 758 | $count = count($this->complexTypeInstanceCollection); |
759 | 759 | for ($i = 0; $i < $count; ++$i) { |
@@ -796,9 +796,9 @@ discard block |
||
796 | 796 | */ |
797 | 797 | private function writeObjectPropertiesUnexpanded( |
798 | 798 | $customObject, |
799 | - ResourceType &$resourceType, |
|
799 | + ResourceType & $resourceType, |
|
800 | 800 | $relativeUri, |
801 | - ODataPropertyContent &$odataPropertyContent, |
|
801 | + ODataPropertyContent & $odataPropertyContent, |
|
802 | 802 | $resourceTypeKind, |
803 | 803 | $navigationProperties |
804 | 804 | ) { |
@@ -896,7 +896,7 @@ discard block |
||
896 | 896 | if (28 < $resourceKind) { |
897 | 897 | return false; |
898 | 898 | } |
899 | - return 0 == ($resourceKind % 4); |
|
899 | + return 0 == ($resourceKind%4); |
|
900 | 900 | } |
901 | 901 | |
902 | 902 | |
@@ -914,9 +914,9 @@ discard block |
||
914 | 914 | */ |
915 | 915 | private function writeObjectPropertiesExpanded( |
916 | 916 | $customObject, |
917 | - ResourceType &$resourceType, |
|
917 | + ResourceType & $resourceType, |
|
918 | 918 | $relativeUri, |
919 | - ODataPropertyContent &$odataPropertyContent, |
|
919 | + ODataPropertyContent & $odataPropertyContent, |
|
920 | 920 | $projectionNodes, |
921 | 921 | $navigationProperties |
922 | 922 | ) { |