@@ -2,13 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace POData\Providers\Metadata; |
| 4 | 4 | |
| 5 | -use AlgoWeb\ODataMetadata\IsOK; |
|
| 6 | 5 | use AlgoWeb\ODataMetadata\MetadataManager; |
| 7 | 6 | use AlgoWeb\ODataMetadata\MetadataV3\edm\TComplexTypeType; |
| 8 | 7 | use AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityTypeType; |
| 9 | 8 | use Illuminate\Support\Str; |
| 10 | 9 | use POData\Common\InvalidOperationException; |
| 11 | -use POData\Common\NotImplementedException; |
|
| 12 | 10 | use POData\Providers\Metadata\Type\IType; |
| 13 | 11 | use POData\Providers\Metadata\Type\TypeCode; |
| 14 | 12 | |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | $type = null; |
| 296 | 296 | if ($typeKind == ResourceTypeKind::ENTITY) { |
| 297 | 297 | list($oet, $entitySet) = $this->metadataManager->addEntityType($name); |
| 298 | - assert($oet instanceof TEntityTypeType, "Entity type ".$name. " not successfully added"); |
|
| 298 | + assert($oet instanceof TEntityTypeType, "Entity type " . $name . " not successfully added"); |
|
| 299 | 299 | $type = new ResourceEntityType($refClass, $oet, $this); |
| 300 | 300 | $typeName = $type->getFullName(); |
| 301 | 301 | $returnName = Str::plural($typeName); |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | ); |
| 585 | 585 | } |
| 586 | 586 | if (!in_array($resourceMult, $allowedMult)) { |
| 587 | - throw new InvalidOperationException("Supplied multiplicity ".$resourceMult." not valid"); |
|
| 587 | + throw new InvalidOperationException("Supplied multiplicity " . $resourceMult . " not valid"); |
|
| 588 | 588 | } |
| 589 | 589 | |
| 590 | 590 | $resourcePropertyKind = ('*' == $resourceMult) |
@@ -852,12 +852,12 @@ discard block |
||
| 852 | 852 | throw new \InvalidArgumentException($msg); |
| 853 | 853 | } |
| 854 | 854 | if (array_key_exists($name, $this->resourceSets)) { |
| 855 | - $msg = "Resource set with same name, ". $name. ", exists"; |
|
| 855 | + $msg = "Resource set with same name, " . $name . ", exists"; |
|
| 856 | 856 | throw new \InvalidArgumentException($msg); |
| 857 | 857 | } |
| 858 | 858 | $typeName = $returnType->getName(); |
| 859 | 859 | if (!array_key_exists($typeName, $this->OdataEntityMap)) { |
| 860 | - $msg = "Mapping not defined for ".$typeName; |
|
| 860 | + $msg = "Mapping not defined for " . $typeName; |
|
| 861 | 861 | throw new \InvalidArgumentException($msg); |
| 862 | 862 | } |
| 863 | 863 | $metaReturn = $this->OdataEntityMap[$typeName]; |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | */ |
| 223 | 223 | protected function executePut() |
| 224 | 224 | { |
| 225 | - return $this->executeBase(function ($uriProcessor, $segment) { |
|
| 225 | + return $this->executeBase(function($uriProcessor, $segment) { |
|
| 226 | 226 | $requestMethod = $uriProcessor->getService()->getOperationContext()->incomingRequest()->getMethod(); |
| 227 | 227 | $resourceSet = $segment->getTargetResourceSetWrapper(); |
| 228 | 228 | $keyDescriptor = $segment->getKeyDescriptor(); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | */ |
| 256 | 256 | protected function executeDelete() |
| 257 | 257 | { |
| 258 | - return $this->executeBase(function ($uriProcessor, $segment) { |
|
| 258 | + return $this->executeBase(function($uriProcessor, $segment) { |
|
| 259 | 259 | $requestMethod = $uriProcessor->getService()->getOperationContext()->incomingRequest()->getMethod(); |
| 260 | 260 | $resourceSet = $segment->getTargetResourceSetWrapper(); |
| 261 | 261 | $keyDescriptor = $segment->getKeyDescriptor(); |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | //TODO: why are these null? see #98 |
| 425 | 425 | null, // $orderby |
| 426 | 426 | null, // $top |
| 427 | - null, // $skip |
|
| 427 | + null, // $skip |
|
| 428 | 428 | $skipToken |
| 429 | 429 | ); |
| 430 | 430 | |
@@ -674,6 +674,7 @@ |
||
| 674 | 674 | * True if response needs to be |
| 675 | 675 | * serialized, False otherwise |
| 676 | 676 | * @param bool $needToSerializeResponse |
| 677 | + * @param QueryResult $entryObject |
|
| 677 | 678 | * |
| 678 | 679 | * @return string|null The ETag for the entry object if it has eTag properties |
| 679 | 680 | * NULL otherwise |
@@ -469,7 +469,7 @@ |
||
| 469 | 469 | ODataConstants::HTTPQUERY_STRING_ORDERBY, |
| 470 | 470 | ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
| 471 | 471 | ODataConstants::HTTPQUERY_STRING_SELECT |
| 472 | - ] as $queryOption) { |
|
| 472 | + ] as $queryOption) { |
|
| 473 | 473 | $value = $this->getService()->getHost()->getQueryStringItem($queryOption); |
| 474 | 474 | if (!is_null($value)) { |
| 475 | 475 | if (!is_null($queryParameterString)) { |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * |
| 31 | 31 | * @return ODataFeed |
| 32 | 32 | */ |
| 33 | - public function writeTopLevelElements(QueryResult &$entryObjects); |
|
| 33 | + public function writeTopLevelElements(QueryResult & $entryObjects); |
|
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * Write top level url element. |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * |
| 61 | 61 | * @return ODataPropertyContent |
| 62 | 62 | */ |
| 63 | - public function writeTopLevelComplexObject(QueryResult &$complexValue, $propertyName, ResourceType &$resourceType); |
|
| 63 | + public function writeTopLevelComplexObject(QueryResult & $complexValue, $propertyName, ResourceType & $resourceType); |
|
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | 66 | * Write top level bag resource. |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * |
| 72 | 72 | * @return ODataPropertyContent |
| 73 | 73 | */ |
| 74 | - public function writeTopLevelBagObject(QueryResult &$BagValue, $propertyName, ResourceType &$resourceType); |
|
| 74 | + public function writeTopLevelBagObject(QueryResult & $BagValue, $propertyName, ResourceType & $resourceType); |
|
| 75 | 75 | |
| 76 | 76 | /** |
| 77 | 77 | * Write top level primitive value. |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | * |
| 82 | 82 | * @return ODataPropertyContent |
| 83 | 83 | */ |
| 84 | - public function writeTopLevelPrimitive(QueryResult &$primitiveValue, ResourceProperty &$resourceProperty = null); |
|
| 84 | + public function writeTopLevelPrimitive(QueryResult & $primitiveValue, ResourceProperty & $resourceProperty = null); |
|
| 85 | 85 | |
| 86 | 86 | /** |
| 87 | 87 | * Gets reference to the request submitted by client. |
@@ -629,7 +629,7 @@ discard block |
||
| 629 | 629 | * @param InternalOrderByInfo $orderBy The orderBy information |
| 630 | 630 | * @param int $top The top count |
| 631 | 631 | * @param int $skip The skip count |
| 632 | - * @param InternalSkipTokenInfo $skipToken The skip token |
|
| 632 | + * @param SkipTokenInfo $skipToken The skip token |
|
| 633 | 633 | * |
| 634 | 634 | * @return QueryResult |
| 635 | 635 | */ |
@@ -832,7 +832,7 @@ discard block |
||
| 832 | 832 | |
| 833 | 833 | /** |
| 834 | 834 | * @param ResourceSet $resourceSet The entity set containing the entity to fetch |
| 835 | - * @param object $sourceEntityInstance The source entity instance |
|
| 835 | + * @param KeyDescriptor $sourceEntityInstance The source entity instance |
|
| 836 | 836 | * @param object $data The New data for the entity instance. |
| 837 | 837 | * |
| 838 | 838 | * returns object|null returns the newly created model if successful, or null if model creation failed. |