@@ -621,10 +621,10 @@ |
||
621 | 621 | { |
622 | 622 | $queryParameterString = null; |
623 | 623 | foreach ([ODataConstants::HTTPQUERY_STRING_FILTER, |
624 | - ODataConstants::HTTPQUERY_STRING_EXPAND, |
|
625 | - ODataConstants::HTTPQUERY_STRING_ORDERBY, |
|
626 | - ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
|
627 | - ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) { |
|
624 | + ODataConstants::HTTPQUERY_STRING_EXPAND, |
|
625 | + ODataConstants::HTTPQUERY_STRING_ORDERBY, |
|
626 | + ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
|
627 | + ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) { |
|
628 | 628 | $value = $this->getService()->getHost()->getQueryStringItem($queryOption); |
629 | 629 | if (!is_null($value)) { |
630 | 630 | if (!is_null($queryParameterString)) { |
@@ -56,7 +56,7 @@ |
||
56 | 56 | }; |
57 | 57 | $this->functionDescriptionParsers[ODataConstants::STRFUN_ENDSWITH] = function ($params) { |
58 | 58 | return '(strcmp(substr('.$params[0].', strlen('.$params[0].') - strlen('.$params[1].')), ' |
59 | - .$params[1].') === 0)'; |
|
59 | + .$params[1].') === 0)'; |
|
60 | 60 | }; |
61 | 61 | $this->functionDescriptionParsers[ODataConstants::STRFUN_INDEXOF] = function ($params) { |
62 | 62 | return 'strpos('.$params[0].', '.$params[1].')'; |
@@ -301,17 +301,17 @@ |
||
301 | 301 | $lastCode = $code[strlen($code) - 1]; |
302 | 302 | assert('}' == $lastCode, 'Final character of function definition must be closing brace'); |
303 | 303 | foreach ([ |
304 | - 'hasMany', |
|
305 | - 'hasManyThrough', |
|
306 | - 'belongsToMany', |
|
307 | - 'hasOne', |
|
308 | - 'belongsTo', |
|
309 | - 'morphOne', |
|
310 | - 'morphTo', |
|
311 | - 'morphMany', |
|
312 | - 'morphToMany', |
|
313 | - 'morphedByMany' |
|
314 | - ] as $relation) { |
|
304 | + 'hasMany', |
|
305 | + 'hasManyThrough', |
|
306 | + 'belongsToMany', |
|
307 | + 'hasOne', |
|
308 | + 'belongsTo', |
|
309 | + 'morphOne', |
|
310 | + 'morphTo', |
|
311 | + 'morphMany', |
|
312 | + 'morphToMany', |
|
313 | + 'morphedByMany' |
|
314 | + ] as $relation) { |
|
315 | 315 | $search = '$this->' . $relation . '('; |
316 | 316 | if ($pos = stripos($code, $search)) { |
317 | 317 | //Resolve the relation's model to a Relation object. |
@@ -114,7 +114,7 @@ |
||
114 | 114 | |
115 | 115 | $maxRel = $isKnown ? PHP_INT_MAX : 2 * $numRel; |
116 | 116 | $msg = 'Key '.$keyName. ' on class '.$className . ' should have no more than ' |
117 | - .$maxRel.' lines, has '.count($result); |
|
117 | + .$maxRel.' lines, has '.count($result); |
|
118 | 118 | assert($maxRel >= count($result), $msg); |
119 | 119 | return $result; |
120 | 120 | } |