Reformat

src/Jenssegers/Mongodb/Query/Builder.php

@@ -216,7 +216,8 @@ class Builder extends BaseBuilder
                     // Translate count into sum.
                     if ($function == 'count') {
                         $group['aggregate'] = ['$sum' => 1];
-                    } // Pass other functions directly.
+                    }
+                    // Pass other functions directly.
                     else {
                         $group['aggregate'] = ['$' . $function => '$' . $column];
                     }
@@ -267,8 +268,10 @@ class Builder extends BaseBuilder
             $results = iterator_to_array($this->collection->aggregate($pipeline, $options));
 
             // Return results
-            return $this->use_collection ? new Collection($results) : $results;
-        } // Distinct query
+            return SHOULD_RETURN_COLLECTION ? new Collection($results) : $results;
+        }
+
+        // Distinct query
         elseif ($this->distinct) {
             // Return distinct results directly
             $column = isset($this->columns[0]) ? $this->columns[0] : '_id';
@@ -280,8 +283,10 @@ class Builder extends BaseBuilder
                 $result = $this->collection->distinct($column);
             }
 
-            return $this->use_collection ? new Collection($result) : $result;
-        } // Normal query
+            return SHOULD_RETURN_COLLECTION ? new Collection($result) : $result;
+        }
+
+        // Normal query
         else {
             $columns = [];
 
@@ -322,7 +327,7 @@ class Builder extends BaseBuilder
 
             // Return results as an array with numeric keys
             $results = iterator_to_array($cursor, false);
-            return $this->use_collection ? new Collection($results) : $results;
+            return SHOULD_RETURN_COLLECTION ? new Collection($results) : $results;
         }
     }
 
@@ -368,7 +373,7 @@ class Builder extends BaseBuilder
         $this->aggregate = null;
 
         if (isset($results[0])) {
-            $result = (array)$results[0];
+            $result = (array) $results[0];
 
             return $result['aggregate'];
         }
