@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $resourceTypesInContainerNamespace = array(); |
| 99 | 99 | $containerNamespace = $this->providersWrapper->getContainerNamespace(); |
| 100 | 100 | foreach ($this->_metadataManager->getResourceTypesAlongWithNamespace() |
| 101 | - as $resourceTypeNamespace => $resourceTypesWithName) { |
|
| 101 | + as $resourceTypeNamespace => $resourceTypesWithName) { |
|
| 102 | 102 | if ($resourceTypeNamespace == $containerNamespace) { |
| 103 | 103 | foreach ($resourceTypesWithName as $resourceTypeName => $resourceType) { |
| 104 | 104 | $resourceTypesInContainerNamespace[] = $resourceType; |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | private function _writeProperties(ResourceType $resourceType, $associationTypesInResourceTypeNamespace) |
| 280 | 280 | { |
| 281 | 281 | foreach ($this->_metadataManager->getAllVisiblePropertiesDeclaredOnThisType($resourceType) |
| 282 | - as $resourceProperty) { |
|
| 282 | + as $resourceProperty) { |
|
| 283 | 283 | if ($resourceProperty->isKindOf(ResourcePropertyKind::BAG)) { |
| 284 | 284 | $this->_writeBagProperty($resourceProperty); |
| 285 | 285 | } elseif ($resourceProperty->isKindOf(ResourcePropertyKind::PRIMITIVE)) { |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | * Pushes a segment for the root of the tree |
| 171 | 171 | * Note: Calls to this method should be balanced with calls to popSegment. |
| 172 | 172 | * |
| 173 | - * @return bool true if the segment was pushed, false otherwise |
|
| 173 | + * @return boolean|null true if the segment was pushed, false otherwise |
|
| 174 | 174 | */ |
| 175 | 175 | private function pushSegmentForRoot() |
| 176 | 176 | { |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | * @param ResourceProperty &$resourceProperty Current navigation property |
| 190 | 190 | * being written out |
| 191 | 191 | * |
| 192 | - * @return bool true if a segment was pushed, false otherwise |
|
| 192 | + * @return boolean|null true if a segment was pushed, false otherwise |
|
| 193 | 193 | * |
| 194 | 194 | * @throws InvalidOperationException If this function invoked with non-navigation |
| 195 | 195 | * property instance |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | * @param ResourceSetWrapper &$resourceSetWrapper The resource set wrapper |
| 278 | 278 | * to push |
| 279 | 279 | * |
| 280 | - * @return bool true if the segment was push, false otherwise |
|
| 280 | + * @return boolean|null true if the segment was push, false otherwise |
|
| 281 | 281 | */ |
| 282 | 282 | private function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper) |
| 283 | 283 | { |
@@ -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 | * @return null|\object[] |
| 307 | 307 | */ |
@@ -327,10 +327,10 @@ discard block |
||
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | /** |
| 330 | - * @param $expandedProjectionNode |
|
| 330 | + * @param ExpandedProjectionNode $expandedProjectionNode |
|
| 331 | 331 | * @param $entry |
| 332 | - * @param $resourceType |
|
| 333 | - * @param $expandedPropertyName |
|
| 332 | + * @param \POData\Providers\Metadata\ResourceType $resourceType |
|
| 333 | + * @param string $expandedPropertyName |
|
| 334 | 334 | * @throws InvalidOperationException |
| 335 | 335 | * @throws \POData\Common\ODataException |
| 336 | 336 | */ |
@@ -360,9 +360,9 @@ discard block |
||
| 360 | 360 | /** |
| 361 | 361 | * @param $entry |
| 362 | 362 | * @param $result |
| 363 | - * @param $expandedProjectionNode |
|
| 364 | - * @param $resourceType |
|
| 365 | - * @param $expandedPropertyName |
|
| 363 | + * @param ExpandedProjectionNode $expandedProjectionNode |
|
| 364 | + * @param \POData\Providers\Metadata\ResourceType $resourceType |
|
| 365 | + * @param string $expandedPropertyName |
|
| 366 | 366 | * @throws InvalidOperationException |
| 367 | 367 | */ |
| 368 | 368 | private function executeCollectionExpansionProcessExpansion( |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | * @throws InvalidOperationException If this function invoked with non-navigation |
| 195 | 195 | * property instance |
| 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 | $this->getStack()->pushSegment($segmentName, $resourceSetWrapper); |
| 285 | 285 | } |
@@ -2,15 +2,10 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace POData\UriProcessor; |
| 4 | 4 | |
| 5 | -use Illuminate\Support\Str; |
|
| 6 | 5 | use POData\Providers\ProvidersWrapper; |
| 7 | 6 | use POData\Providers\Metadata\ResourcePropertyKind; |
| 8 | -use POData\Providers\Metadata\ResourceTypeKind; |
|
| 9 | -use POData\Providers\Metadata\ResourceSetWrapper; |
|
| 10 | -use POData\Providers\Metadata\ResourceProperty; |
|
| 11 | 7 | use POData\Providers\Query\QueryType; |
| 12 | 8 | use POData\UriProcessor\QueryProcessor\QueryProcessor; |
| 13 | -use POData\UriProcessor\QueryProcessor\ExpandProjectionParser\ExpandedProjectionNode; |
|
| 14 | 9 | use POData\UriProcessor\ResourcePathProcessor\ResourcePathProcessor; |
| 15 | 10 | use POData\UriProcessor\ResourcePathProcessor\SegmentParser\SegmentDescriptor; |
| 16 | 11 | use POData\UriProcessor\ResourcePathProcessor\SegmentParser\TargetKind; |
@@ -18,7 +13,6 @@ discard block |
||
| 18 | 13 | use POData\IService; |
| 19 | 14 | use POData\Common\Messages; |
| 20 | 15 | use POData\Common\ODataException; |
| 21 | -use POData\Common\InvalidOperationException; |
|
| 22 | 16 | use POData\Common\ODataConstants; |
| 23 | 17 | use POData\Providers\Query\QueryResult; |
| 24 | 18 | use POData\OperationContext\HTTPRequestMethod; |
@@ -382,7 +382,7 @@ |
||
| 382 | 382 | $segment->setResult($entityInstance); |
| 383 | 383 | } else { |
| 384 | 384 | $skip = (null == $this->getRequest()) ? 0 : $this->getRequest()->getSkipCount(); |
| 385 | - $skip = (null == $skip) ? 0 :$skip; |
|
| 385 | + $skip = (null == $skip) ? 0 : $skip; |
|
| 386 | 386 | $queryResult = $this->getProviders()->getResourceSet( |
| 387 | 387 | $this->getRequest()->queryType, |
| 388 | 388 | $segment->getTargetResourceSetWrapper(), |
@@ -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'); |
@@ -330,7 +330,7 @@ |
||
| 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, |
@@ -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 | * @return ResourceType |
| 454 | 454 | * @throws InvalidOperationException |
| 455 | 455 | */ |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | } |
| 473 | 473 | |
| 474 | 474 | /** |
| 475 | - * @param $name |
|
| 475 | + * @param string $name |
|
| 476 | 476 | * @param ResourceType $resourceType |
| 477 | 477 | * @throws InvalidOperationException |
| 478 | 478 | */ |
@@ -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': |
@@ -453,7 +453,7 @@ |
||
| 453 | 453 | } |
| 454 | 454 | |
| 455 | 455 | /** |
| 456 | - * @param $methodName |
|
| 456 | + * @param string $methodName |
|
| 457 | 457 | * @param $entityInstance |
| 458 | 458 | * @param ResourceSet $resourceSet |
| 459 | 459 | * @return ResourceType |
@@ -119,7 +119,7 @@ |
||
| 119 | 119 | public static function validateWithoutPrefix($value, &$outValue) |
| 120 | 120 | { |
| 121 | 121 | $length = strlen($value); |
| 122 | - if (0 == $length || 0 != $length % 2) { |
|
| 122 | + if (0 == $length || 0 != $length%2) { |
|
| 123 | 123 | return false; |
| 124 | 124 | } |
| 125 | 125 | |