@@ -132,7 +132,7 @@ |
||
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | $this->rawUrl .= '://' . |
| 135 | - $_SERVER[HttpProcessUtility::headerToServerKey(ODataConstants::HTTPREQUEST_HEADER_HOST)]; |
|
| 135 | + $_SERVER[HttpProcessUtility::headerToServerKey(ODataConstants::HTTPREQUEST_HEADER_HOST)]; |
|
| 136 | 136 | $this->rawUrl .= utf8_decode(urldecode($_SERVER[ODataConstants::HTTPREQUEST_URI])); |
| 137 | 137 | } |
| 138 | 138 | |
@@ -430,7 +430,8 @@ |
||
| 430 | 430 | $resourceTypeKind, |
| 431 | 431 | $navigationProperties |
| 432 | 432 | ); |
| 433 | - } else { //This is the code path to handle projected properties of Entry |
|
| 433 | + } else { |
|
| 434 | +//This is the code path to handle projected properties of Entry |
|
| 434 | 435 | list($odataPropertyContent, $navigationProperties) = $this->writeObjectPropertiesExpanded( |
| 435 | 436 | $customObject, |
| 436 | 437 | $resourceType, |
@@ -570,7 +570,8 @@ |
||
| 570 | 570 | ); |
| 571 | 571 | $this->writeProperties($content); |
| 572 | 572 | $this->xmlWriter->endElement(); |
| 573 | - } else { //probably just a primitive string |
|
| 573 | + } else { |
|
| 574 | +//probably just a primitive string |
|
| 574 | 575 | $this->xmlWriter->startElementNs( |
| 575 | 576 | ODataConstants::ODATA_NAMESPACE_PREFIX, |
| 576 | 577 | ODataConstants::COLLECTION_ELEMENT_NAME, |
@@ -28,7 +28,8 @@ |
||
| 28 | 28 | throw new UrlFormatException(Messages::urlMalformedUrl($url)); |
| 29 | 29 | } |
| 30 | 30 | } else { |
| 31 | - if (!preg_match(self::REL_URL_REGEXP, $url)) { //TODO: this matches EVERYTHING!!! what's the intent here? see #77 |
|
| 31 | + if (!preg_match(self::REL_URL_REGEXP, $url)) { |
|
| 32 | +//TODO: this matches EVERYTHING!!! what's the intent here? see #77 |
|
| 32 | 33 | throw new UrlFormatException(Messages::urlMalformedUrl($url)); |
| 33 | 34 | } |
| 34 | 35 | } |
@@ -262,7 +262,7 @@ |
||
| 262 | 262 | |
| 263 | 263 | case ODataConstants::STRFUN_ENDSWITH: |
| 264 | 264 | return '(strcmp(substr('.$params[0].', strlen('.$params[0].') - strlen('.$params[1].')), ' |
| 265 | - .$params[1].') === 0)'; |
|
| 265 | + .$params[1].') === 0)'; |
|
| 266 | 266 | |
| 267 | 267 | case ODataConstants::STRFUN_INDEXOF: |
| 268 | 268 | return 'strpos('.$params[0].', '.$params[1].')'; |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | public static function metadataAssociationTypeSetBidirectionalAssociationMustReturnSameResourceAssociationSetFromBothEnd() |
| 16 | 16 | { |
| 17 | 17 | return 'When the ResourceAssociationSet is bidirectional, IMetadataProvider::getResourceAssociationSet() must'. |
| 18 | - ' return the same ResourceAssociationSet when call from both ends.'; |
|
| 18 | + ' return the same ResourceAssociationSet when call from both ends.'; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | public static function metadataAssociationTypeSetMultipleAssociationSetsForTheSameAssociationTypeMustNotReferToSameEndSets($resourceSet1Name, $resourceSet2Name, $entitySetName) |
| 33 | 33 | { |
| 34 | 34 | return 'ResourceAssociationSets \''.$resourceSet1Name.'\' and \''.$resourceSet2Name.'\' have a' |
| 35 | - .' ResourceAssociationSetEnd referring to the same EntitySet \''.$entitySetName.'\' through the same' |
|
| 36 | - .' AssociationType. Make sure that if two or more AssociationSets refer to the same AssociationType,' |
|
| 37 | - .' the ends must not refer to the same EntitySet. (this could happen if multiple entity sets have' |
|
| 38 | - .' entity types that have a common ancestor and the ancestor has a property of derived entity types)'; |
|
| 35 | + .' ResourceAssociationSetEnd referring to the same EntitySet \''.$entitySetName.'\' through the same' |
|
| 36 | + .' AssociationType. Make sure that if two or more AssociationSets refer to the same AssociationType,' |
|
| 37 | + .' the ends must not refer to the same EntitySet. (this could happen if multiple entity sets have' |
|
| 38 | + .' entity types that have a common ancestor and the ancestor has a property of derived entity types)'; |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
@@ -49,6 +49,6 @@ discard block |
||
| 49 | 49 | public static function metadataAssociationTypeSetInvalidGetDerivedTypesReturnType($resourceTypeName) |
| 50 | 50 | { |
| 51 | 51 | return 'Return type of IDSMP::getDerivedTypes should be either null or array of \'ResourceType\', check' |
| 52 | - .' implementation of IDSMP::getDerivedTypes for the resource type \''.$resourceTypeName.'\'.'; |
|
| 52 | + .' implementation of IDSMP::getDerivedTypes for the resource type \''.$resourceTypeName.'\'.'; |
|
| 53 | 53 | } |
| 54 | 54 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | public static function queryProviderResultCountMissing($methodName, QueryType $queryType) |
| 26 | 26 | { |
| 27 | 27 | return 'The implementation of the method '.$methodName.' must return a QueryResult instance with a count for ' |
| 28 | - .'queries of type '.$queryType.'.'; |
|
| 28 | + .'queries of type '.$queryType.'.'; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -37,6 +37,6 @@ discard block |
||
| 37 | 37 | public static function queryProviderResultsMissing($methodName, QueryType $queryType) |
| 38 | 38 | { |
| 39 | 39 | return 'The implementation of the method '.$methodName.' must return a QueryResult instance with an array' |
| 40 | - .' of results for queries of type '.$queryType.'.'; |
|
| 40 | + .' of results for queries of type '.$queryType.'.'; |
|
| 41 | 41 | } |
| 42 | 42 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | public static function badQueryNullKeysAreNotSupported($resourceTypeName, $keyName) |
| 32 | 32 | { |
| 33 | 33 | return 'The serialized resource of type '.$resourceTypeName.' has a null value in key member \''.$keyName |
| 34 | - .'\'. Null values are not supported in key members.'; |
|
| 34 | + .'\'. Null values are not supported in key members.'; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | public static function objectModelSerializerFailedToAccessProperty($propertyName, $parentObjectName) |
| 47 | 47 | { |
| 48 | 48 | return 'objectModelSerializer failed to access or initialize the property '.$propertyName.' of ' |
| 49 | - .$parentObjectName.', Please contact provider.'; |
|
| 49 | + .$parentObjectName.', Please contact provider.'; |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
@@ -60,6 +60,6 @@ discard block |
||
| 60 | 60 | public static function objectModelSerializerLoopsNotAllowedInComplexTypes($complexPropertyName) |
| 61 | 61 | { |
| 62 | 62 | return 'A circular loop was detected while serializing the property \'' . $complexPropertyName |
| 63 | - . '\'. You must make sure that loops are not present in properties that return a bag or complex type.'; |
|
| 63 | + . '\'. You must make sure that loops are not present in properties that return a bag or complex type.'; |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | public static function skipTokenInfoBothOrderByPathAndOrderByValuesShouldBeSetOrNotSet($orderByPathsVarName, $orderByValuesVarName) |
| 20 | 20 | { |
| 21 | 21 | return 'Either both the arguments '.$orderByPathsVarName.' and '.$orderByValuesVarName.' should be' |
| 22 | - .' null or not-null'; |
|
| 22 | + .' null or not-null'; |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |