@@ -120,12 +120,6 @@ class Builder extends BaseBuilder
120
120
'>= ' => '$gte ' ,
121
121
];
122
122
123
- /**
124
- * Check if we need to return Collections instead of plain arrays (laravel >= 5.3 )
125
- * @var boolean
126
- */
127
- protected $ useCollections ;
128
-
129
123
/**
130
124
* @inheritdoc
131
125
*/
@@ -134,22 +128,6 @@ public function __construct(Connection $connection, Processor $processor)
134
128
$ this ->grammar = new Grammar ;
135
129
$ this ->connection = $ connection ;
136
130
$ this ->processor = $ processor ;
137
- $ this ->useCollections = $ this ->shouldUseCollections ();
138
- }
139
-
140
- /**
141
- * Returns true if Laravel or Lumen >= 5.3
142
- * @return bool
143
- */
144
- protected function shouldUseCollections ()
145
- {
146
- if (function_exists ('app ' )) {
147
- $ version = app ()->version ();
148
- $ version = filter_var (explode (') ' , $ version )[0 ], FILTER_SANITIZE_NUMBER_FLOAT , FILTER_FLAG_ALLOW_FRACTION ); // lumen
149
- return version_compare ($ version , '5.3 ' , '>= ' );
150
- }
151
-
152
- return true ;
153
131
}
154
132
155
133
/**
@@ -303,7 +281,7 @@ public function getFresh($columns = [], $returnLazy = false)
303
281
'aggregate ' => $ totalResults
304
282
]
305
283
];
306
- return $ this -> useCollections ? new Collection ($ results ) : $ results ;
284
+ return new Collection ($ results );
307
285
} elseif ($ function == 'count ' ) {
308
286
// Translate count into sum.
309
287
$ group ['aggregate ' ] = ['$sum ' => 1 ];
@@ -360,7 +338,7 @@ public function getFresh($columns = [], $returnLazy = false)
360
338
$ results = iterator_to_array ($ this ->collection ->aggregate ($ pipeline , $ options ));
361
339
362
340
// Return results
363
- return $ this -> useCollections ? new Collection ($ results ) : $ results ;
341
+ return Collection ($ results );
364
342
} // Distinct query
365
343
elseif ($ this ->distinct ) {
366
344
// Return distinct results directly
@@ -373,7 +351,7 @@ public function getFresh($columns = [], $returnLazy = false)
373
351
$ result = $ this ->collection ->distinct ($ column );
374
352
}
375
353
376
- return $ this -> useCollections ? new Collection ($ result ) : $ result ;
354
+ return new Collection ($ result );
377
355
} // Normal query
378
356
else {
379
357
$ columns = [];
@@ -430,7 +408,7 @@ public function getFresh($columns = [], $returnLazy = false)
430
408
431
409
// Return results as an array with numeric keys
432
410
$ results = iterator_to_array ($ cursor , false );
433
- return $ this -> useCollections ? new Collection ($ results ) : $ results ;
411
+ return new Collection ($ results );
434
412
}
435
413
}
436
414
@@ -685,7 +663,7 @@ public function pluck($column, $key = null)
685
663
}
686
664
687
665
$ p = Arr::pluck ($ results , $ column , $ key );
688
- return $ this -> useCollections ? new Collection ($ p ) : $ p ;
666
+ return new Collection ($ p );
689
667
}
690
668
691
669
/**
0 commit comments