@@ -140,8 +140,8 @@ discard block |
||
140 | 140 | $nullFilter = true; |
141 | 141 | $isvalid = null; |
142 | 142 | if (isset($filterInfo)) { |
143 | - $method = 'return '.$filterInfo->getExpressionAsString().';'; |
|
144 | - $clln = '$'.$resourceSet->getResourceType()->getName(); |
|
143 | + $method = 'return ' . $filterInfo->getExpressionAsString() . ';'; |
|
144 | + $clln = '$' . $resourceSet->getResourceType()->getName(); |
|
145 | 145 | $isvalid = create_function($clln, $method); |
146 | 146 | $nullFilter = false; |
147 | 147 | } |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | // so we can't bail out early |
170 | 170 | $rawCount += $results->count(); |
171 | 171 | // now bolt on filtrate to accumulating result set if we haven't accumulated enough bitz |
172 | - if ($rawTop > $resultSet->count() + $skip) { |
|
172 | + if ($rawTop > $resultSet->count()+$skip) { |
|
173 | 173 | $resultSet = collect(array_merge($resultSet->all(), $results->all())); |
174 | 174 | $sliceAmount = min($skip, $resultSet->count()); |
175 | 175 | $resultSet = $resultSet->slice($sliceAmount); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | if (QueryType::COUNT() == $queryType || QueryType::ENTITIES_WITH_COUNT() == $queryType) { |
208 | 208 | $result->count = $resultCount; |
209 | 209 | } |
210 | - $hazMore = $bulkSetCount > $skip + count($resultSet); |
|
210 | + $hazMore = $bulkSetCount > $skip+count($resultSet); |
|
211 | 211 | $result->hasMore = $hazMore; |
212 | 212 | return $result; |
213 | 213 | } |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | ) { |
368 | 368 | $propertyName = $targetProperty->getName(); |
369 | 369 | if (!method_exists($sourceEntityInstance, $propertyName)) { |
370 | - $msg = 'Relation method, '.$propertyName.', does not exist on supplied entity.'; |
|
370 | + $msg = 'Relation method, ' . $propertyName . ', does not exist on supplied entity.'; |
|
371 | 371 | throw new InvalidArgumentException($msg); |
372 | 372 | } |
373 | 373 | // take key descriptor and turn it into where clause here, rather than in getResource call |