@@ -5,7 +5,6 @@ |
||
5 | 5 | use POData\Common\Messages; |
6 | 6 | use POData\Common\ODataException; |
7 | 7 | use POData\Providers\Metadata\ResourcePropertyKind; |
8 | -use POData\Providers\Metadata\ResourceSet; |
|
9 | 8 | use POData\Providers\Metadata\ResourceSetWrapper; |
10 | 9 | use POData\Providers\Metadata\ResourceType; |
11 | 10 | use POData\Providers\Metadata\ResourceTypeKind; |
@@ -11,7 +11,6 @@ |
||
11 | 11 | use POData\Providers\Metadata\ResourcePropertyKind; |
12 | 12 | use POData\Providers\Metadata\ResourceType; |
13 | 13 | use POData\Providers\Metadata\ResourceTypeKind; |
14 | -use POData\Providers\Metadata\ResourceStreamInfo; |
|
15 | 14 | use POData\Providers\Metadata\Type\Binary; |
16 | 15 | use POData\Providers\Metadata\Type\Boolean; |
17 | 16 | use POData\Providers\Metadata\Type\DateTime; |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | $sourceResourceSet, |
369 | 369 | $targeteResourceSet, |
370 | 370 | $sourcePropertyName, |
371 | - $sourcePropertyName, |
|
371 | + $sourcePropertyName, |
|
372 | 372 | ResourcePropertyKind::RESOURCE_REFERENCE, |
373 | 373 | ResourcePropertyKind::RESOURCE_REFERENCE |
374 | 374 | ); |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | $sourceResourceSet, |
391 | 391 | $targeteResourceSet, |
392 | 392 | $sourcePropertyName, |
393 | - $sourcePropertyName, |
|
393 | + $sourcePropertyName, |
|
394 | 394 | ResourcePropertyKind::RESOURCE_REFERENCE, |
395 | 395 | ResourcePropertyKind::RESOURCESET_REFERENCE |
396 | 396 | ); |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | $sourceResourceSet, |
413 | 413 | $targeteResourceSet, |
414 | 414 | $sourcePropertyName, |
415 | - $sourcePropertyName, |
|
415 | + $sourcePropertyName, |
|
416 | 416 | ResourcePropertyKind::RESOURCESET_REFERENCE, |
417 | 417 | ResourcePropertyKind::RESOURCESET_REFERENCE |
418 | 418 | ); |
@@ -606,7 +606,7 @@ discard block |
||
606 | 606 | ) { |
607 | 607 | if (!($sourceResourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE |
608 | 608 | || $targetResourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE) |
609 | - && !($sourceResourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE |
|
609 | + && !($sourceResourcePropertyKind == ResourcePropertyKind::RESOURCESET_REFERENCE |
|
610 | 610 | || $targetResourcePropertyKind == ResourcePropertyKind::RESOURCE_REFERENCE) |
611 | 611 | ) { |
612 | 612 | throw new InvalidOperationException( |
@@ -620,25 +620,25 @@ discard block |
||
620 | 620 | $this->checkInstanceProperty($targetPropertyName, $targetResourceType); |
621 | 621 | // check that property and resource name don't up and collide - would violate OData spec |
622 | 622 | if (strtolower($sourcePropertyName) == strtolower($sourceResourceType->getName()) |
623 | - || strtolower($targetResourceType) == strtolower($targetResourceType->getName()) |
|
624 | - ) { |
|
623 | + || strtolower($targetResourceType) == strtolower($targetResourceType->getName()) |
|
624 | + ) { |
|
625 | 625 | throw new InvalidOperationException( |
626 | 626 | 'Property name must be different from resource name.' |
627 | 627 | ); |
628 | 628 | } |
629 | 629 | |
630 | - $sourceResourceProperty = new ResourceProperty($sourcePropertyName, null, $sourceResourcePropertyKind, $sourceResourceType); |
|
630 | + $sourceResourceProperty = new ResourceProperty($sourcePropertyName, null, $sourceResourcePropertyKind, $sourceResourceType); |
|
631 | 631 | $targetResourceProperty = new ResourceProperty($targetPropertyName, null, $targetResourcePropertyKind, $targetResourceType); |
632 | 632 | |
633 | 633 | $sourceResourceType->addProperty($sourceResourceProperty); |
634 | - $targetResourceType->addProperty($targetResourceProperty); |
|
634 | + $targetResourceType->addProperty($targetResourceProperty); |
|
635 | 635 | |
636 | 636 | |
637 | 637 | //Customer_Orders_Orders, Order_Customer_Customers |
638 | 638 | //(source type::name _ source property::name _ target set::name) |
639 | 639 | $setKey = ResourceAssociationSet::keyName($sourceResourceType->getName(), $sourcePropertyName, $targetResourceType->getName(), $targetPropertyName); |
640 | 640 | //$setKey = $resourceType->getName() . '_' . $name . '_' . $targetResourceType->getName(); |
641 | - $set = new ResourceAssociationSet( |
|
641 | + $set = new ResourceAssociationSet( |
|
642 | 642 | $setKey, |
643 | 643 | new ResourceAssociationSetEnd($sourceResourceSet, $sourceResourceType, $sourceResourceProperty), |
644 | 644 | new ResourceAssociationSetEnd($targetResourceSet, $targetResourceType, $targetResourceProperty) |