Compatible with pecl-mongodb

Author: mahdi-acto

src/Jenssegers/Mongodb/Collection.php

@@ -1,7 +1,7 @@
 <?php namespace Jenssegers\Mongodb;
 
 use Exception;
-use MongoCollection;
+use MongoDB\Collection as MongoCollection;
 
 class Collection {
 
@@ -38,7 +38,6 @@ public function __construct(Connection $connection, MongoCollection $collection)
     public function __call($method, $parameters)
     {
         $start = microtime(true);
-
         $result = call_user_func_array([$this->collection, $method], $parameters);
 
         if ($this->connection->logging())

src/Jenssegers/Mongodb/Connection.php

@@ -1,7 +1,6 @@
-<?php namespace Jenssegers\Mongodb;
-
-use MongoClient;
-
+<?php 
+namespace Jenssegers\Mongodb;
+use MongoDB;
 class Connection extends \Illuminate\Database\Connection {
 
     /**
@@ -37,7 +36,7 @@ public function __construct(array $config)
         $this->connection = $this->createConnection($dsn, $config, $options);
 
         // Select database
-        $this->db = $this->connection->{$config['database']};
+        $this->db = $this->connection->selectDatabase($config['database']);
 
         $this->useDefaultPostProcessor();
     }
@@ -148,16 +147,15 @@ protected function createConnection($dsn, array $config, array $options)
         {
             $driverOptions = $config['driver_options'];
         }
-
-        return new MongoClient($dsn, $options, $driverOptions);
+        return new MongoDB\Client($dsn, $options, $driverOptions);
     }
 
     /**
      * Disconnect from the underlying MongoClient connection.
      */
     public function disconnect()
     {
-        $this->connection->close();
+        unset($this->connection);
     }
 
     /**
@@ -193,7 +191,14 @@ 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.
-        return "mongodb://" . implode(',', $hosts) . "/{$database}";
+        $auth = '';
+        if(isset($username) && $username)
+        	$auth .= $username;
+        if(isset($password) && $password)
+        	$auth .= ':'.$password;
+        if($auth)
+        	$auth .= '@';
+        return "mongodb://" . $auth . implode(',', $hosts) . "/{$database}";
     }
 
     /**

src/Jenssegers/Mongodb/Model.php

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