@@ -538,7 +538,7 @@ discard block |
||
| 538 | 538 | ) { |
| 539 | 539 | if (!($sourceResourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE |
| 540 | 540 | || $targetResourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE) |
| 541 | - && !($sourceResourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE |
|
| 541 | + && !($sourceResourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE |
|
| 542 | 542 | || $targetResourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE) |
| 543 | 543 | ) { |
| 544 | 544 | throw new InvalidOperationException( |
@@ -552,25 +552,25 @@ discard block |
||
| 552 | 552 | $this->checkInstanceProperty($targetPropertyName, $targetResourceType); |
| 553 | 553 | // check that property and resource name don't up and collide - would violate OData spec |
| 554 | 554 | if (strtolower($sourcePropertyName) == strtolower($sourceResourceType->getName()) |
| 555 | - || strtolower($targetResourceType) == strtolower($targetResourceType->getName()) |
|
| 556 | - ) { |
|
| 555 | + || strtolower($targetResourceType) == strtolower($targetResourceType->getName()) |
|
| 556 | + ) { |
|
| 557 | 557 | throw new InvalidOperationException( |
| 558 | 558 | 'Property name must be different from resource name.' |
| 559 | 559 | ); |
| 560 | 560 | } |
| 561 | 561 | |
| 562 | - $sourceResourceProperty = new ResourceProperty($sourcePropertyName, null, $sourceResourcePropertyKind, $sourceResourceType); |
|
| 562 | + $sourceResourceProperty = new ResourceProperty($sourcePropertyName, null, $sourceResourcePropertyKind, $sourceResourceType); |
|
| 563 | 563 | $targetResourceProperty = new ResourceProperty($targetPropertyName, null, $targetResourcePropertyKind, $targetResourceType); |
| 564 | 564 | |
| 565 | 565 | $sourceResourceType->addProperty($sourceResourceProperty); |
| 566 | - $targetResourceType->addProperty($targetResourceProperty); |
|
| 566 | + $targetResourceType->addProperty($targetResourceProperty); |
|
| 567 | 567 | |
| 568 | 568 | |
| 569 | 569 | //Customer_Orders_Orders, Order_Customer_Customers |
| 570 | 570 | //(source type::name _ source property::name _ target set::name) |
| 571 | 571 | $setKey = ResourceAssociationSet::keyName($sourceResourceType->getName(), $sourcePropertyName, $targetResourceType->getName(), $targetPropertyName); |
| 572 | 572 | //$setKey = $resourceType->getName() . '_' . $name . '_' . $targetResourceType->getName(); |
| 573 | - $set = new ResourceAssociationSet( |
|
| 573 | + $set = new ResourceAssociationSet( |
|
| 574 | 574 | $setKey, |
| 575 | 575 | new ResourceAssociationSetEnd($sourceResourceSet, $sourceResourceType, $sourceResourceProperty), |
| 576 | 576 | new ResourceAssociationSetEnd($targetResourceSet, $targetResourceType, $targetResourceProperty) |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | * @param string $sourcePropertyName The name of the property to add to the sourceResourceType |
| 363 | 363 | * @param string $targetPropertyName The name of the property to add to the targetResourceType |
| 364 | 364 | */ |
| 365 | - public function addBidirectionalResourceResourceReferenceProperty(ResourceSet $sourceResourceSet,ResourceSet $targeteResourceSet, $sourcePropertyName,$targetPropertyName) |
|
| 365 | + public function addBidirectionalResourceResourceReferenceProperty(ResourceSet $sourceResourceSet, ResourceSet $targeteResourceSet, $sourcePropertyName, $targetPropertyName) |
|
| 366 | 366 | { |
| 367 | 367 | $this->_addBidirectionalReferencePropertyInternal( |
| 368 | 368 | $sourceResourceSet, |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | * @param string $sourcePropertyName The name of the property to add to the sourceResourceType |
| 385 | 385 | * @param string $targetPropertyName The name of the property to add to the targetResourceType |
| 386 | 386 | */ |
| 387 | - public function addBidirectionalResourceResourceSetReferenceProperty(ResourceSet $sourceResourceSet,ResourceSet $targeteResourceSet, $sourcePropertyName,$targetPropertyName) |
|
| 387 | + public function addBidirectionalResourceResourceSetReferenceProperty(ResourceSet $sourceResourceSet, ResourceSet $targeteResourceSet, $sourcePropertyName, $targetPropertyName) |
|
| 388 | 388 | { |
| 389 | 389 | $this->_addBidirectionalReferencePropertyInternal( |
| 390 | 390 | $sourceResourceSet, |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | * @param string $sourcePropertyName The name of the property to add to the sourceResourceType |
| 407 | 407 | * @param string $targetPropertyName The name of the property to add to the targetResourceType |
| 408 | 408 | */ |
| 409 | - public function addBidirectionalResourceSetResourceReferenceProperty(ResourceSet $sourceResourceSet,ResourceSet $targeteResourceSet, $sourcePropertyName,$targetPropertyName) |
|
| 409 | + public function addBidirectionalResourceSetResourceReferenceProperty(ResourceSet $sourceResourceSet, ResourceSet $targeteResourceSet, $sourcePropertyName, $targetPropertyName) |
|
| 410 | 410 | { |
| 411 | 411 | $this->_addBidirectionalReferencePropertyInternal( |
| 412 | 412 | $sourceResourceSet, |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | * @param string $sourcePropertyName The name of the property to add to the sourceResourceType |
| 429 | 429 | * @param string $targetPropertyName The name of the property to add to the targetResourceType |
| 430 | 430 | */ |
| 431 | - public function addBidirectionalResourceSetResourceSetReferenceProperty(ResourceSet $sourceResourceSet,ResourceSet $targeteResourceSet, $sourcePropertyName,$targetPropertyName) |
|
| 431 | + public function addBidirectionalResourceSetResourceSetReferenceProperty(ResourceSet $sourceResourceSet, ResourceSet $targeteResourceSet, $sourcePropertyName, $targetPropertyName) |
|
| 432 | 432 | { |
| 433 | 433 | $this->_addBidirectionalReferencePropertyInternal( |
| 434 | 434 | $sourceResourceSet, |