@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | { |
| 218 | 218 | $this->containerName = $containerName; |
| 219 | 219 | $this->namespaceName = $namespaceName; |
| 220 | - $this->metadataManager = new MetadataManager($namespaceName,$containerName); |
|
| 220 | + $this->metadataManager = new MetadataManager($namespaceName, $containerName); |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | /** |
@@ -440,8 +440,8 @@ discard block |
||
| 440 | 440 | $resourceProperty = new ResourceProperty($name, null, $kind, $primitiveResourceType); |
| 441 | 441 | $resourceType->addProperty($resourceProperty); |
| 442 | 442 | //if(array_key_exists($resourceType, $this->OdataEntityMap)){ |
| 443 | - if(null == $this->OdataEntityMap[$resourceType->getFullName()]) { |
|
| 444 | - $this->metadataManager->addPropertyToEntityType($this->OdataEntityMap[$resourceType->getFullName()],$name,$primitiveResourceType->getFullName(),null,false,$isKey); |
|
| 443 | + if (null == $this->OdataEntityMap[$resourceType->getFullName()]) { |
|
| 444 | + $this->metadataManager->addPropertyToEntityType($this->OdataEntityMap[$resourceType->getFullName()], $name, $primitiveResourceType->getFullName(), null, false, $isKey); |
|
| 445 | 445 | } |
| 446 | 446 | } |
| 447 | 447 | |
@@ -504,11 +504,11 @@ discard block |
||
| 504 | 504 | new ResourceAssociationSetEnd($sourceResourceSet, $resourceType, $resourceProperty), |
| 505 | 505 | new ResourceAssociationSetEnd($targetResourceSet, $targetResourceType, null) |
| 506 | 506 | ); |
| 507 | - if($resourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE){ |
|
| 507 | + if ($resourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE) { |
|
| 508 | 508 | |
| 509 | - $this->metadataManager->addNavigationPropertyToEntityType($this->OdataEntityMap[$resourceType->getFullName()],"*",$name,$this->OdataEntityMap[$targetResourceType->getFullName()],"*"); |
|
| 510 | - }else{ |
|
| 511 | - $this->metadataManager->addNavigationPropertyToEntityType($this->OdataEntityMap[$resourceType->getFullName],"0..1",$name,$this->OdataEntityMap[$targetResourceType->getFullName()],"0..1"); |
|
| 509 | + $this->metadataManager->addNavigationPropertyToEntityType($this->OdataEntityMap[$resourceType->getFullName()], "*", $name, $this->OdataEntityMap[$targetResourceType->getFullName()], "*"); |
|
| 510 | + } else { |
|
| 511 | + $this->metadataManager->addNavigationPropertyToEntityType($this->OdataEntityMap[$resourceType->getFullName], "0..1", $name, $this->OdataEntityMap[$targetResourceType->getFullName()], "0..1"); |
|
| 512 | 512 | } |
| 513 | 513 | $this->associationSets[$setKey] = $set; |
| 514 | 514 | } |
@@ -539,7 +539,7 @@ discard block |
||
| 539 | 539 | $this->resourceTypes[$name] = $entityType; |
| 540 | 540 | ksort($this->resourceTypes); |
| 541 | 541 | |
| 542 | - if($typeKind == ResourceTypeKind::ENTITY){ |
|
| 542 | + if ($typeKind == ResourceTypeKind::ENTITY) { |
|
| 543 | 543 | $this->OdataEntityMap[$entityType->getFullName()] = $this->metadataManager->addEntityType($name); |
| 544 | 544 | } |
| 545 | 545 | |
@@ -507,7 +507,7 @@ |
||
| 507 | 507 | if($resourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE){ |
| 508 | 508 | |
| 509 | 509 | $this->metadataManager->addNavigationPropertyToEntityType($this->OdataEntityMap[$resourceType->getFullName()],"*",$name,$this->OdataEntityMap[$targetResourceType->getFullName()],"*"); |
| 510 | - }else{ |
|
| 510 | + } else{ |
|
| 511 | 511 | $this->metadataManager->addNavigationPropertyToEntityType($this->OdataEntityMap[$resourceType->getFullName],"0..1",$name,$this->OdataEntityMap[$targetResourceType->getFullName()],"0..1"); |
| 512 | 512 | } |
| 513 | 513 | $this->associationSets[$setKey] = $set; |