@@ -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)) { |
@@ -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'); |
@@ -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 | |
@@ -770,9 +770,9 @@ discard block |
||
| 770 | 770 | /** |
| 771 | 771 | * @param $customObject |
| 772 | 772 | * @param ResourceType $resourceType |
| 773 | - * @param $relativeUri |
|
| 773 | + * @param string $relativeUri |
|
| 774 | 774 | * @param ODataPropertyContent $odataPropertyContent |
| 775 | - * @param $resourceTypeKind |
|
| 775 | + * @param ResourceTypeKind $resourceTypeKind |
|
| 776 | 776 | * @param $navigationProperties |
| 777 | 777 | * @return array |
| 778 | 778 | * @throws ODataException |
@@ -879,9 +879,9 @@ discard block |
||
| 879 | 879 | /** |
| 880 | 880 | * @param $customObject |
| 881 | 881 | * @param ResourceType $resourceType |
| 882 | - * @param $relativeUri |
|
| 882 | + * @param string $relativeUri |
|
| 883 | 883 | * @param ODataPropertyContent $odataPropertyContent |
| 884 | - * @param $projectionNodes |
|
| 884 | + * @param \POData\UriProcessor\QueryProcessor\ExpandProjectionParser\ProjectionNode[] $projectionNodes |
|
| 885 | 885 | * @param $navigationProperties |
| 886 | 886 | * @return array |
| 887 | 887 | * @throws ODataException |
@@ -695,7 +695,6 @@ |
||
| 695 | 695 | * whose value need to be converted |
| 696 | 696 | * @param mixed $primitiveValue Primitive value to convert |
| 697 | 697 | * @return string |
| 698 | - |
|
| 699 | 698 | */ |
| 700 | 699 | private function _primitiveToString( |
| 701 | 700 | ResourceType &$primitiveResourceType, |
@@ -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( |
@@ -330,7 +330,7 @@ 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, |
@@ -698,7 +698,7 @@ discard block |
||
| 698 | 698 | |
| 699 | 699 | */ |
| 700 | 700 | private function _primitiveToString( |
| 701 | - ResourceType &$primitiveResourceType, |
|
| 701 | + ResourceType & $primitiveResourceType, |
|
| 702 | 702 | $primitiveValue |
| 703 | 703 | ) { |
| 704 | 704 | $type = $primitiveResourceType->getInstanceType(); |
@@ -779,9 +779,9 @@ discard block |
||
| 779 | 779 | */ |
| 780 | 780 | private function writeObjectPropertiesUnexpanded( |
| 781 | 781 | $customObject, |
| 782 | - ResourceType &$resourceType, |
|
| 782 | + ResourceType & $resourceType, |
|
| 783 | 783 | $relativeUri, |
| 784 | - ODataPropertyContent &$odataPropertyContent, |
|
| 784 | + ODataPropertyContent & $odataPropertyContent, |
|
| 785 | 785 | $resourceTypeKind, |
| 786 | 786 | $navigationProperties |
| 787 | 787 | ) { |
@@ -888,9 +888,9 @@ discard block |
||
| 888 | 888 | */ |
| 889 | 889 | private function writeObjectPropertiesExpanded( |
| 890 | 890 | $customObject, |
| 891 | - ResourceType &$resourceType, |
|
| 891 | + ResourceType & $resourceType, |
|
| 892 | 892 | $relativeUri, |
| 893 | - ODataPropertyContent &$odataPropertyContent, |
|
| 893 | + ODataPropertyContent & $odataPropertyContent, |
|
| 894 | 894 | $projectionNodes, |
| 895 | 895 | $navigationProperties |
| 896 | 896 | ) { |
@@ -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 | /** |