@@ -118,10 +118,10 @@ |
||
| 118 | 118 | /** @var string|null $queryParameterString */ |
| 119 | 119 | $queryParameterString = null; |
| 120 | 120 | foreach ([ODataConstants::HTTPQUERY_STRING_FILTER, |
| 121 | - ODataConstants::HTTPQUERY_STRING_EXPAND, |
|
| 122 | - ODataConstants::HTTPQUERY_STRING_ORDERBY, |
|
| 123 | - ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
|
| 124 | - ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) { |
|
| 121 | + ODataConstants::HTTPQUERY_STRING_EXPAND, |
|
| 122 | + ODataConstants::HTTPQUERY_STRING_ORDERBY, |
|
| 123 | + ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
|
| 124 | + ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) { |
|
| 125 | 125 | /** @var string|null $value */ |
| 126 | 126 | $value = $this->getService()->getHost()->getQueryStringItem($queryOption); |
| 127 | 127 | if (null !== $value) { |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | $targClass = $resourceType->getInstanceType()->getName(); |
| 129 | 129 | if (!($res instanceof $targClass)) { |
| 130 | 130 | $msg = 'Object being serialised not instance of expected class, ' |
| 131 | - . $targClass . ', is actually ' . $payloadClass; |
|
| 131 | + . $targClass . ', is actually ' . $payloadClass; |
|
| 132 | 132 | throw new InvalidOperationException($msg); |
| 133 | 133 | } |
| 134 | 134 | |
@@ -667,7 +667,7 @@ discard block |
||
| 667 | 667 | if (!(ResourcePropertyKind::RESOURCESET_REFERENCE == $propKind |
| 668 | 668 | || ResourcePropertyKind::RESOURCE_REFERENCE == $propKind)) { |
| 669 | 669 | $msg = '$propKind != ResourcePropertyKind::RESOURCESET_REFERENCE &&' |
| 670 | - . ' $propKind != ResourcePropertyKind::RESOURCE_REFERENCE'; |
|
| 670 | + . ' $propKind != ResourcePropertyKind::RESOURCE_REFERENCE'; |
|
| 671 | 671 | throw new InvalidOperationException($msg); |
| 672 | 672 | } |
| 673 | 673 | $propTail = ResourcePropertyKind::RESOURCE_REFERENCE == $propKind ? 'entry' : 'feed'; |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | // so we can't bail out early |
| 387 | 387 | $rawCount += $results->count(); |
| 388 | 388 | // now bolt on filtrate to accumulating result set if we haven't accumulated enough bitz |
| 389 | - if ($rawTop > $resultSet->count() + $skip) { |
|
| 389 | + if ($rawTop > $resultSet->count()+$skip) { |
|
| 390 | 390 | $resultSet = collect(array_merge($resultSet->all(), $results->all())); |
| 391 | 391 | $sliceAmount = min($skip, $resultSet->count()); |
| 392 | 392 | $resultSet = $resultSet->slice($sliceAmount); |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | if (QueryType::COUNT() == $qVal || QueryType::ENTITIES_WITH_COUNT() == $qVal) { |
| 462 | 462 | $result->count = $resultCount; |
| 463 | 463 | } |
| 464 | - $hazMore = $bulkSetCount > $skip + count($resultSet); |
|
| 464 | + $hazMore = $bulkSetCount > $skip+count($resultSet); |
|
| 465 | 465 | $result->hasMore = $hazMore; |
| 466 | 466 | } |
| 467 | 467 | } |