Work in progress

Author: jenssegers

composer.json

@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.0|^5.0",
-        "orchestra/testbench": "^3.1",
+        "orchestra/testbench": "^3.2",
         "mockery/mockery": "^0.9",
         "satooshi/php-coveralls": "^0.6"
     },

src/Jenssegers/Mongodb/Collection.php

@@ -62,7 +62,7 @@ public function __call($method, $parameters)
                 }
             }
 
-            $queryString = $this->collection->getName() . '.' . $method . '(' . implode(',', $query) . ')';
+            $queryString = $this->collection->getCollectionName() . '.' . $method . '(' . implode(',', $query) . ')';
 
             $this->connection->logQuery($queryString, [], $time);
         }

src/Jenssegers/Mongodb/Connection.php

@@ -1,6 +1,7 @@
-<?php 
-namespace Jenssegers\Mongodb;
-use MongoDB;
+<?php namespace Jenssegers\Mongodb;
+
+use MongoDB\Client;
+
 class Connection extends \Illuminate\Database\Connection {
 
     /**
@@ -11,9 +12,9 @@ class Connection extends \Illuminate\Database\Connection {
     protected $db;
 
     /**
-     * The MongoClient connection handler.
+     * The MongoDB connection handler.
      *
-     * @var MongoClient
+     * @var MongoDB
      */
     protected $connection;
 
@@ -29,7 +30,7 @@ public function __construct(array $config)
         // Build the connection string
         $dsn = $this->getDsn($config);
 
-        // You can pass options directly to the MongoClient constructor
+        // You can pass options directly to the MongoDB constructor
         $options = array_get($config, 'options', []);
 
         // Create the connection
@@ -109,49 +110,38 @@ public function getMongoDB()
     }
 
     /**
-     * return MongoClient object.
+     * return MongoDB object.
      *
-     * @return MongoClient
+     * @return MongoDB
      */
     public function getMongoClient()
     {
         return $this->connection;
     }
 
     /**
-     * Create a new MongoClient connection.
+     * Create a new MongoDB connection.
      *
      * @param  string  $dsn
      * @param  array   $config
      * @param  array   $options
-     * @return MongoClient
+     * @return MongoDB
      */
     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']))
-        {
-            $options['username'] = $config['username'];
-        }
-
-        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']))
         {
             $driverOptions = $config['driver_options'];
         }
