@@ -50,7 +50,7 @@ |
||
50 | 50 | * |
51 | 51 | * @return bool true if the segment was push, false otherwise |
52 | 52 | */ |
53 | - public function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper) |
|
53 | + public function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper) |
|
54 | 54 | { |
55 | 55 | if (!is_string($segmentName)) { |
56 | 56 | throw new InvalidOperationException('segmentName must be a string'); |
@@ -157,8 +157,8 @@ |
||
157 | 157 | |
158 | 158 | case 'Edm.DateTime': |
159 | 159 | $dateTime = new Carbon($value, new \DateTimeZone('UTC')); |
160 | - $formattedDateTime = $dateTime->format('U') * 1000; |
|
161 | - $this->writeCore('/Date('.$formattedDateTime.')/', /* quotes */ true); |
|
160 | + $formattedDateTime = $dateTime->format('U')*1000; |
|
161 | + $this->writeCore('/Date(' . $formattedDateTime . ')/', /* quotes */ true); |
|
162 | 162 | break; |
163 | 163 | |
164 | 164 | case 'Edm.String': |
@@ -411,7 +411,7 @@ |
||
411 | 411 | $this->getRequest()->getFilterInfo(), |
412 | 412 | null, // $orderby |
413 | 413 | null, // $top |
414 | - null, // $skip |
|
414 | + null, // $skip |
|
415 | 415 | $skipToken |
416 | 416 | ); |
417 | 417 | } |
@@ -38,7 +38,7 @@ |
||
38 | 38 | */ |
39 | 39 | public function getLeft() |
40 | 40 | { |
41 | - return isset($this->left) ? $this->left: null; |
|
41 | + return isset($this->left) ? $this->left : null; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -397,7 +397,7 @@ |
||
397 | 397 | //TODO: why are these null? see #98 |
398 | 398 | null, // $orderby |
399 | 399 | null, // $top |
400 | - null, // $skip |
|
400 | + null, // $skip |
|
401 | 401 | $skipToken |
402 | 402 | ); |
403 | 403 |
@@ -203,7 +203,7 @@ |
||
203 | 203 | */ |
204 | 204 | public static function tryParseKeysFromKeyPredicate( |
205 | 205 | $keyPredicate, |
206 | - KeyDescriptor &$keyDescriptor = null |
|
206 | + KeyDescriptor & $keyDescriptor = null |
|
207 | 207 | ) { |
208 | 208 | return self::tryParseKeysFromRawKeyPredicate( |
209 | 209 | $keyPredicate, |
@@ -258,81 +258,81 @@ |
||
258 | 258 | { |
259 | 259 | switch ($functionDescription->name) { |
260 | 260 | case ODataConstants::STRFUN_COMPARE: |
261 | - return 'strcmp('.$params[0].', '.$params[1].')'; |
|
261 | + return 'strcmp(' . $params[0] . ', ' . $params[1] . ')'; |
|
262 | 262 | |
263 | 263 | case ODataConstants::STRFUN_ENDSWITH: |
264 | - return '(strcmp(substr('.$params[0].', strlen('.$params[0].') - strlen('.$params[1].')), ' |
|
265 | - .$params[1].') === 0)'; |
|
264 | + return '(strcmp(substr(' . $params[0] . ', strlen(' . $params[0] . ') - strlen(' . $params[1] . ')), ' |
|
265 | + .$params[1] . ') === 0)'; |
|
266 | 266 | |
267 | 267 | case ODataConstants::STRFUN_INDEXOF: |
268 | - return 'strpos('.$params[0].', '.$params[1].')'; |
|
268 | + return 'strpos(' . $params[0] . ', ' . $params[1] . ')'; |
|
269 | 269 | |
270 | 270 | case ODataConstants::STRFUN_REPLACE: |
271 | - return 'str_replace('.$params[1].', '.$params[2].', '.$params[0].')'; |
|
271 | + return 'str_replace(' . $params[1] . ', ' . $params[2] . ', ' . $params[0] . ')'; |
|
272 | 272 | |
273 | 273 | case ODataConstants::STRFUN_STARTSWITH: |
274 | - return '(strpos('.$params[0].', '.$params[1].') === 0)'; |
|
274 | + return '(strpos(' . $params[0] . ', ' . $params[1] . ') === 0)'; |
|
275 | 275 | |
276 | 276 | case ODataConstants::STRFUN_TOLOWER: |
277 | - return 'strtolower('.$params[0].')'; |
|
277 | + return 'strtolower(' . $params[0] . ')'; |
|
278 | 278 | |
279 | 279 | case ODataConstants::STRFUN_TOUPPER: |
280 | - return 'strtoupper('.$params[0].')'; |
|
280 | + return 'strtoupper(' . $params[0] . ')'; |
|
281 | 281 | |
282 | 282 | case ODataConstants::STRFUN_TRIM: |
283 | - return 'trim('.$params[0].')'; |
|
283 | + return 'trim(' . $params[0] . ')'; |
|
284 | 284 | |
285 | 285 | case ODataConstants::STRFUN_SUBSTRING: |
286 | 286 | return count($params) == 3 ? |
287 | - 'substr('.$params[0].', '.$params[1].', '.$params[2].')' : 'substr('.$params[0].', '.$params[1].')'; |
|
287 | + 'substr(' . $params[0] . ', ' . $params[1] . ', ' . $params[2] . ')' : 'substr(' . $params[0] . ', ' . $params[1] . ')'; |
|
288 | 288 | |
289 | 289 | case ODataConstants::STRFUN_SUBSTRINGOF: |
290 | - return '(strpos('.$params[1].', '.$params[0].') !== false)'; |
|
290 | + return '(strpos(' . $params[1] . ', ' . $params[0] . ') !== false)'; |
|
291 | 291 | |
292 | 292 | case ODataConstants::STRFUN_CONCAT: |
293 | 293 | return $params[0] . ' . ' . $params[1]; |
294 | 294 | |
295 | 295 | case ODataConstants::STRFUN_LENGTH: |
296 | - return 'strlen('.$params[0].')'; |
|
296 | + return 'strlen(' . $params[0] . ')'; |
|
297 | 297 | |
298 | 298 | case ODataConstants::GUIDFUN_EQUAL: |
299 | - return self::TYPE_NAMESPACE . 'Guid::guidEqual('.$params[0].', '.$params[1].')'; |
|
299 | + return self::TYPE_NAMESPACE . 'Guid::guidEqual(' . $params[0] . ', ' . $params[1] . ')'; |
|
300 | 300 | |
301 | 301 | case ODataConstants::DATETIME_COMPARE: |
302 | - return self::TYPE_NAMESPACE . 'DateTime::dateTimeCmp('.$params[0].', '.$params[1].')'; |
|
302 | + return self::TYPE_NAMESPACE . 'DateTime::dateTimeCmp(' . $params[0] . ', ' . $params[1] . ')'; |
|
303 | 303 | |
304 | 304 | case ODataConstants::DATETIME_YEAR: |
305 | - return self::TYPE_NAMESPACE . 'DateTime::year('.$params[0].')'; |
|
305 | + return self::TYPE_NAMESPACE . 'DateTime::year(' . $params[0] . ')'; |
|
306 | 306 | |
307 | 307 | case ODataConstants::DATETIME_MONTH: |
308 | - return self::TYPE_NAMESPACE . 'DateTime::month('.$params[0].')'; |
|
308 | + return self::TYPE_NAMESPACE . 'DateTime::month(' . $params[0] . ')'; |
|
309 | 309 | |
310 | 310 | case ODataConstants::DATETIME_DAY: |
311 | - return self::TYPE_NAMESPACE . 'DateTime::day('.$params[0].')'; |
|
311 | + return self::TYPE_NAMESPACE . 'DateTime::day(' . $params[0] . ')'; |
|
312 | 312 | |
313 | 313 | case ODataConstants::DATETIME_HOUR: |
314 | - return self::TYPE_NAMESPACE . 'DateTime::hour('.$params[0].')'; |
|
314 | + return self::TYPE_NAMESPACE . 'DateTime::hour(' . $params[0] . ')'; |
|
315 | 315 | |
316 | 316 | case ODataConstants::DATETIME_MINUTE: |
317 | - return self::TYPE_NAMESPACE . 'DateTime::minute('.$params[0].')'; |
|
317 | + return self::TYPE_NAMESPACE . 'DateTime::minute(' . $params[0] . ')'; |
|
318 | 318 | |
319 | 319 | case ODataConstants::DATETIME_SECOND: |
320 | - return self::TYPE_NAMESPACE . 'DateTime::second('.$params[0].')'; |
|
320 | + return self::TYPE_NAMESPACE . 'DateTime::second(' . $params[0] . ')'; |
|
321 | 321 | |
322 | 322 | case ODataConstants::MATHFUN_ROUND: |
323 | - return 'round('.$params[0].')'; |
|
323 | + return 'round(' . $params[0] . ')'; |
|
324 | 324 | |
325 | 325 | case ODataConstants::MATHFUN_CEILING: |
326 | - return 'ceil('.$params[0].')'; |
|
326 | + return 'ceil(' . $params[0] . ')'; |
|
327 | 327 | |
328 | 328 | case ODataConstants::MATHFUN_FLOOR: |
329 | - return 'floor('.$params[0].')'; |
|
329 | + return 'floor(' . $params[0] . ')'; |
|
330 | 330 | |
331 | 331 | case ODataConstants::BINFUL_EQUAL: |
332 | - return self::TYPE_NAMESPACE . 'Binary::binaryEqual('.$params[0].', '.$params[1].')'; |
|
332 | + return self::TYPE_NAMESPACE . 'Binary::binaryEqual(' . $params[0] . ', ' . $params[1] . ')'; |
|
333 | 333 | |
334 | 334 | case 'is_null': |
335 | - return 'is_null('.$params[0].')'; |
|
335 | + return 'is_null(' . $params[0] . ')'; |
|
336 | 336 | |
337 | 337 | default: |
338 | 338 | throw new \InvalidArgumentException('onFunctionCallExpression'); |
@@ -249,48 +249,48 @@ discard block |
||
249 | 249 | { |
250 | 250 | switch ($functionDescription->name) { |
251 | 251 | case ODataConstants::STRFUN_COMPARE: |
252 | - return 'STRCMP('.$params[0].', '.$params[1].')'; |
|
252 | + return 'STRCMP(' . $params[0] . ', ' . $params[1] . ')'; |
|
253 | 253 | |
254 | 254 | case ODataConstants::STRFUN_ENDSWITH: |
255 | - return '(STRCMP('.$params[1].',RIGHT('.$params[0].',LENGTH('.$params[1].'))) = 0)'; |
|
255 | + return '(STRCMP(' . $params[1] . ',RIGHT(' . $params[0] . ',LENGTH(' . $params[1] . '))) = 0)'; |
|
256 | 256 | |
257 | 257 | case ODataConstants::STRFUN_INDEXOF: |
258 | - return 'INSTR('.$params[0].', '.$params[1].') - 1'; |
|
258 | + return 'INSTR(' . $params[0] . ', ' . $params[1] . ') - 1'; |
|
259 | 259 | |
260 | 260 | case ODataConstants::STRFUN_REPLACE: |
261 | - return 'REPLACE('.$params[0].','.$params[1].','.$params[2].')'; |
|
261 | + return 'REPLACE(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ')'; |
|
262 | 262 | |
263 | 263 | case ODataConstants::STRFUN_STARTSWITH: |
264 | - return '(STRCMP('.$params[1].',LEFT('.$params[0].',LENGTH('.$params[1].'))) = 0)'; |
|
264 | + return '(STRCMP(' . $params[1] . ',LEFT(' . $params[0] . ',LENGTH(' . $params[1] . '))) = 0)'; |
|
265 | 265 | |
266 | 266 | case ODataConstants::STRFUN_TOLOWER: |
267 | - return 'LOWER('.$params[0].')'; |
|
267 | + return 'LOWER(' . $params[0] . ')'; |
|
268 | 268 | |
269 | 269 | case ODataConstants::STRFUN_TOUPPER: |
270 | - return 'UPPER('.$params[0].')'; |
|
270 | + return 'UPPER(' . $params[0] . ')'; |
|
271 | 271 | |
272 | 272 | case ODataConstants::STRFUN_TRIM: |
273 | - return 'TRIM('.$params[0].')'; |
|
273 | + return 'TRIM(' . $params[0] . ')'; |
|
274 | 274 | |
275 | 275 | case ODataConstants::STRFUN_SUBSTRING: |
276 | 276 | return count($params) == 3 ? |
277 | - 'SUBSTRING('.$params[0].', '.$params[1].' + 1, '.$params[2].')' |
|
278 | - : 'SUBSTRING('.$params[0].', '.$params[1].' + 1)'; |
|
277 | + 'SUBSTRING(' . $params[0] . ', ' . $params[1] . ' + 1, ' . $params[2] . ')' |
|
278 | + : 'SUBSTRING(' . $params[0] . ', ' . $params[1] . ' + 1)'; |
|
279 | 279 | |
280 | 280 | case ODataConstants::STRFUN_SUBSTRINGOF: |
281 | - return '(LOCATE('.$params[0].', '.$params[1].') > 0)'; |
|
281 | + return '(LOCATE(' . $params[0] . ', ' . $params[1] . ') > 0)'; |
|
282 | 282 | |
283 | 283 | case ODataConstants::STRFUN_CONCAT: |
284 | - return 'CONCAT('.$params[0].','.$params[1].')'; |
|
284 | + return 'CONCAT(' . $params[0] . ',' . $params[1] . ')'; |
|
285 | 285 | |
286 | 286 | case ODataConstants::STRFUN_LENGTH: |
287 | - return 'LENGTH('.$params[0].')'; |
|
287 | + return 'LENGTH(' . $params[0] . ')'; |
|
288 | 288 | |
289 | 289 | case ODataConstants::GUIDFUN_EQUAL: |
290 | - return 'STRCMP('.$params[0].', '.$params[1].')'; |
|
290 | + return 'STRCMP(' . $params[0] . ', ' . $params[1] . ')'; |
|
291 | 291 | |
292 | 292 | case ODataConstants::DATETIME_COMPARE: |
293 | - return 'DATETIMECMP('.$params[0].'; '.$params[1].')'; |
|
293 | + return 'DATETIMECMP(' . $params[0] . '; ' . $params[1] . ')'; |
|
294 | 294 | |
295 | 295 | case ODataConstants::DATETIME_YEAR: |
296 | 296 | return 'EXTRACT(YEAR from ' . $params[0] . ')'; |
@@ -311,19 +311,19 @@ discard block |
||
311 | 311 | return 'EXTRACT(SECOND from ' . $params[0] . ')'; |
312 | 312 | |
313 | 313 | case ODataConstants::MATHFUN_ROUND: |
314 | - return 'ROUND('.$params[0].')'; |
|
314 | + return 'ROUND(' . $params[0] . ')'; |
|
315 | 315 | |
316 | 316 | case ODataConstants::MATHFUN_CEILING: |
317 | - return 'CEIL('.$params[0].')'; |
|
317 | + return 'CEIL(' . $params[0] . ')'; |
|
318 | 318 | |
319 | 319 | case ODataConstants::MATHFUN_FLOOR: |
320 | - return 'FLOOR('.$params[0].')'; |
|
320 | + return 'FLOOR(' . $params[0] . ')'; |
|
321 | 321 | |
322 | 322 | case ODataConstants::BINFUL_EQUAL: |
323 | - return '('.$params[0].' = '.$params[1].')'; |
|
323 | + return '(' . $params[0] . ' = ' . $params[1] . ')'; |
|
324 | 324 | |
325 | 325 | case 'is_null': |
326 | - return 'is_null('.$params[0].')'; |
|
326 | + return 'is_null(' . $params[0] . ')'; |
|
327 | 327 | |
328 | 328 | default: |
329 | 329 | throw new \InvalidArgumentException('onFunctionCallExpression'); |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public static function metadataAssociationTypeSetBidirectionalAssociationMustReturnSameResourceAssociationSetFromBothEnd() |
16 | 16 | { |
17 | - return 'When the ResourceAssociationSet is bidirectional, IMetadataProvider::getResourceAssociationSet() must'. |
|
17 | + return 'When the ResourceAssociationSet is bidirectional, IMetadataProvider::getResourceAssociationSet() must' . |
|
18 | 18 | ' return the same ResourceAssociationSet when call from both ends.'; |
19 | 19 | } |
20 | 20 | |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public static function metadataAssociationTypeSetMultipleAssociationSetsForTheSameAssociationTypeMustNotReferToSameEndSets($resourceSet1Name, $resourceSet2Name, $entitySetName) |
33 | 33 | { |
34 | - return 'ResourceAssociationSets \''.$resourceSet1Name.'\' and \''.$resourceSet2Name.'\' have a' |
|
35 | - .' ResourceAssociationSetEnd referring to the same EntitySet \''.$entitySetName.'\' through the same' |
|
34 | + return 'ResourceAssociationSets \'' . $resourceSet1Name . '\' and \'' . $resourceSet2Name . '\' have a' |
|
35 | + .' ResourceAssociationSetEnd referring to the same EntitySet \'' . $entitySetName . '\' through the same' |
|
36 | 36 | .' AssociationType. Make sure that if two or more AssociationSets refer to the same AssociationType,' |
37 | 37 | .' the ends must not refer to the same EntitySet. (this could happen if multiple entity sets have' |
38 | 38 | .' entity types that have a common ancestor and the ancestor has a property of derived entity types)'; |
@@ -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 | } |