@@ -381,7 +386,7 @@ class Builder extends BaseBuilder
      */
     public function exists()
     {
-        return !is_null($this->first());
+        return ! is_null($this->first());
     }
 
     /**
@@ -469,20 +474,20 @@ class Builder extends BaseBuilder
         foreach ($values as $value) {
             // As soon as we find a value that is not an array we assume the user is
             // inserting a single document.
-            if (!is_array($value)) {
+            if (! is_array($value)) {
                 $batch = false;
                 break;
             }
         }
 
-        if (!$batch) {
+        if (! $batch) {
             $values = [$values];
         }
 
         // Batch insert
         $result = $this->collection->insertMany($values);
 
-        return (1 == (int)$result->isAcknowledged());
+        return (1 == (int) $result->isAcknowledged());
     }
 
     /**
@@ -496,7 +501,7 @@ class Builder extends BaseBuilder
     {
         $result = $this->collection->insertOne($values);
 
-        if (1 == (int)$result->isAcknowledged()) {
+        if (1 == (int) $result->isAcknowledged()) {
             if (is_null($sequence)) {
                 $sequence = '_id';
             }
@@ -516,7 +521,7 @@ class Builder extends BaseBuilder
     public function update(array $values, array $options = [])
     {
         // Use $set as default operator.
-        if (!starts_with(key($values), '$')) {
+        if (! starts_with(key($values), '$')) {
             $values = ['$set' => $values];
         }
 
@@ -535,7 +540,7 @@ class Builder extends BaseBuilder
     {
         $query = ['$inc' => [$column => $amount]];
 
-        if (!empty($extra)) {
+        if (! empty($extra)) {
             $query['$set'] = $extra;
         }
 
@@ -573,7 +578,7 @@ class Builder extends BaseBuilder
     {
         $results = $this->get(is_null($key) ? [$column] : [$column, $key]);
 
-        return $results->pluck($column, $key);
+        return $results->pluck($column,$key);
     }
 
     /**
@@ -586,7 +591,7 @@ class Builder extends BaseBuilder
     {
         $wheres = $this->compileWheres();
         $result = $this->collection->DeleteMany($wheres);
-        if (1 == (int)$result->isAcknowledged()) {
+        if (1 == (int) $result->isAcknowledged()) {
             return $result->getDeletedCount();
         }
 
@@ -615,7 +620,7 @@ class Builder extends BaseBuilder
     {
         $result = $this->collection->drop();
 
-        return (1 == (int)$result->ok);
+        return (1 == (int) $result->ok);
     }
 
     /**
@@ -633,7 +638,7 @@ class Builder extends BaseBuilder
 
             // Convert ObjectID's to strings so that lists can do its work.
             $results = $results->map(function ($item) {
-                $item['_id'] = (string)$item['_id'];
+                $item['_id'] = (string) $item['_id'];
 
                 return $item;
             });
@@ -655,8 +660,10 @@ class Builder extends BaseBuilder
         // Execute the closure on the mongodb collection
         if ($expression instanceof Closure) {
             return call_user_func($expression, $this->collection);
-        } // Create an expression for the given value
-        elseif (!is_null($expression)) {
+        }
+
+        // Create an expression for the given value
+        elseif (! is_null($expression)) {
             return new Expression($expression);
         }
 
@@ -722,7 +729,7 @@ class Builder extends BaseBuilder
      */
     public function drop($columns)
     {
-        if (!is_array($columns)) {
+        if (! is_array($columns)) {
             $columns = [$columns];
         }
 
@@ -757,13 +764,13 @@ class Builder extends BaseBuilder
     protected function performUpdate($query, array $options = [])
     {
         // Update multiple items by default.
-        if (!array_key_exists('multiple', $options)) {
+        if (! array_key_exists('multiple', $options)) {
             $options['multiple'] = true;
         }
 
         $wheres = $this->compileWheres();
         $result = $this->collection->UpdateMany($wheres, $query, $options);
-        if (1 == (int)$result->isAcknowledged()) {
+        if (1 == (int) $result->isAcknowledged()) {
             return $result->getModifiedCount() ? $result->getModifiedCount() : $result->getUpsertedCount();
         }
 
@@ -854,7 +861,9 @@ class Builder extends BaseBuilder
                     foreach ($where['values'] as &$value) {
                         $value = $this->convertKey($value);
                     }
-                } // Single value.
+                }
+
+                // Single value.
                 elseif (isset($where['value'])) {
                     $where['value'] = $this->convertKey($where['value']);
                 }
@@ -906,18 +915,20 @@ class Builder extends BaseBuilder
             $regex = preg_replace('#(^|[^\\\])%#', '$1.*', preg_quote($value));
 
             // Convert like to regular expression.
-            if (!starts_with($value, '%')) {
+            if (! starts_with($value, '%')) {
                 $regex = '^' . $regex;
             }
-            if (!ends_with($value, '%')) {
+            if (! ends_with($value, '%')) {
                 $regex = $regex . '$';
             }
 
             $value = new Regex($regex, 'i');
-        } // Manipulate regexp operations.
+        }
+
+        // Manipulate regexp operations.
         elseif (in_array($operator, ['regexp', 'not regexp', 'regex', 'not regex'])) {
             // Automatically convert regular expression strings to Regex objects.
-            if (!$value instanceof Regex) {
+            if (! $value instanceof Regex) {
                 $e = explode('/', $value);
                 $flag = end($e);
                 $regstr = substr($value, 1, -(strlen($flag) + 1));
@@ -931,7 +942,7 @@ class Builder extends BaseBuilder
             }
         }
 
-        if (!isset($operator) or $operator == '=') {
+        if (! isset($operator) or $operator == '=') {
             $query = [$column => $value];
         } elseif (array_key_exists($operator, $this->conversion)) {
             $query = [$column => [$this->conversion[$operator] => $value]];