@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | $expectedParms = count($baseParms); |
| 124 | 124 | $actualParms = count($parms); |
| 125 | 125 | if ($expectedParms != $actualParms) { |
| 126 | - $msg = "Was expecting ". $expectedParms. " arguments, received ".$actualParms." instead"; |
|
| 126 | + $msg = "Was expecting " . $expectedParms . " arguments, received " . $actualParms . " instead"; |
|
| 127 | 127 | throw new \InvalidArgumentException($msg); |
| 128 | 128 | } |
| 129 | 129 | |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | private function checkBlacklist($func, $fromArray = false) |
| 138 | 138 | { |
| 139 | 139 | if (in_array($func, $this->blacklist) || in_array(strtolower($func), $this->blacklist)) { |
| 140 | - $msg = (true === $fromArray ? "First element of " : "")."FunctionName blacklisted"; |
|
| 140 | + $msg = (true === $fromArray ? "First element of " : "") . "FunctionName blacklisted"; |
|
| 141 | 141 | throw new \InvalidArgumentException($msg); |
| 142 | 142 | } |
| 143 | 143 | } |
@@ -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]; |
@@ -623,7 +623,7 @@ discard block |
||
| 623 | 623 | * @param InternalOrderByInfo $orderBy The orderBy information |
| 624 | 624 | * @param int $top The top count |
| 625 | 625 | * @param int $skip The skip count |
| 626 | - * @param InternalSkipTokenInfo $skipToken The skip token |
|
| 626 | + * @param SkipTokenInfo $skipToken The skip token |
|
| 627 | 627 | * |
| 628 | 628 | * @return QueryResult |
| 629 | 629 | */ |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | |
| 827 | 827 | /** |
| 828 | 828 | * @param ResourceSet $resourceSet The entity set containing the entity to fetch |
| 829 | - * @param object $sourceEntityInstance The source entity instance |
|
| 829 | + * @param KeyDescriptor $sourceEntityInstance The source entity instance |
|
| 830 | 830 | * @param object $data The New data for the entity instance. |
| 831 | 831 | * |
| 832 | 832 | * returns object|null returns the newly created model if sucessful or null if model creation failed. |
@@ -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 | |