@@ -71,8 +71,7 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | /** @var MetadataTrait $model */ |
| 73 | 73 | $model = $sourceEntityInstance instanceof Model ? |
| 74 | - $sourceEntityInstance : |
|
| 75 | - $sourceEntityInstance->getRelated(); |
|
| 74 | + $sourceEntityInstance : $sourceEntityInstance->getRelated(); |
|
| 76 | 75 | $modelLoad = $model->getEagerLoad(); |
| 77 | 76 | $tableName = $model->getTable(); |
| 78 | 77 | $rawLoad = array_unique(array_merge($rawLoad, $modelLoad)); |
@@ -384,7 +383,7 @@ discard block |
||
| 384 | 383 | // so we can't bail out early |
| 385 | 384 | $rawCount += $results->count(); |
| 386 | 385 | // now bolt on filtrate to accumulating result set if we haven't accumulated enough bitz |
| 387 | - if ($rawTop > $resultSet->count() + $skip) { |
|
| 386 | + if ($rawTop > $resultSet->count()+$skip) { |
|
| 388 | 387 | $resultSet = collect(array_merge($resultSet->all(), $results->all())); |
| 389 | 388 | $sliceAmount = min($skip, $resultSet->count()); |
| 390 | 389 | $resultSet = $resultSet->slice($sliceAmount); |
@@ -456,7 +455,7 @@ discard block |
||
| 456 | 455 | if (QueryType::COUNT() == $qVal || QueryType::ENTITIES_WITH_COUNT() == $qVal) { |
| 457 | 456 | $result->count = $resultCount; |
| 458 | 457 | } |
| 459 | - $hazMore = $bulkSetCount > $skip + count($resultSet); |
|
| 458 | + $hazMore = $bulkSetCount > $skip+count($resultSet); |
|
| 460 | 459 | $result->hasMore = $hazMore; |
| 461 | 460 | } |
| 462 | 461 | } |
@@ -44,6 +44,6 @@ |
||
| 44 | 44 | $model = $this; |
| 45 | 45 | |
| 46 | 46 | return self::$relationNames = self::$relationNames ?? |
| 47 | - ModelReflectionHelper::getRelationshipsFromMethods($model); |
|
| 47 | + ModelReflectionHelper::getRelationshipsFromMethods($model); |
|
| 48 | 48 | } |
| 49 | 49 | } |
@@ -55,8 +55,7 @@ |
||
| 55 | 55 | $subProp = new ODataProperty(); |
| 56 | 56 | $subProp->name = $corn; |
| 57 | 57 | $subProp->value = isset($flake) ? |
| 58 | - SerialiserLowLevelWriters::primitiveToString($rType, $flake) : |
|
| 59 | - null; |
|
| 58 | + SerialiserLowLevelWriters::primitiveToString($rType, $flake) : null; |
|
| 60 | 59 | $subProp->typeName = $nrp->getResourceType()->getFullName(); |
| 61 | 60 | $propertyContent->properties[$corn] = $subProp; |
| 62 | 61 | } |