Remove deprecated lists

Author: pi0

src/Jenssegers/Mongodb/Eloquent/Builder.php

@@ -13,15 +13,15 @@ class Builder extends EloquentBuilder
      * @var array
      */
     protected $passthru = [
-        'toSql', 'lists', 'insert', 'insertGetId', 'pluck',
+        'toSql', 'insert', 'insertGetId', 'pluck',
         'count', 'min', 'max', 'avg', 'sum', 'exists', 'push', 'pull',
     ];
 
     /**
      * Update a record in the database.
      *
-     * @param  array  $values
-     * @param  array  $options
+     * @param  array $values
+     * @param  array $options
      * @return int
      */
     public function update(array $values, array $options = [])
@@ -40,7 +40,7 @@ public function update(array $values, array $options = [])
     /**
      * Insert a new record into the database.
      *
-     * @param  array  $values
+     * @param  array $values
      * @return bool
      */
     public function insert(array $values)
@@ -59,8 +59,8 @@ public function insert(array $values)
     /**
      * Insert a new record and get the value of the primary key.
      *
-     * @param  array   $values
-     * @param  string  $sequence
+     * @param  array $values
+     * @param  string $sequence
      * @return int
      */
     public function insertGetId(array $values, $sequence = null)
@@ -97,9 +97,9 @@ public function delete()
     /**
      * Increment a column's value by a given amount.
      *
-     * @param  string  $column
-     * @param  int     $amount
-     * @param  array   $extra
+     * @param  string $column
+     * @param  int $amount
+     * @param  array $extra
      * @return int
      */
     public function increment($column, $amount = 1, array $extra = [])
@@ -127,9 +127,9 @@ public function increment($column, $amount = 1, array $extra = [])
     /**
      * Decrement a column's value by a given amount.
      *
-     * @param  string  $column
-     * @param  int     $amount
-     * @param  array   $extra
+     * @param  string $column
+     * @param  int $amount
+     * @param  array $extra
      * @return int
      */
     public function decrement($column, $amount = 1, array $extra = [])
@@ -155,19 +155,21 @@ public function decrement($column, $amount = 1, array $extra = [])
     /**
      * Add the "has" condition where clause to the query.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $hasQuery
-     * @param  \Illuminate\Database\Eloquent\Relations\Relation  $relation
-     * @param  string  $operator
-     * @param  int  $count
-     * @param  string  $boolean
+     * @param  \Illuminate\Database\Eloquent\Builder $hasQuery
+     * @param  \Illuminate\Database\Eloquent\Relations\Relation $relation
+     * @param  string $operator
+     * @param  int $count
+     * @param  string $boolean
      * @return \Illuminate\Database\Eloquent\Builder
      */
     protected function addHasWhere(EloquentBuilder $hasQuery, Relation $relation, $operator, $count, $boolean)
     {
         $query = $hasQuery->getQuery();
 
         // Get the number of related objects for each possible parent.
-        $relationCount = array_count_values($query->lists($relation->getHasCompareKey()));
+        $relationCount = array_count_values(array_map(function ($id) {
+            return (string)$id; // Convert Back ObjectIds to Strings
+        }, $query->pluck($relation->getHasCompareKey())));
 
         // Remove unwanted related objects based on the operator and count.
         $relationCount = array_filter($relationCount, function ($counted) use ($count, $operator) {
@@ -207,7 +209,7 @@ protected function addHasWhere(EloquentBuilder $hasQuery, Relation $relation, $o
     /**
      * Create a raw database expression.
      *
-     * @param  closure  $expression
+     * @param  closure $expression
      * @return mixed
      */
     public function raw($expression = null)
@@ -219,17 +221,13 @@ public function raw($expression = null)
         if ($results instanceof Cursor) {
             $results = iterator_to_array($results, false);
             return $this->model->hydrate($results);
-        }
-
-        // Convert Mongo BSONDocument to a single object.
+        } // Convert Mongo BSONDocument to a single object.
         elseif ($results instanceof BSONDocument) {
             $results = $results->getArrayCopy();
-            return $this->model->newFromBuilder((array) $results);
-        }
-
-        // The result is a single object.
+            return $this->model->newFromBuilder((array)$results);
+        } // The result is a single object.
         elseif (is_array($results) and array_key_exists('_id', $results)) {
-            return $this->model->newFromBuilder((array) $results);
+            return $this->model->newFromBuilder((array)$results);
         }
 
         return $results;

src/Jenssegers/Mongodb/Query/Builder.php

@@ -569,14 +569,7 @@ public function pluck($column, $key = null)
     {
         $results = $this->get(is_null($key) ? [$column] : [$column, $key]);
 
-        // If the columns are qualified with a table or have an alias, we cannot use
-        // those directly in the "pluck" operations since the results from the DB
-        // are only keyed by the column itself. We'll strip the table out here.
-        return Arr::pluck(
-            $results,
-            $column,
-            $key
-        );
+        return $results->pluck($column,$key);
     }
 
     /**
@@ -624,6 +617,7 @@ public function truncate()
     /**
      * Get an array with the values of a given column.
      *
+     * @deprecated
      * @param  string  $column
      * @param  string  $key
      * @return array
@@ -640,10 +634,10 @@ public function lists($column, $key = null)
                 return $item;
             });
 
-            return $results->lists($column, $key)->all();
+            return $results->pluck($column, $key)->all();
         }
 
-        return parent::lists($column, $key);
+        return parent::pluck($column, $key);
     }
 
     /**