@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | */ |
209 | 209 | protected function executePut() |
210 | 210 | { |
211 | - return $this->executeBase(function ($uriProcessor, $segment) { |
|
211 | + return $this->executeBase(function($uriProcessor, $segment) { |
|
212 | 212 | $requestMethod = $uriProcessor->getService()->getOperationContext()->incomingRequest()->getMethod(); |
213 | 213 | $resourceSet = $segment->getTargetResourceSetWrapper(); |
214 | 214 | $keyDescriptor = $segment->getKeyDescriptor(); |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | */ |
232 | 232 | protected function executeDelete() |
233 | 233 | { |
234 | - return $this->executeBase(function ($uriProcessor, $segment) { |
|
234 | + return $this->executeBase(function($uriProcessor, $segment) { |
|
235 | 235 | $requestMethod = $uriProcessor->getService()->getOperationContext()->incomingRequest()->getMethod(); |
236 | 236 | $resourceSet = $segment->getTargetResourceSetWrapper(); |
237 | 237 | $keyDescriptor = $segment->getKeyDescriptor(); |
@@ -50,7 +50,7 @@ |
||
50 | 50 | * |
51 | 51 | * @return bool true if the segment was push, false otherwise |
52 | 52 | */ |
53 | - public function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper) |
|
53 | + public function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper) |
|
54 | 54 | { |
55 | 55 | if (!is_string($segmentName)) { |
56 | 56 | throw new InvalidOperationException('segmentName must be a string'); |
@@ -158,8 +158,8 @@ |
||
158 | 158 | |
159 | 159 | case 'Edm.DateTime': |
160 | 160 | $dateTime = new Carbon($value, new \DateTimeZone('UTC')); |
161 | - $formattedDateTime = $dateTime->format('U') * 1000; |
|
162 | - $this->_writeCore('/Date('.$formattedDateTime.')/', /* quotes */ true); |
|
161 | + $formattedDateTime = $dateTime->format('U')*1000; |
|
162 | + $this->_writeCore('/Date(' . $formattedDateTime . ')/', /* quotes */ true); |
|
163 | 163 | break; |
164 | 164 | |
165 | 165 | case 'Edm.String': |
@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | public static function resourceAssociationTypeEndPropertyMustBeNullOrInstanceofResourceProperty($argumentName) |
15 | 15 | { |
16 | - return "The argument '".$argumentName."' must be either null or instance of 'ResourceProperty'."; |
|
16 | + return "The argument '" . $argumentName . "' must be either null or instance of 'ResourceProperty'."; |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | /** |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * |
63 | 63 | * @return ODataPropertyContent |
64 | 64 | */ |
65 | - public function writeTopLevelComplexObject(&$complexValue, $propertyName, ResourceType &$resourceType); |
|
65 | + public function writeTopLevelComplexObject(&$complexValue, $propertyName, ResourceType & $resourceType); |
|
66 | 66 | |
67 | 67 | /** |
68 | 68 | * Write top level bag resource. |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * |
77 | 77 | * @return ODataPropertyContent |
78 | 78 | */ |
79 | - public function writeTopLevelBagObject(&$BagValue, $propertyName, ResourceType &$resourceType); |
|
79 | + public function writeTopLevelBagObject(&$BagValue, $propertyName, ResourceType & $resourceType); |
|
80 | 80 | |
81 | 81 | /** |
82 | 82 | * Write top level primitive value. |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | * |
91 | 91 | * @return ODataPropertyContent |
92 | 92 | */ |
93 | - public function writeTopLevelPrimitive(&$primitiveValue, ResourceProperty &$resourceProperty); |
|
93 | + public function writeTopLevelPrimitive(&$primitiveValue, ResourceProperty & $resourceProperty); |
|
94 | 94 | |
95 | 95 | /** |
96 | 96 | * Gets reference to the request submitted by client. |
@@ -769,9 +769,9 @@ discard block |
||
769 | 769 | /** |
770 | 770 | * @param $customObject |
771 | 771 | * @param ResourceType $resourceType |
772 | - * @param $relativeUri |
|
772 | + * @param string $relativeUri |
|
773 | 773 | * @param ODataPropertyContent $odataPropertyContent |
774 | - * @param $resourceTypeKind |
|
774 | + * @param ResourceTypeKind $resourceTypeKind |
|
775 | 775 | * @param $navigationProperties |
776 | 776 | * |
777 | 777 | * @throws ODataException |
@@ -881,9 +881,9 @@ discard block |
||
881 | 881 | /** |
882 | 882 | * @param $customObject |
883 | 883 | * @param ResourceType $resourceType |
884 | - * @param $relativeUri |
|
884 | + * @param string $relativeUri |
|
885 | 885 | * @param ODataPropertyContent $odataPropertyContent |
886 | - * @param $projectionNodes |
|
886 | + * @param \POData\UriProcessor\QueryProcessor\ExpandProjectionParser\ProjectionNode[] $projectionNodes |
|
887 | 887 | * @param $navigationProperties |
888 | 888 | * |
889 | 889 | * @throws ODataException |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $this->getCurrentResourceSetWrapper()->getName() |
133 | 133 | ); |
134 | 134 | |
135 | - $url->url = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri; |
|
135 | + $url->url = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri; |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | return $url; |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | public function writeTopLevelComplexObject( |
187 | 187 | &$complexValue, |
188 | 188 | $propertyName, |
189 | - ResourceType &$resourceType |
|
189 | + ResourceType & $resourceType |
|
190 | 190 | ) { |
191 | 191 | $propertyContent = new ODataPropertyContent(); |
192 | 192 | $this->_writeComplexValue( |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | public function writeTopLevelBagObject( |
216 | 216 | &$BagValue, |
217 | 217 | $propertyName, |
218 | - ResourceType &$resourceType |
|
218 | + ResourceType & $resourceType |
|
219 | 219 | ) { |
220 | 220 | $propertyContent = new ODataPropertyContent(); |
221 | 221 | $this->_writeBagValue( |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | */ |
244 | 244 | public function writeTopLevelPrimitive( |
245 | 245 | &$primitiveValue, |
246 | - ResourceProperty &$resourceProperty |
|
246 | + ResourceProperty & $resourceProperty |
|
247 | 247 | ) { |
248 | 248 | $propertyContent = new ODataPropertyContent(); |
249 | 249 | $propertyContent->properties[] = new ODataProperty(); |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | $this->getCurrentResourceSetWrapper()->getName() |
286 | 286 | ); |
287 | 287 | |
288 | - $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri; |
|
288 | + $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri; |
|
289 | 289 | $title = $resourceType->getName(); |
290 | 290 | //TODO Resolve actual resource type |
291 | 291 | $actualResourceType = $resourceType; |
@@ -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 == ResourceTypeKind::ENTITY) |
@@ -440,14 +440,14 @@ discard block |
||
440 | 440 | $type = $navigationPropertyInfo->resourceProperty->getKind() == ResourcePropertyKind::RESOURCE_REFERENCE ? |
441 | 441 | 'application/atom+xml;type=entry' : 'application/atom+xml;type=feed'; |
442 | 442 | $link = new ODataLink(); |
443 | - $link->name = ODataConstants::ODATA_RELATED_NAMESPACE.$propertyName; |
|
443 | + $link->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propertyName; |
|
444 | 444 | $link->title = $propertyName; |
445 | 445 | $link->type = $type; |
446 | - $link->url = $relativeUri.'/'.$propertyName; |
|
446 | + $link->url = $relativeUri . '/' . $propertyName; |
|
447 | 447 | |
448 | 448 | if ($navigationPropertyInfo->expanded) { |
449 | - $propertyRelativeUri = $relativeUri.'/'.$propertyName; |
|
450 | - $propertyAbsoluteUri = trim($absoluteUri, '/').'/'.$propertyName; |
|
449 | + $propertyRelativeUri = $relativeUri . '/' . $propertyName; |
|
450 | + $propertyAbsoluteUri = trim($absoluteUri, '/') . '/' . $propertyName; |
|
451 | 451 | $needPop = $this->pushSegmentForNavigationProperty($navigationPropertyInfo->resourceProperty); |
452 | 452 | $navigationPropertyKind = $navigationPropertyInfo->resourceProperty->getKind(); |
453 | 453 | assert( |
@@ -510,8 +510,8 @@ discard block |
||
510 | 510 | */ |
511 | 511 | private function _writePrimitiveValue( |
512 | 512 | &$primitiveValue, |
513 | - ResourceProperty &$resourceProperty, |
|
514 | - ODataProperty &$odataProperty |
|
513 | + ResourceProperty & $resourceProperty, |
|
514 | + ODataProperty & $odataProperty |
|
515 | 515 | ) { |
516 | 516 | if (is_object($primitiveValue)) { |
517 | 517 | //TODO ERROR: The property 'PropertyName' |
@@ -545,9 +545,9 @@ discard block |
||
545 | 545 | private function _writeComplexValue( |
546 | 546 | &$complexValue, |
547 | 547 | $propertyName, |
548 | - ResourceType &$resourceType, |
|
548 | + ResourceType & $resourceType, |
|
549 | 549 | $relativeUri, |
550 | - ODataPropertyContent &$odataPropertyContent |
|
550 | + ODataPropertyContent & $odataPropertyContent |
|
551 | 551 | ) { |
552 | 552 | $odataProperty = new ODataProperty(); |
553 | 553 | $odataProperty->name = $propertyName; |
@@ -586,9 +586,9 @@ discard block |
||
586 | 586 | private function _writeBagValue( |
587 | 587 | &$BagValue, |
588 | 588 | $propertyName, |
589 | - ResourceType &$resourceType, |
|
589 | + ResourceType & $resourceType, |
|
590 | 590 | $relativeUri, |
591 | - ODataPropertyContent &$odataPropertyContent |
|
591 | + ODataPropertyContent & $odataPropertyContent |
|
592 | 592 | ) { |
593 | 593 | assert(null == $BagValue || is_array($BagValue), 'Bag parameter must be null or array'); |
594 | 594 | $bagItemResourceTypeKind = $resourceType->getResourceTypeKind(); |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | |
602 | 602 | $odataProperty = new ODataProperty(); |
603 | 603 | $odataProperty->name = $propertyName; |
604 | - $odataProperty->typeName = 'Collection('.$resourceType->getFullName().')'; |
|
604 | + $odataProperty->typeName = 'Collection(' . $resourceType->getFullName() . ')'; |
|
605 | 605 | |
606 | 606 | if (is_null($BagValue) || (is_array($BagValue) && empty($BagValue))) { |
607 | 607 | $odataProperty->value = null; |
@@ -645,10 +645,10 @@ discard block |
||
645 | 645 | */ |
646 | 646 | private function _writeMediaResourceMetadata( |
647 | 647 | $entryObject, |
648 | - ResourceType &$resourceType, |
|
648 | + ResourceType & $resourceType, |
|
649 | 649 | $title, |
650 | 650 | $relativeUri, |
651 | - ODataEntry &$odataEntry |
|
651 | + ODataEntry & $odataEntry |
|
652 | 652 | ) { |
653 | 653 | if ($resourceType->isMediaLinkEntry()) { |
654 | 654 | $odataEntry->isMediaLinkEntry = true; |
@@ -696,7 +696,7 @@ discard block |
||
696 | 696 | * @return string |
697 | 697 | */ |
698 | 698 | private function _primitiveToString( |
699 | - ResourceType &$primitiveResourceType, |
|
699 | + ResourceType & $primitiveResourceType, |
|
700 | 700 | $primitiveValue |
701 | 701 | ) { |
702 | 702 | $type = $primitiveResourceType->getInstanceType(); |
@@ -735,9 +735,9 @@ discard block |
||
735 | 735 | private function _complexObjectToContent( |
736 | 736 | &$complexValue, |
737 | 737 | $propertyName, |
738 | - ResourceType &$resourceType, |
|
738 | + ResourceType & $resourceType, |
|
739 | 739 | $relativeUri, |
740 | - ODataPropertyContent &$odataPropertyContent |
|
740 | + ODataPropertyContent & $odataPropertyContent |
|
741 | 741 | ) { |
742 | 742 | $count = count($this->complexTypeInstanceCollection); |
743 | 743 | for ($i = 0; $i < $count; ++$i) { |
@@ -780,9 +780,9 @@ discard block |
||
780 | 780 | */ |
781 | 781 | private function writeObjectPropertiesUnexpanded( |
782 | 782 | $customObject, |
783 | - ResourceType &$resourceType, |
|
783 | + ResourceType & $resourceType, |
|
784 | 784 | $relativeUri, |
785 | - ODataPropertyContent &$odataPropertyContent, |
|
785 | + ODataPropertyContent & $odataPropertyContent, |
|
786 | 786 | $resourceTypeKind, |
787 | 787 | $navigationProperties |
788 | 788 | ) { |
@@ -832,7 +832,7 @@ discard block |
||
832 | 832 | $propertyValue, |
833 | 833 | $resourceProperty->getName(), |
834 | 834 | $resourceType2, |
835 | - $relativeUri.'/'.$resourceProperty->getName(), |
|
835 | + $relativeUri . '/' . $resourceProperty->getName(), |
|
836 | 836 | $odataPropertyContent |
837 | 837 | ); |
838 | 838 | } else { |
@@ -844,7 +844,7 @@ discard block |
||
844 | 844 | $propertyValue, |
845 | 845 | $resourceProperty->getName(), |
846 | 846 | $resourceType1, |
847 | - $relativeUri.'/'.$resourceProperty->getName(), |
|
847 | + $relativeUri . '/' . $resourceProperty->getName(), |
|
848 | 848 | $odataPropertyContent |
849 | 849 | ); |
850 | 850 | } elseif ($resourceKind == ResourcePropertyKind::PRIMITIVE |
@@ -892,9 +892,9 @@ discard block |
||
892 | 892 | */ |
893 | 893 | private function writeObjectPropertiesExpanded( |
894 | 894 | $customObject, |
895 | - ResourceType &$resourceType, |
|
895 | + ResourceType & $resourceType, |
|
896 | 896 | $relativeUri, |
897 | - ODataPropertyContent &$odataPropertyContent, |
|
897 | + ODataPropertyContent & $odataPropertyContent, |
|
898 | 898 | $projectionNodes, |
899 | 899 | $navigationProperties |
900 | 900 | ) { |
@@ -942,7 +942,7 @@ discard block |
||
942 | 942 | $propertyValue, |
943 | 943 | $propertyName, |
944 | 944 | $bagResourceType, |
945 | - $relativeUri.'/'.$propertyName, |
|
945 | + $relativeUri . '/' . $propertyName, |
|
946 | 946 | $odataPropertyContent |
947 | 947 | ); |
948 | 948 | } elseif ($resourceProperty->isKindOf(ResourcePropertyKind::PRIMITIVE)) { |
@@ -955,7 +955,7 @@ discard block |
||
955 | 955 | $propertyValue, |
956 | 956 | $propertyName, |
957 | 957 | $complexResourceType, |
958 | - $relativeUri.'/'.$propertyName, |
|
958 | + $relativeUri . '/' . $propertyName, |
|
959 | 959 | $odataPropertyContent |
960 | 960 | ); |
961 | 961 | } else { |
@@ -446,10 +446,10 @@ discard block |
||
446 | 446 | |
447 | 447 | /** |
448 | 448 | * @param \ReflectionClass $refClass |
449 | - * @param $name |
|
450 | - * @param $namespace |
|
449 | + * @param string $name |
|
450 | + * @param string|null $namespace |
|
451 | 451 | * @param $typeKind |
452 | - * @param $baseResourceType |
|
452 | + * @param null|ResourceType $baseResourceType |
|
453 | 453 | * |
454 | 454 | * @throws InvalidOperationException |
455 | 455 | * |
@@ -474,7 +474,7 @@ discard block |
||
474 | 474 | } |
475 | 475 | |
476 | 476 | /** |
477 | - * @param $name |
|
477 | + * @param string $name |
|
478 | 478 | * @param ResourceType $resourceType |
479 | 479 | * |
480 | 480 | * @throws InvalidOperationException |
@@ -167,11 +167,11 @@ discard block |
||
167 | 167 | |
168 | 168 | $targetResourceSet = $targetResourceProperty->getResourceType()->getCustomState(); |
169 | 169 | if (is_null($targetResourceSet)) { |
170 | - throw new InvalidOperationException('Failed to retrieve the custom state from '.$targetResourceProperty->getResourceType()->getName()); |
|
170 | + throw new InvalidOperationException('Failed to retrieve the custom state from ' . $targetResourceProperty->getResourceType()->getName()); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | //Customer_Orders_Orders, Order_Customer_Customers |
174 | - $key = $sourceResourceType->getName().'_'.$targetResourceProperty->getName().'_'.$targetResourceSet->getName(); |
|
174 | + $key = $sourceResourceType->getName() . '_' . $targetResourceProperty->getName() . '_' . $targetResourceSet->getName(); |
|
175 | 175 | if (array_key_exists($key, $this->associationSets)) { |
176 | 176 | return $this->associationSets[$key]; |
177 | 177 | } |
@@ -430,12 +430,12 @@ discard block |
||
430 | 430 | //Create instance of AssociationSet for this relationship |
431 | 431 | $sourceResourceSet = $resourceType->getCustomState(); |
432 | 432 | if (is_null($sourceResourceSet)) { |
433 | - throw new InvalidOperationException('Failed to retrieve the custom state from '.$resourceType->getName()); |
|
433 | + throw new InvalidOperationException('Failed to retrieve the custom state from ' . $resourceType->getName()); |
|
434 | 434 | } |
435 | 435 | |
436 | 436 | //Customer_Orders_Orders, Order_Customer_Customers |
437 | 437 | //(source type::name _ source property::name _ target set::name) |
438 | - $setKey = $resourceType->getName().'_'.$name.'_'.$targetResourceSet->getName(); |
|
438 | + $setKey = $resourceType->getName() . '_' . $name . '_' . $targetResourceSet->getName(); |
|
439 | 439 | $set = new ResourceAssociationSet( |
440 | 440 | $setKey, |
441 | 441 | new ResourceAssociationSetEnd($sourceResourceSet, $resourceType, $resourceProperty), |
@@ -444,7 +444,7 @@ |
||
444 | 444 | } |
445 | 445 | |
446 | 446 | /** |
447 | - * @param $methodName |
|
447 | + * @param string $methodName |
|
448 | 448 | * @param $entityInstance |
449 | 449 | * @param ResourceSet $resourceSet |
450 | 450 | * |
@@ -412,8 +412,8 @@ |
||
412 | 412 | */ |
413 | 413 | private function validateEntityInstance( |
414 | 414 | $entityInstance, |
415 | - ResourceSet &$resourceSet, |
|
416 | - KeyDescriptor &$keyDescriptor, |
|
415 | + ResourceSet & $resourceSet, |
|
416 | + KeyDescriptor & $keyDescriptor, |
|
417 | 417 | $methodName |
418 | 418 | ) { |
419 | 419 | if (is_null($entityInstance)) { |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | } |
302 | 302 | |
303 | 303 | /** |
304 | - * @param $expandedProjectionNode |
|
304 | + * @param ExpandedProjectionNode $expandedProjectionNode |
|
305 | 305 | * @param $entry |
306 | 306 | * |
307 | 307 | * @return null|\object[] |
@@ -329,10 +329,10 @@ discard block |
||
329 | 329 | } |
330 | 330 | |
331 | 331 | /** |
332 | - * @param $expandedProjectionNode |
|
332 | + * @param ExpandedProjectionNode $expandedProjectionNode |
|
333 | 333 | * @param $entry |
334 | - * @param $resourceType |
|
335 | - * @param $expandedPropertyName |
|
334 | + * @param \POData\Providers\Metadata\ResourceType $resourceType |
|
335 | + * @param string $expandedPropertyName |
|
336 | 336 | * |
337 | 337 | * @throws InvalidOperationException |
338 | 338 | * @throws \POData\Common\ODataException |
@@ -363,9 +363,9 @@ discard block |
||
363 | 363 | /** |
364 | 364 | * @param $entry |
365 | 365 | * @param $result |
366 | - * @param $expandedProjectionNode |
|
367 | - * @param $resourceType |
|
368 | - * @param $expandedPropertyName |
|
366 | + * @param ExpandedProjectionNode $expandedProjectionNode |
|
367 | + * @param \POData\Providers\Metadata\ResourceType $resourceType |
|
368 | + * @param string $expandedPropertyName |
|
369 | 369 | * |
370 | 370 | * @throws InvalidOperationException |
371 | 371 | */ |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * |
195 | 195 | * @return bool true if a segment was pushed, false otherwise |
196 | 196 | */ |
197 | - private function pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty) |
|
197 | + private function pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty) |
|
198 | 198 | { |
199 | 199 | if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY) { |
200 | 200 | assert(!empty($this->getStack()->getSegmentNames()), '!is_empty($this->getStack()->getSegmentNames())'); |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | * |
280 | 280 | * @return bool true if the segment was push, false otherwise |
281 | 281 | */ |
282 | - private function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper) |
|
282 | + private function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper) |
|
283 | 283 | { |
284 | 284 | return $this->getStack()->pushSegment($segmentName, $resourceSetWrapper); |
285 | 285 | } |