-        return new MongoDB\Client($dsn, $options, $driverOptions);
+
+        return new Client($dsn, $options, $driverOptions);
     }
 
     /**
-     * Disconnect from the underlying MongoClient connection.
+     * Disconnect from the underlying MongoDB connection.
      */
     public function disconnect()
     {
@@ -168,7 +158,7 @@ protected function getDsn(array $config)
     {
         // First we will create the basic DSN setup as well as the port if it is in
         // in the configuration options. This will give us the basic DSN we will
-        // need to establish the MongoClient and return them back for use.
+        // need to establish the MongoDB and return them back for use.
         extract($config);
 
         // Check if the user passed a complete dsn to the configuration.
@@ -192,12 +182,10 @@ protected function getDsn(array $config)
         // The database name needs to be in the connection string, otherwise it will
         // authenticate to the admin database, which may result in permission errors.
         $auth = '';
-        if(isset($username) && $username)
-        	$auth .= $username;
-        if(isset($password) && $password)
-        	$auth .= ':'.$password;
-        if($auth)
-        	$auth .= '@';
+        if (! empty($username)) $auth .= $username;
+        if (! empty($password)) $auth .= ':'.$password;
+        if ($auth) $auth .= '@';
+
         return "mongodb://" . $auth . implode(',', $hosts) . "/{$database}";
     }
 

src/Jenssegers/Mongodb/Eloquent/Builder.php

@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use MongoCursor;
+use MongoDB\Driver\Cursor;
 
 class Builder extends EloquentBuilder {
 
@@ -218,7 +218,7 @@ 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 Cursor)
         {
             $results = iterator_to_array($results, false);
 
@@ -228,7 +228,7 @@ public function raw($expression = null)
         // The result is a single object.
         elseif (is_array($results) and array_key_exists('_id', $results))
         {
-            $model = $this->model->newFromBuilder($results);
+            $model = $this->model->newFromBuilder((array) $results);
 
             $model->setConnection($this->model->getConnection());
 

src/Jenssegers/Mongodb/Model.php

@@ -10,8 +10,10 @@
 use Jenssegers\Mongodb\Relations\EmbedsMany;
 use Jenssegers\Mongodb\Relations\EmbedsOne;
 use Jenssegers\Mongodb\Relations\EmbedsOneOrMany;
+use MongoDB\BSON\ObjectID;
+use MongoDB\BSON\UTCDateTime;
 use ReflectionMethod;
-use MongoDB;
+
 abstract class Model extends BaseModel {
 
     use HybridRelations;
@@ -52,8 +54,8 @@ public function getIdAttribute($value)
             $value = $this->attributes['_id'];
         }
 
-        // Convert MongoDB\BSON\ObjectID's to string.
-        if ($value instanceof MongoDB\BSON\ObjectID)
+        // Convert ObjectID to string.
+        if ($value instanceof ObjectID)
         {
             return (string) $value;
         }
@@ -148,15 +150,15 @@ protected function embedsOne($related, $localKey = null, $foreignKey = null, $re
     }
 
     /**
-     * Convert a DateTime to a storable MongoDB\BSON\UTCDateTime object.
+     * Convert a DateTime to a storable UTCDateTime object.
      *
      * @param  DateTime|int  $value
-     * @return MongoDB\BSON\UTCDateTime
+     * @return UTCDateTime
      */
     public function fromDateTime($value)
     {
-        // If the value is already a MongoDB\BSON\UTCDateTime instance, we don't need to parse it.
-        if ($value instanceof MongoDB\BSON\UTCDateTime)
+        // If the value is already a UTCDateTime instance, we don't need to parse it.
+        if ($value instanceof UTCDateTime)
         {
             return $value;
         }
@@ -167,8 +169,7 @@ public function fromDateTime($value)
             $value = parent::asDateTime($value);
         }
 
-
-        return new MongoDB\BSON\UTCDateTime($value->getTimestamp());
+        return new UTCDateTime($value->getTimestamp() * 1000);
     }
 
     /**
@@ -179,10 +180,10 @@ public function fromDateTime($value)
      */
     protected function asDateTime($value)
     {
-        // Convert MongoDB\BSON\UTCDateTime instances.
-        if ($value instanceof MongoDB\BSON\UTCDateTime)
+        // Convert UTCDateTime instances.
+        if ($value instanceof UTCDateTime)
         {
-            return Carbon::createFromTimestamp($value->sec);
+            return Carbon::createFromTimestamp($value->toDateTime()->getTimestamp());
         }
 
         return parent::asDateTime($value);
@@ -201,11 +202,11 @@ protected function getDateFormat()
     /**
      * Get a fresh timestamp for the model.
      *
-     * @return MongoDB\BSON\UTCDateTime
+     * @return UTCDateTime
      */
     public function freshTimestamp()
-    {	
-	    return round(microtime(true) * 1000);
+    {
+        return new UTCDateTime(round(microtime(true) * 1000));
     }
 
     /**
@@ -297,7 +298,7 @@ protected function getAttributeFromArray($key)
      */
     public function setAttribute($key, $value)
     {
-        // Convert _id to MongoDB\BSON\ObjectID.
+        // Convert _id to ObjectID.
         if ($key == '_id' and is_string($value))
         {
             $builder = $this->newBaseQueryBuilder();
@@ -336,7 +337,7 @@ public function attributesToArray()
         // nicely when your models are converted to JSON.
         foreach ($attributes as $key => &$value)
         {
-            if ($value instanceof MongoDB\BSON\ObjectID)
+            if ($value instanceof ObjectID)
             {
                 $value = (string) $value;
             }
@@ -354,6 +355,39 @@ public function attributesToArray()
         return $attributes;
     }
 
+    /**
+     * Get the casts array.
+     *
+     * @return array
+     */
+    protected function getCasts()
+    {
+        return $this->casts;
+    }
+
+    /**
+     * Determine if the new and old values for a given key are numerically equivalent.
+     *
+     * @param  string  $key
+     * @return bool
+     */
+    protected function originalIsNumericallyEquivalent($key)
+    {
+        $current = $this->attributes[$key];
+        $original = $this->original[$key];
+
+        // Date comparison.
+        if (in_array($key, $this->getDates()))
+        {
+            $current = $current instanceof UTCDateTime ? $this->asDateTime($current) : $current;
+            $original = $original instanceof UTCDateTime ? $this->asDateTime($original) : $original;
+
+            return $current == $original;
+        }
+
+        return parent::originalIsNumericallyEquivalent($key);
+    }
+
     /**
      * Remove one or more fields.
      *