@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | public static function segmentParserKeysMustBeNamed($segment) |
16 | 16 | { |
17 | 17 | return 'Segments with multiple key values must specify them in \'name=value\' form. For the segment' |
18 | - . $segment.' use named keys'; |
|
18 | + . $segment . ' use named keys'; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | /** |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public static function segmentParserMustBeLeafSegment($leafSegment) |
31 | 31 | { |
32 | - return 'The request URI is not valid. The segment \''.$leafSegment.'\' must be the last segment in' |
|
32 | + return 'The request URI is not valid. The segment \'' . $leafSegment . '\' must be the last segment in' |
|
33 | 33 | .' the URI because it is one of the following: $batch, $value, $metadata, $count, a bag property,' |
34 | 34 | .' a named media resource, or a service operation that does not return a value.'; |
35 | 35 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public static function segmentParserNoSegmentAllowedAfterPostLinkSegment($postPostLinkSegment) |
45 | 45 | { |
46 | - return 'The request URI is not valid. The segment \''.$postPostLinkSegment.'\' is not valid. Since the' |
|
46 | + return 'The request URI is not valid. The segment \'' . $postPostLinkSegment . '\' is not valid. Since the' |
|
47 | 47 | .' uri contains the $links segment, there must be only one segment specified after that.'; |
48 | 48 | } |
49 | 49 | |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | */ |
60 | 60 | public static function segmentParserOnlyValueSegmentAllowedAfterPrimitivePropertySegment($segment, $primitivePropertySegment) |
61 | 61 | { |
62 | - return 'The segment \''.$segment.'\' in the request URI is not valid. Since the segment \'' |
|
63 | - .$primitivePropertySegment.'\' refers to a primitive type property, the only supported value from' |
|
62 | + return 'The segment \'' . $segment . '\' in the request URI is not valid. Since the segment \'' |
|
63 | + .$primitivePropertySegment . '\' refers to a primitive type property, the only supported value from' |
|
64 | 64 | .' the next segment is \'$value\'.'; |
65 | 65 | } |
66 | 66 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public static function segmentParserCannotQueryCollection($collectionSegment) |
75 | 75 | { |
76 | - return 'The request URI is not valid. Since the segment \''.$collectionSegment.'\' refers to a' |
|
76 | + return 'The request URI is not valid. Since the segment \'' . $collectionSegment . '\' refers to a' |
|
77 | 77 | .' collection, this must be the last segment in the request URI. All intermediate segments must' |
78 | 78 | .' refer to a single resource.'; |
79 | 79 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | */ |
88 | 88 | public static function segmentParserCountCannotFollowSingleton($segment) |
89 | 89 | { |
90 | - return 'The request URI is not valid, since the segment \''.$segment.'\' refers to a singleton,' |
|
90 | + return 'The request URI is not valid, since the segment \'' . $segment . '\' refers to a singleton,' |
|
91 | 91 | .' and the segment \'$count\' can only follow a resource collection.'; |
92 | 92 | } |
93 | 93 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public static function segmentParserLinkSegmentMustBeFollowedByEntitySegment($segment) |
103 | 103 | { |
104 | - return 'The request URI is not valid. The segment \''.$segment.'\' must refer to a navigation property' |
|
104 | + return 'The request URI is not valid. The segment \'' . $segment . '\' must refer to a navigation property' |
|
105 | 105 | .' since the previous segment identifier is \'$links\'.'; |
106 | 106 | } |
107 | 107 | |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | */ |
127 | 127 | public static function segmentParserSegmentNotAllowedOnRoot($segment) |
128 | 128 | { |
129 | - return 'The request URI is not valid, the segment \''.$segment.'\' cannot be applied to the root of the' |
|
129 | + return 'The request URI is not valid, the segment \'' . $segment . '\' cannot be applied to the root of the' |
|
130 | 130 | .' service'; |
131 | 131 | } |
132 | 132 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | */ |
151 | 151 | public static function segmentParserUnExpectedPropertyKind($expectedKind) |
152 | 152 | { |
153 | - return 'Parsing of segments failed expecting '.$expectedKind.', contact provider'; |
|
153 | + return 'Parsing of segments failed expecting ' . $expectedKind . ', contact provider'; |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | */ |
163 | 163 | public static function segmentParserCountCannotBeApplied($segment) |
164 | 164 | { |
165 | - return 'The request URI is not valid, $count cannot be applied to the segment \''.$segment.'\' since ' |
|
165 | + return 'The request URI is not valid, $count cannot be applied to the segment \'' . $segment . '\' since ' |
|
166 | 166 | .'$count can only follow a resource segment.'; |
167 | 167 | } |
168 | 168 | } |
@@ -27,8 +27,8 @@ |
||
27 | 27 | */ |
28 | 28 | public static function metadataWriterNoResourceAssociationSetForNavigationProperty($navigationPropertyName, $resourceTypeName) |
29 | 29 | { |
30 | - return 'No visible ResourceAssociationSet found for navigation property \''.$navigationPropertyName. |
|
31 | - '\' on type \''.$resourceTypeName.'\'. There must be at least one ResourceAssociationSet for'. |
|
30 | + return 'No visible ResourceAssociationSet found for navigation property \'' . $navigationPropertyName . |
|
31 | + '\' on type \'' . $resourceTypeName . '\'. There must be at least one ResourceAssociationSet for' . |
|
32 | 32 | ' each navigation property.'; |
33 | 33 | } |
34 | 34 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | */ |
16 | 16 | public static function expressionParserInCompatibleTypes($operator, $str, $pos) |
17 | 17 | { |
18 | - return 'Operator \''.$operator.'\' incompatible with operand types '.$str.' at position '.$pos; |
|
18 | + return 'Operator \'' . $operator . '\' incompatible with operand types ' . $str . ' at position ' . $pos; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | /** |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public static function expressionParserOperatorNotSupportNull($operator, $pos) |
30 | 30 | { |
31 | - return 'The operator \''.$operator.'\' at position '.$pos.' is not supported for the \'null\'' |
|
31 | + return 'The operator \'' . $operator . '\' at position ' . $pos . ' is not supported for the \'null\'' |
|
32 | 32 | .' literal; only equality checks are supported'; |
33 | 33 | } |
34 | 34 | |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public static function expressionParserOperatorNotSupportGuid($operator, $pos) |
44 | 44 | { |
45 | - return 'The operator \''.$operator.'\' at position '.$pos.' is not supported for the Edm.Guid;' |
|
45 | + return 'The operator \'' . $operator . '\' at position ' . $pos . ' is not supported for the Edm.Guid;' |
|
46 | 46 | .' only equality checks are supported'; |
47 | 47 | } |
48 | 48 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public static function expressionParserOperatorNotSupportBinary($operator, $pos) |
58 | 58 | { |
59 | - return 'The operator \''.$operator.'\' at position '.$pos.' is not supported for the Edm.Binary;' |
|
59 | + return 'The operator \'' . $operator . '\' at position ' . $pos . ' is not supported for the Edm.Binary;' |
|
60 | 60 | .' only equality checks are supported'; |
61 | 61 | } |
62 | 62 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public static function expressionParserUnrecognizedLiteral($type, $literal, $pos) |
73 | 73 | { |
74 | - return 'Unrecognized \''.$type.'\' literal \''.$literal.'\' in position \''.$pos.'\'.'; |
|
74 | + return 'Unrecognized \'' . $type . '\' literal \'' . $literal . '\' in position \'' . $pos . '\'.'; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public static function expressionParserUnknownFunction($str, $pos) |
86 | 86 | { |
87 | - return 'Unknown function \''.$str.'\' at position '.$pos; |
|
87 | + return 'Unknown function \'' . $str . '\' at position ' . $pos; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public static function expressionParser2UnexpectedExpression($expressionClassName) |
108 | 108 | { |
109 | - return 'Unexpected expression of type \''.$expressionClassName.'\' found'; |
|
109 | + return 'Unexpected expression of type \'' . $expressionClassName . '\' found'; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | */ |
132 | 132 | public static function expressionParserEntityCollectionNotAllowedInFilter($property, $parentProperty, $pos) |
133 | 133 | { |
134 | - return 'The \''.$property.'\' is an entity collection property of \''.$parentProperty.'\' (position: '.$pos |
|
134 | + return 'The \'' . $property . '\' is an entity collection property of \'' . $parentProperty . '\' (position: ' . $pos |
|
135 | 135 | .'), which cannot be used in $filter query option'; |
136 | 136 | } |
137 | 137 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public static function resourceAssociationSetPropertyMustBeNullOrInstanceofResourceProperty($argumentName) |
16 | 16 | { |
17 | - return 'The argument \''.$argumentName.'\' must be either null or instance of \'ResourceProperty\'.'; |
|
17 | + return 'The argument \'' . $argumentName . '\' must be either null or instance of \'ResourceProperty\'.'; |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | /** |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public static function resourceAssociationSetEndPropertyMustBeNavigationProperty($propertyName, $resourceTypeName) |
30 | 30 | { |
31 | - return 'The property '.$propertyName.' must be a navigation property of the resource type '.$resourceTypeName; |
|
31 | + return 'The property ' . $propertyName . ' must be a navigation property of the resource type ' . $resourceTypeName; |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public static function resourceAssociationSetEndResourceTypeMustBeAssignableToResourceSet($resourceTypeName, $resourceSetName) |
44 | 44 | { |
45 | - return 'The resource type '.$resourceTypeName.' must be assignable to the resource set '.$resourceSetName.'.'; |
|
45 | + return 'The resource type ' . $resourceTypeName . ' must be assignable to the resource set ' . $resourceSetName . '.'; |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | /** |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public static function requestVersionTooLow($requestedVersion, $requiredVersion) |
18 | 18 | { |
19 | - return 'Request version \''.$requestedVersion.'\' is not supported for the request payload. The only' |
|
20 | - .' supported version is \''.$requiredVersion.'\'.'; |
|
19 | + return 'Request version \'' . $requestedVersion . '\' is not supported for the request payload. The only' |
|
20 | + .' supported version is \'' . $requiredVersion . '\'.'; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public static function requestVersionIsBiggerThanProtocolVersion($requiredVersion, $configuredVersion) |
33 | 33 | { |
34 | - return 'The response requires that version '.$requiredVersion.' of the protocol be used, but the' |
|
35 | - .' MaxProtocolVersion of the data service is set to '.$configuredVersion.'.'; |
|
34 | + return 'The response requires that version ' . $requiredVersion . ' of the protocol be used, but the' |
|
35 | + .' MaxProtocolVersion of the data service is set to ' . $configuredVersion . '.'; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | /** |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public static function requestDescriptionInvalidVersionHeader($versionAsString, $headerName) |
48 | 48 | { |
49 | - return 'The header '.$headerName.' has malformed version value '.$versionAsString; |
|
49 | + return 'The header ' . $headerName . ' has malformed version value ' . $versionAsString; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | */ |
62 | 62 | public static function requestDescriptionUnSupportedVersion($requestHeaderName, $requestedVersion, $availableVersions) |
63 | 63 | { |
64 | - return 'The version value '.$requestedVersion.' in the header '.$requestHeaderName.' is not' |
|
65 | - .' supported, available versions are '.$availableVersions; |
|
64 | + return 'The version value ' . $requestedVersion . ' in the header ' . $requestHeaderName . ' is not' |
|
65 | + .' supported, available versions are ' . $availableVersions; |
|
66 | 66 | } |
67 | 67 | } |
@@ -15,9 +15,9 @@ discard block |
||
15 | 15 | */ |
16 | 16 | public static function metadataResourceTypeSetNamedStreamsOnDerivedEntityTypesNotSupported($entitySetName, $derivedTypeName) |
17 | 17 | { |
18 | - return 'Named streams are not supported on derived entity types. Entity Set \''.$entitySetName |
|
19 | - .'\' has an instance of type \''.$derivedTypeName.'\', which is a derived entity type and has' |
|
20 | - .' named streams. Please remove all named streams from type \''.$derivedTypeName.'\'.'; |
|
18 | + return 'Named streams are not supported on derived entity types. Entity Set \'' . $entitySetName |
|
19 | + .'\' has an instance of type \'' . $derivedTypeName . '\', which is a derived entity type and has' |
|
20 | + .' named streams. Please remove all named streams from type \'' . $derivedTypeName . '\'.'; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public static function metadataResourceTypeSetBagOfComplexTypeWithDerivedTypes($complexTypeName) |
33 | 33 | { |
34 | - return 'Complex type \''.$complexTypeName.'\' has derived types and is used as the item type in a bag.' |
|
34 | + return 'Complex type \'' . $complexTypeName . '\' has derived types and is used as the item type in a bag.' |
|
35 | 35 | .' Only bags containing complex types without derived types are supported.'; |
36 | 36 | } |
37 | 37 | } |
@@ -519,7 +519,7 @@ |
||
519 | 519 | $this->getOperationContext()->outgoingResponse()->setContentLength($value); |
520 | 520 | } else { |
521 | 521 | throw ODataException::notAcceptableError( |
522 | - 'ContentLength:'.$value.' is invalid' |
|
522 | + 'ContentLength:' . $value . ' is invalid' |
|
523 | 523 | ); |
524 | 524 | } |
525 | 525 | } |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | $expectedParms = count($baseParms); |
136 | 136 | $actualParms = count($parms); |
137 | 137 | if ($expectedParms != $actualParms) { |
138 | - $msg = 'Was expecting '. $expectedParms. ' arguments, received '.$actualParms.' instead'; |
|
138 | + $msg = 'Was expecting ' . $expectedParms . ' arguments, received ' . $actualParms . ' instead'; |
|
139 | 139 | throw new \InvalidArgumentException($msg); |
140 | 140 | } |
141 | 141 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | private function checkBlacklist($func, $fromArray = false) |
150 | 150 | { |
151 | 151 | if (in_array($func, $this->blacklist) || in_array(strtolower($func), $this->blacklist)) { |
152 | - $msg = (true === $fromArray ? 'First element of ' : '').'FunctionName blacklisted'; |
|
152 | + $msg = (true === $fromArray ? 'First element of ' : '') . 'FunctionName blacklisted'; |
|
153 | 153 | throw new \InvalidArgumentException($msg); |
154 | 154 | } |
155 | 155 | } |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | $type = null; |
296 | 296 | if ($typeKind == ResourceTypeKind::ENTITY) { |
297 | 297 | list($oet, $entitySet) = $this->metadataManager->addEntityType($name); |
298 | - assert($oet instanceof TEntityTypeType, 'Entity type '.$name. ' not successfully added'); |
|
298 | + assert($oet instanceof TEntityTypeType, 'Entity type ' . $name . ' not successfully added'); |
|
299 | 299 | $type = new ResourceEntityType($refClass, $oet, $this); |
300 | 300 | $typeName = $type->getFullName(); |
301 | 301 | $returnName = Str::plural($typeName); |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | ); |
596 | 596 | } |
597 | 597 | if (!in_array($resourceMult, $allowedMult)) { |
598 | - throw new InvalidOperationException('Supplied multiplicity '.$resourceMult.' not valid'); |
|
598 | + throw new InvalidOperationException('Supplied multiplicity ' . $resourceMult . ' not valid'); |
|
599 | 599 | } |
600 | 600 | |
601 | 601 | $resourcePropertyKind = ('*' == $resourceMult) |
@@ -889,12 +889,12 @@ discard block |
||
889 | 889 | throw new \InvalidArgumentException($msg); |
890 | 890 | } |
891 | 891 | if (array_key_exists($name, $this->resourceSets)) { |
892 | - $msg = 'Resource set with same name, '. $name. ', exists'; |
|
892 | + $msg = 'Resource set with same name, ' . $name . ', exists'; |
|
893 | 893 | throw new \InvalidArgumentException($msg); |
894 | 894 | } |
895 | 895 | $typeName = $returnType->getName(); |
896 | 896 | if (!array_key_exists($typeName, $this->OdataEntityMap)) { |
897 | - $msg = 'Mapping not defined for '.$typeName; |
|
897 | + $msg = 'Mapping not defined for ' . $typeName; |
|
898 | 898 | throw new \InvalidArgumentException($msg); |
899 | 899 | } |
900 | 900 | $metaReturn = $this->OdataEntityMap[$typeName]; |