PSR-2 conversion

Author: jenssegers

README.md

@@ -117,7 +117,6 @@ Note that we did not tell Eloquent which collection to use for the `User` model.
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
-
     protected $collection = 'users_collection';
 
 }
@@ -129,7 +128,6 @@ class User extends Eloquent {
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class MyModel extends Eloquent {
-
     protected $connection = 'mongodb';
 
 }
@@ -238,7 +236,6 @@ To solve this, you will need to check two things. First check if your model is e
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
-
     protected $connection = 'mongodb';
 
 }
@@ -533,7 +530,6 @@ Example:
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
-
     protected $dates = array('birthday');
 
 }
@@ -758,7 +754,6 @@ Example SQL-based User model:
 use Jenssegers\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
-
     protected $connection = 'mysql';
 
     public function messages()
@@ -775,7 +770,6 @@ And the Mongodb-based Message model:
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class Message extends Eloquent {
-
     protected $connection = 'mongodb';
 
     public function user()

src/Jenssegers/Eloquent/Model.php

@@ -2,8 +2,8 @@
 
 use Jenssegers\Mongodb\Eloquent\HybridRelations;
 
-abstract class Model extends \Illuminate\Database\Eloquent\Model {
+abstract class Model extends \Illuminate\Database\Eloquent\Model
+{
 
     use HybridRelations;
-
 }

src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php

@@ -3,8 +3,8 @@
 use DateTime;
 use MongoDate;
 
-class DatabaseTokenRepository extends \Illuminate\Auth\Passwords\DatabaseTokenRepository {
-
+class DatabaseTokenRepository extends \Illuminate\Auth\Passwords\DatabaseTokenRepository
+{
     /**
      * Build the record payload for the table.
      *
@@ -26,20 +26,16 @@ protected function getPayload($email, $token)
     protected function tokenExpired($token)
     {
         // Convert MongoDate to a date string.
-        if ($token['created_at'] instanceof MongoDate)
-        {
+        if ($token['created_at'] instanceof MongoDate) {
             $date = new DateTime;
 
             $date->setTimestamp($token['created_at']->sec);
 
             $token['created_at'] = $date->format('Y-m-d H:i:s');
-        }
-        elseif (is_array($token['created_at']) and isset($token['created_at']['date']))
-        {
-           $token['created_at'] = $token['created_at']['date'];
+        } elseif (is_array($token['created_at']) and isset($token['created_at']['date'])) {
+            $token['created_at'] = $token['created_at']['date'];
         }
 
         return parent::tokenExpired($token);
     }
-
 }

src/Jenssegers/Mongodb/Auth/PasswordResetServiceProvider.php

@@ -2,17 +2,16 @@
 
 use Jenssegers\Mongodb\Auth\DatabaseTokenRepository as DbRepository;
 
-class PasswordResetServiceProvider extends \Illuminate\Auth\Passwords\PasswordResetServiceProvider {
-
+class PasswordResetServiceProvider extends \Illuminate\Auth\Passwords\PasswordResetServiceProvider
+{
     /**
      * Register the token repository implementation.
      *
      * @return void
      */
     protected function registerTokenRepository()
     {
-        $this->app->singleton('auth.password.tokens', function ($app)
-        {
+        $this->app->singleton('auth.password.tokens', function ($app) {
             $connection = $app['db']->connection();
 
             // The database token repository is an implementation of the token repository
@@ -25,5 +24,4 @@ protected function registerTokenRepository()
             return new DbRepository($connection, $table, $key, $expire);
         });
     }
-
 }

src/Jenssegers/Mongodb/Collection.php

@@ -3,8 +3,8 @@
 use Exception;
 use MongoCollection;
 
-class Collection {
-
+class Collection
+{
     /**
      * The connection instance.
      *
@@ -41,8 +41,7 @@ public function __call($method, $parameters)
 
         $result = call_user_func_array([$this->collection, $method], $parameters);
 
-        if ($this->connection->logging())
-        {
+        if ($this->connection->logging()) {
             // Once we have run the query we will calculate the time that it took to run and
             // then log the query, bindings, and execution time so we will report them on
             // the event that the developer needs them. We'll log time in milliseconds.
@@ -51,14 +50,10 @@ public function __call($method, $parameters)
             $query = [];
 
             // Convert the query paramters to a json string.
-            foreach ($parameters as $parameter)
-            {
-                try
-                {
+            foreach ($parameters as $parameter) {
+                try {
                     $query[] = json_encode($parameter);
-                }
-                catch (Exception $e)
-                {
+                } catch (Exception $e) {
                     $query[] = '{...}';
                 }
             }
@@ -70,5 +65,4 @@ public function __call($method, $parameters)
 
         return $result;
     }
-
 }

src/Jenssegers/Mongodb/Connection.php

@@ -2,8 +2,8 @@
 
 use MongoClient;
 
-class Connection extends \Illuminate\Database\Connection {
-
+class Connection extends \Illuminate\Database\Connection
+{
     /**
      * The MongoDB database handler.
      *
@@ -131,21 +131,18 @@ protected function createConnection($dsn, array $config, array $options)
     {
         // Add credentials as options, this makes sure the connection will not fail if
         // the username or password contains strange characters.
-        if ( ! empty($config['username']))
-        {
+        if (! empty($config['username'])) {
             $options['username'] = $config['username'];
         }
 
-        if ( ! empty($config['password']))
-        {
+        if (! empty($config['password'])) {
             $options['password'] = $config['password'];
         }
 
         // By default driver options is an empty array.
         $driverOptions = [];
 
-        if (isset($config['driver_options']) && is_array($config['driver_options']))
-        {
+        if (isset($config['driver_options']) && is_array($config['driver_options'])) {
             $driverOptions = $config['driver_options'];
         }
 
@@ -174,19 +171,16 @@ protected function getDsn(array $config)
         extract($config);
 
         // Check if the user passed a complete dsn to the configuration.
-        if ( ! empty($dsn))
-        {
+        if (! empty($dsn)) {
             return $dsn;
         }
 
         // Treat host option as array of hosts
         $hosts = is_array($host) ? $host : [$host];
 
-        foreach ($hosts as &$host)
-        {
+        foreach ($hosts as &$host) {
             // Check if we need to add a port to the host
-            if (strpos($host, ':') === false and isset($port))
-            {
+            if (strpos($host, ':') === false and isset($port)) {
                 $host = "{$host}:{$port}";
             }
         }
@@ -228,5 +222,4 @@ public function __call($method, $parameters)
     {
         return call_user_func_array([$this->db, $method], $parameters);
     }
-
 }

src/Jenssegers/Mongodb/Eloquent/Builder.php

@@ -4,8 +4,8 @@
 use Illuminate\Database\Eloquent\Relations\Relation;
 use MongoCursor;
 
-class Builder extends EloquentBuilder {
-
+class Builder extends EloquentBuilder
+{
     /**
      * The methods that should be returned from query builder.
      *
@@ -26,8 +26,7 @@ public function update(array $values)
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParentRelation())
-        {
+        if ($relation = $this->model->getParentRelation()) {
             $relation->performUpdate($this->model, $values);
 
             return 1;
@@ -46,8 +45,7 @@ public function insert(array $values)
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParentRelation())
-        {
+        if ($relation = $this->model->getParentRelation()) {
             $relation->performInsert($this->model, $values);
 
             return true;
@@ -67,8 +65,7 @@ public function insertGetId(array $values, $sequence = null)
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParentRelation())
-        {
+        if ($relation = $this->model->getParentRelation()) {
             $relation->performInsert($this->model, $values);
 
             return $this->model->getKey();
@@ -86,8 +83,7 @@ public function delete()
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParentRelation())
-        {
+        if ($relation = $this->model->getParentRelation()) {
             $relation->performDelete($this->model);
 
             return $this->model->getKey();
@@ -108,8 +104,7 @@ public function increment($column, $amount = 1, array $extra = [])
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParentRelation())
-        {
+        if ($relation = $this->model->getParentRelation()) {
             $value = $this->model->{$column};
 
             // When doing increment and decrements, Eloquent will automatically
@@ -139,8 +134,7 @@ public function decrement($column, $amount = 1, array $extra = [])
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParentRelation())
-        {
+        if ($relation = $this->model->getParentRelation()) {
             $value = $this->model->{$column};
 
             // When doing increment and decrements, Eloquent will automatically
@@ -174,13 +168,13 @@ protected function addHasWhere(EloquentBuilder $hasQuery, Relation $relation, $o
         $relationCount = array_count_values($query->lists($relation->getHasCompareKey()));
 
         // Remove unwanted related objects based on the operator and count.
-        $relationCount = array_filter($relationCount, function ($counted) use ($count, $operator)
-        {
+        $relationCount = array_filter($relationCount, function ($counted) use ($count, $operator) {
             // If we are comparing to 0, we always need all results.
-            if ($count == 0) return true;
+            if ($count == 0) {
+                return true;
+            }
 
-            switch ($operator)
-            {
+            switch ($operator) {
                 case '>=':
                 case '<':
                     return $counted >= $count;
@@ -197,7 +191,9 @@ protected function addHasWhere(EloquentBuilder $hasQuery, Relation $relation, $o
         $not = in_array($operator, ['<', '<=', '!=']);
 
         // If we are comparing to 0, we need an additional $not flip.
-        if ($count == 0) $not = !$not;
+        if ($count == 0) {
+            $not = !$not;
+        }
 
         // All related ids.
         $relatedIds = array_keys($relationCount);
@@ -218,16 +214,14 @@ public function raw($expression = null)
         $results = $this->query->raw($expression);
 
         // Convert MongoCursor results to a collection of models.
-        if ($results instanceof MongoCursor)
-        {
+        if ($results instanceof MongoCursor) {
             $results = iterator_to_array($results, false);
 
             return $this->model->hydrate($results);
         }
 
         // The result is a single object.
-        elseif (is_array($results) and array_key_exists('_id', $results))
-        {
+        elseif (is_array($results) and array_key_exists('_id', $results)) {
             $model = $this->model->newFromBuilder($results);
 
             $model->setConnection($this->model->getConnection());
@@ -237,5 +231,4 @@ public function raw($expression = null)
 
         return $results;
     }
-
 }