| @@ -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); | 
| @@ -214,7 +214,7 @@ discard block | ||
| 214 | 214 | public function writeTopLevelBagObject( | 
| 215 | 215 | &$BagValue, | 
| 216 | 216 | $propertyName, | 
| 217 | - ResourceType &$resourceType | |
| 217 | + ResourceType & $resourceType | |
| 218 | 218 |      ) { | 
| 219 | 219 | $propertyContent = new ODataPropertyContent(); | 
| 220 | 220 | $this->writeBagValue( | 
| @@ -242,7 +242,7 @@ discard block | ||
| 242 | 242 | */ | 
| 243 | 243 | public function writeTopLevelPrimitive( | 
| 244 | 244 | &$primitiveValue, | 
| 245 | - ResourceProperty &$resourceProperty = null | |
| 245 | + ResourceProperty & $resourceProperty = null | |
| 246 | 246 |      ) { | 
| 247 | 247 | assert(null != $resourceProperty, "Resource property must not be null"); | 
| 248 | 248 | $propertyContent = new ODataPropertyContent(); | 
| @@ -330,11 +330,11 @@ discard block | ||
| 330 | 330 | */ | 
| 331 | 331 | private function writeFeedElements( | 
| 332 | 332 | &$entryObjects, | 
| 333 | - ResourceType &$resourceType, | |
| 333 | + ResourceType & $resourceType, | |
| 334 | 334 | $title, | 
| 335 | 335 | $absoluteUri, | 
| 336 | 336 | $relativeUri, | 
| 337 | - ODataFeed &$feed | |
| 337 | + ODataFeed & $feed | |
| 338 | 338 |      ) { | 
| 339 | 339 | assert(is_array($entryObjects), '!_writeFeedElements::is_array($entryObjects)'); | 
| 340 | 340 | $feed->id = $absoluteUri; | 
| @@ -384,11 +384,11 @@ discard block | ||
| 384 | 384 | */ | 
| 385 | 385 | private function writeObjectProperties( | 
| 386 | 386 | $customObject, | 
| 387 | - ResourceType &$resourceType, | |
| 387 | + ResourceType & $resourceType, | |
| 388 | 388 | $absoluteUri, | 
| 389 | 389 | $relativeUri, | 
| 390 | 390 | &$odataEntry, | 
| 391 | - ODataPropertyContent &$odataPropertyContent | |
| 391 | + ODataPropertyContent & $odataPropertyContent | |
| 392 | 392 |      ) { | 
| 393 | 393 | $resourceTypeKind = $resourceType->getResourceTypeKind(); | 
| 394 | 394 | if (is_null($absoluteUri) == (ResourceTypeKind::ENTITY == $resourceTypeKind) | 
| @@ -509,8 +509,8 @@ discard block | ||
| 509 | 509 | */ | 
| 510 | 510 | private function writePrimitiveValue( | 
| 511 | 511 | &$primitiveValue, | 
| 512 | - ODataProperty &$odataProperty, | |
| 513 | - ResourceProperty &$resourceProperty | |
| 512 | + ODataProperty & $odataProperty, | |
| 513 | + ResourceProperty & $resourceProperty | |
| 514 | 514 |      ) { | 
| 515 | 515 |          if (is_object($primitiveValue)) { | 
| 516 | 516 | //TODO ERROR: The property 'PropertyName' | 
| @@ -544,9 +544,9 @@ discard block | ||
| 544 | 544 | private function writeComplexValue( | 
| 545 | 545 | &$complexValue, | 
| 546 | 546 | $propertyName, | 
| 547 | - ResourceType &$resourceType, | |
| 547 | + ResourceType & $resourceType, | |
| 548 | 548 | $relativeUri, | 
| 549 | - ODataPropertyContent &$odataPropertyContent | |
| 549 | + ODataPropertyContent & $odataPropertyContent | |
| 550 | 550 |      ) { | 
| 551 | 551 | $odataProperty = new ODataProperty(); | 
| 552 | 552 | $odataProperty->name = $propertyName; | 
| @@ -585,9 +585,9 @@ discard block | ||
| 585 | 585 | private function writeBagValue( | 
| 586 | 586 | &$BagValue, | 
| 587 | 587 | $propertyName, | 
| 588 | - ResourceType &$resourceType, | |
| 588 | + ResourceType & $resourceType, | |
| 589 | 589 | $relativeUri, | 
| 590 | - ODataPropertyContent &$odataPropertyContent | |
| 590 | + ODataPropertyContent & $odataPropertyContent | |
| 591 | 591 |      ) { | 
| 592 | 592 | assert(null == $BagValue || is_array($BagValue), 'Bag parameter must be null or array'); | 
| 593 | 593 | $bagItemResourceTypeKind = $resourceType->getResourceTypeKind(); | 
| @@ -644,10 +644,10 @@ discard block | ||
| 644 | 644 | */ | 
| 645 | 645 | private function writeMediaResourceMetadata( | 
| 646 | 646 | $entryObject, | 
| 647 | - ResourceType &$resourceType, | |
| 647 | + ResourceType & $resourceType, | |
| 648 | 648 | $title, | 
| 649 | 649 | $relativeUri, | 
| 650 | - ODataEntry &$odataEntry | |
| 650 | + ODataEntry & $odataEntry | |
| 651 | 651 |      ) { | 
| 652 | 652 | $streamProviderWrapper = $this->getService()->getStreamProviderWrapper(); | 
| 653 | 653 | assert(null != $streamProviderWrapper, "Retrieved stream provider must not be null"); | 
| @@ -713,7 +713,7 @@ discard block | ||
| 713 | 713 | * @return string | 
| 714 | 714 | */ | 
| 715 | 715 | private function primitiveToString( | 
| 716 | - ResourceType &$primitiveResourceType, | |
| 716 | + ResourceType & $primitiveResourceType, | |
| 717 | 717 | $primitiveValue | 
| 718 | 718 |      ) { | 
| 719 | 719 | $type = $primitiveResourceType->getInstanceType(); | 
| @@ -752,9 +752,9 @@ discard block | ||
| 752 | 752 | private function complexObjectToContent( | 
| 753 | 753 | &$complexValue, | 
| 754 | 754 | $propertyName, | 
| 755 | - ResourceType &$resourceType, | |
| 755 | + ResourceType & $resourceType, | |
| 756 | 756 | $relativeUri, | 
| 757 | - ODataPropertyContent &$odataPropertyContent | |
| 757 | + ODataPropertyContent & $odataPropertyContent | |
| 758 | 758 |      ) { | 
| 759 | 759 | $count = count($this->complexTypeInstanceCollection); | 
| 760 | 760 |          for ($i = 0; $i < $count; ++$i) { | 
| @@ -797,9 +797,9 @@ discard block | ||
| 797 | 797 | */ | 
| 798 | 798 | private function writeObjectPropertiesUnexpanded( | 
| 799 | 799 | $customObject, | 
| 800 | - ResourceType &$resourceType, | |
| 800 | + ResourceType & $resourceType, | |
| 801 | 801 | $relativeUri, | 
| 802 | - ODataPropertyContent &$odataPropertyContent, | |
| 802 | + ODataPropertyContent & $odataPropertyContent, | |
| 803 | 803 | $resourceTypeKind, | 
| 804 | 804 | $navigationProperties | 
| 805 | 805 |      ) { | 
| @@ -897,7 +897,7 @@ discard block | ||
| 897 | 897 |          if (28 < $resourceKind) { | 
| 898 | 898 | return false; | 
| 899 | 899 | } | 
| 900 | - return 0 == ($resourceKind % 4); | |
| 900 | + return 0 == ($resourceKind%4); | |
| 901 | 901 | } | 
| 902 | 902 | |
| 903 | 903 | |
| @@ -915,9 +915,9 @@ discard block | ||
| 915 | 915 | */ | 
| 916 | 916 | private function writeObjectPropertiesExpanded( | 
| 917 | 917 | $customObject, | 
| 918 | - ResourceType &$resourceType, | |
| 918 | + ResourceType & $resourceType, | |
| 919 | 919 | $relativeUri, | 
| 920 | - ODataPropertyContent &$odataPropertyContent, | |
| 920 | + ODataPropertyContent & $odataPropertyContent, | |
| 921 | 921 | $projectionNodes, | 
| 922 | 922 | $navigationProperties | 
| 923 | 923 |      ) { |