Commit 5706ed38 authored by pi0's avatar pi0

Style CI

parent 76b86559
......@@ -15,8 +15,8 @@ class MongodbServiceProvider extends ServiceProvider
Model::setEventDispatcher($this->app['events']);
$s=explode('.',\Illuminate\Foundation\Application::VERSION);
define('SHOULD_RETURN_COLLECTION',(10*$s[0]+$s[1])>=53);
$s = explode('.', \Illuminate\Foundation\Application::VERSION);
define('SHOULD_RETURN_COLLECTION', (10 * $s[0] + $s[1]) >= 53);
}
/**
......
......@@ -11,7 +11,6 @@ use MongoDB\BSON\ObjectID;
use MongoDB\BSON\Regex;
use MongoDB\BSON\UTCDateTime;
class Builder extends BaseBuilder
{
/**
......@@ -208,7 +207,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];
}
......@@ -260,7 +260,9 @@ class Builder extends BaseBuilder
// Return results
return SHOULD_RETURN_COLLECTION ? new Collection($results) : $results;
} // Distinct query
}
// Distinct query
elseif ($this->distinct) {
// Return distinct results directly
$column = isset($this->columns[0]) ? $this->columns[0] : '_id';
......@@ -273,7 +275,9 @@ class Builder extends BaseBuilder
}
return SHOULD_RETURN_COLLECTION ? new Collection($result) : $result;
} // Normal query
}
// Normal query
else {
$columns = [];
......@@ -360,7 +364,7 @@ class Builder extends BaseBuilder
$this->aggregate = null;
if (isset($results[0])) {
$result = (array)$results[0];
$result = (array) $results[0];
return $result['aggregate'];
}
......@@ -373,7 +377,7 @@ class Builder extends BaseBuilder
*/
public function exists()
{
return !is_null($this->first());
return ! is_null($this->first());
}
/**
......@@ -461,20 +465,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());
}
/**
......@@ -488,7 +492,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';
}
......@@ -508,7 +512,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];
}
......@@ -527,7 +531,7 @@ class Builder extends BaseBuilder
{
$query = ['$inc' => [$column => $amount]];
if (!empty($extra)) {
if (! empty($extra)) {
$query['$set'] = $extra;
}
......@@ -585,7 +589,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();
}
......@@ -614,7 +618,7 @@ class Builder extends BaseBuilder
{
$result = $this->collection->drop();
return (1 == (int)$result->ok);
return (1 == (int) $result->ok);
}
/**
......@@ -631,7 +635,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;
});
......@@ -653,8 +657,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);
}
......@@ -720,7 +726,7 @@ class Builder extends BaseBuilder
*/
public function drop($columns)
{
if (!is_array($columns)) {
if (! is_array($columns)) {
$columns = [$columns];
}
......@@ -755,13 +761,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();
}
......@@ -852,7 +858,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']);
}
......@@ -904,18 +912,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));
......@@ -929,7 +939,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]];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment