@@ -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 | |
@@ -469,7 +469,7 @@ |
||
| 469 | 469 | ODataConstants::HTTPQUERY_STRING_ORDERBY, |
| 470 | 470 | ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
| 471 | 471 | ODataConstants::HTTPQUERY_STRING_SELECT |
| 472 | - ] as $queryOption) { |
|
| 472 | + ] as $queryOption) { |
|
| 473 | 473 | $value = $this->getService()->getHost()->getQueryStringItem($queryOption); |
| 474 | 474 | if (!is_null($value)) { |
| 475 | 475 | if (!is_null($queryParameterString)) { |
@@ -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 | /** |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | public static function providersWrapperNull() |
| 13 | 13 | { |
| 14 | 14 | return 'For custom providers, GetService should not return null for both IMetadataProvider and' |
| 15 | - .' IQueryProvider types.'; |
|
| 15 | + .' IQueryProvider types.'; |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | /** |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | public static function providersWrapperInvalidExpressionProviderInstance() |
| 36 | 36 | { |
| 37 | 37 | return 'The value returned by IQueryProvider::getExpressionProvider method must be an implementation' |
| 38 | - .' of IExpressionProvider'; |
|
| 38 | + .' of IExpressionProvider'; |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | public static function providersWrapperEntitySetNameShouldBeUnique($entitySetName) |
| 73 | 73 | { |
| 74 | 74 | return 'More than one entity set with the name \''.$entitySetName |
| 75 | - .'\' was found. Entity set names must be unique'; |
|
| 75 | + .'\' was found. Entity set names must be unique'; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | public static function providersWrapperEntityTypeNameShouldBeUnique($entityTypeName) |
| 87 | 87 | { |
| 88 | 88 | return 'More than one entity type with the name \''.$entityTypeName |
| 89 | - .'\' was found. Entity type names must be unique'; |
|
| 89 | + .'\' was found. Entity type names must be unique'; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | public static function providersWrapperIDSMPGetResourceSetReturnsInvalidResourceSet($resourceSetName, $resourceTypeName, $resourcePropertyName) |
| 103 | 103 | { |
| 104 | 104 | return 'IDSMP::GetResourceSet retruns invalid instance of ResourceSet when invoked with params'. |
| 105 | - ' {ResourceSet with name '.$resourceSetName.', ResourceType with name '.$resourceTypeName |
|
| 106 | - .', ResourceProperty with name '.$resourcePropertyName.'}.'; |
|
| 105 | + ' {ResourceSet with name '.$resourceSetName.', ResourceType with name '.$resourceTypeName |
|
| 106 | + .', ResourceProperty with name '.$resourcePropertyName.'}.'; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | public static function providersWrapperIDSQPMethodReturnsUnExpectedType($entityTypeName, $methodName) |
| 119 | 119 | { |
| 120 | 120 | return 'The implementation of the method ' . $methodName . ' must return an instance of type described' |
| 121 | - .' by resource set\'s type(' . $entityTypeName . ') or null if resource does not exist.'; |
|
| 121 | + .' by resource set\'s type(' . $entityTypeName . ') or null if resource does not exist.'; |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | /** |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | public static function eTagNotAllowedForNonExistingResource() |
| 14 | 14 | { |
| 15 | 15 | return 'The resource targeted by the request does not exists, eTag header is not allowed for' |
| 16 | - .' non-existing resource.'; |
|
| 16 | + .' non-existing resource.'; |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | /** |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | public static function noETagPropertiesForType() |
| 26 | 26 | { |
| 27 | 27 | return 'If-Match or If-None-Match headers cannot be specified if the target type does not have' |
| 28 | - .' etag properties defined.'; |
|
| 28 | + .' etag properties defined.'; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | public static function eTagCannotBeSpecified($uri) |
| 51 | 51 | { |
| 52 | 52 | return 'If-Match or If-None-Match HTTP headers cannot be specified since the URI \''.$uri.'\' refers to a' |
| 53 | - .' collection of resources or has a $count or $link segment or has an $expand as one of the query' |
|
| 54 | - .' parameters.'; |
|
| 53 | + .' collection of resources or has a $count or $link segment or has an $expand as one of the query' |
|
| 54 | + .' parameters.'; |
|
| 55 | 55 | } |
| 56 | 56 | } |