Merge remote-tracking branch 'original/master'

# Conflicts:
#	src/Jenssegers/Mongodb/Auth/User.php

Author: Dennis Heller

README.md

@@ -103,6 +103,15 @@ Embedded relations now return an `Illuminate\Database\Eloquent\Collection` rathe
 $books = $user->books()->sortBy('title');
 ```
 
+Testing
+-------
+
+To run the test for this package, run:
+
+```
+docker-compose up
+```
+
 Configuration
 -------------
 

composer.json

@@ -20,8 +20,8 @@
     "require-dev": {
         "phpunit/phpunit": "^6.0",
         "orchestra/testbench": "^3.1",
-        "mockery/mockery": "^0.9",
-        "satooshi/php-coveralls": "^1.0",
+        "mockery/mockery": "^1.0",
+        "satooshi/php-coveralls": "^2.0",
         "doctrine/dbal": "^2.5"
     },
     "autoload": {

docker-compose.yml

@@ -0,0 +1,29 @@
+version: '3'
+
+services:
+
+    php:
+        build:
+            context: .
+            dockerfile: docker/Dockerfile
+        volumes:
+            - .:/code
+        working_dir: /code
+        command: docker/entrypoint.sh
+        depends_on:
+          - mysql
+          - mongodb
+
+    mysql:
+        image: mysql
+        environment:
+            MYSQL_ROOT_PASSWORD:
+            MYSQL_DATABASE: unittest
+            MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+        logging:
+            driver: none
+
+    mongodb:
+        image: mongo
+        logging:
+            driver: none

docker/Dockerfile

@@ -0,0 +1,6 @@
+FROM php:7.1-cli
+
+RUN apt-get update && \
+    apt-get install -y autoconf pkg-config libssl-dev && \
+    pecl install mongodb && docker-php-ext-enable mongodb && \
+    docker-php-ext-install -j$(nproc) pdo pdo_mysql

docker/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+sleep 3 && php ./vendor/bin/phpunit

src/Jenssegers/Mongodb/Auth/User.php

@@ -8,7 +8,7 @@
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Foundation\Auth\Access\Authorizable;
-use Jenssegers\Mongodb\Eloquent\Model as Model;
+use Jenssegers\Mongodb\Eloquent\Model;
 use Jenssegers\Mongodb\Notifications\Notifiable;
 
 class User extends Model implements

src/Jenssegers/Mongodb/Connection.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Connection as BaseConnection;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use MongoDB\Client;
 
 class Connection extends BaseConnection
@@ -150,18 +151,43 @@ public function disconnect()
     }
 
     /**
-     * Create a DSN string from a configuration.
+     * Determine if the given configuration array has a UNIX socket value.
      *
-     * @param  array $config
+     * @param  array  $config
+     * @return bool
+     */
+    protected function hasDsnString(array $config)
+    {
+        return isset($config['dsn']) && ! empty($config['dsn']);
+    }
+
+    /**
+     * Get the DSN string for a socket configuration.
+     *
+     * @param  array  $config
      * @return string
      */
-    protected function getDsn(array $config)
+    protected function getDsnString(array $config)
     {
-        // Check if the user passed a complete dsn to the configuration.
-        if (!empty($config['dsn'])) {
-            return $config['dsn'];
+        $dsn_string = $config['dsn'];
+
+        if (Str::contains($dsn_string, 'mongodb://')) {
+            $dsn_string = Str::replaceFirst('mongodb://', '', $dsn_string);
         }
 
+        $dsn_string = rawurlencode($dsn_string);
+
+        return "mongodb://{$dsn_string}";
+    }
+
+    /**
+     * Get the DSN string for a host / port configuration.
+     *
+     * @param  array  $config
+     * @return string
+     */
+    protected function getHostDsn(array $config)
+    {
         // Treat host option as array of hosts
         $hosts = is_array($config['host']) ? $config['host'] : [$config['host']];
 
@@ -178,6 +204,19 @@ protected function getDsn(array $config)
         return 'mongodb://' . implode(',', $hosts) . ($auth_database ? '/' . $auth_database : '');
     }
 
+    /**
+     * Create a DSN string from a configuration.
+     *
+     * @param  array $config
+     * @return string
+     */
+    protected function getDsn(array $config)
+    {
+        return $this->hasDsnString($config)
+            ? $this->getDsnString($config)
+            : $this->getHostDsn($config);
+    }
+
     /**
      * @inheritdoc
      */

src/Jenssegers/Mongodb/Eloquent/HybridRelations.php

@@ -300,6 +300,10 @@ protected function guessBelongsToManyRelation()
      */
     public function newEloquentBuilder($query)
     {
-        return new EloquentBuilder($query);
+        if (is_subclass_of($this, \Jenssegers\Mongodb\Eloquent\Model::class)) {
+            return new Builder($query);
+        } else {
+            return new EloquentBuilder($query);
+        }
     }
 }

src/Jenssegers/Mongodb/Query/Builder.php

@@ -198,7 +198,7 @@ public function hint($index)
      */
     public function find($id, $columns = [])
     {
-        return $this->where($this->getKeyName(), '=', $this->convertKey($id))->first($columns);
+        return $this->where('_id', '=', $this->convertKey($id))->first($columns);
     }
 
     /**
@@ -920,13 +920,6 @@ protected function compileWheres()
             }
 
             // Convert DateTime values to UTCDateTime.
-            if (isset($where['values'])) {
-                array_walk_recursive($where['values'], function (&$item, $key) {
-                    if ($item instanceof DateTime) {
-                        $item = new UTCDateTime($item->getTimestamp() * 1000);
-                    }
-                });
-            }
             if (isset($where['value'])) {
                 if (is_array($where['value'])) {
                     array_walk_recursive($where['value'], function (&$item, $key) {
@@ -939,6 +932,12 @@ protected function compileWheres()
                         $where['value'] = new UTCDateTime($where['value']->getTimestamp() * 1000);
                     }
                 }
+            } elseif (isset($where['values'])) {
+                array_walk_recursive($where['values'], function (&$item, $key) {
+                    if ($item instanceof DateTime) {
+                        $item = new UTCDateTime($item->getTimestamp() * 1000);
+                    }
+                });
             }
 
             // The next item in a "chain" of wheres devices the boolean of the

tests/ConnectionTest.php

@@ -98,12 +98,13 @@ public function testDriverName()
 
     public function testAuth()
     {
+        $host = Config::get('database.connections.mongodb.host');
         Config::set('database.connections.mongodb.username', 'foo');
         Config::set('database.connections.mongodb.password', 'bar');
         Config::set('database.connections.mongodb.options.database', 'custom');
 
         $connection = DB::connection('mongodb');
-        $this->assertEquals('mongodb://127.0.0.1/custom', (string) $connection->getMongoClient());
+        $this->assertEquals('mongodb://' . $host . '/custom', (string) $connection->getMongoClient());
     }
 
     public function testCustomHostAndPort()

tests/EmbeddedRelationsTest.php

@@ -21,7 +21,7 @@ public function testEmbedsManySave()
         $address = new Address(['city' => 'London']);
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('fire')->once()->with('eloquent.created: ' . get_class($address), $address);
@@ -47,7 +47,7 @@ public function testEmbedsManySave()
         $this->assertEquals(['London', 'Paris'], $user->addresses->pluck('city')->all());
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.updating: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('fire')->once()->with('eloquent.updated: ' . get_class($address), $address);
@@ -213,7 +213,7 @@ public function testEmbedsManyDestroy()
         $address = $user->addresses->first();
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.deleting: ' . get_class($address), Mockery::type('Address'))->andReturn(true);
         $events->shouldReceive('fire')->once()->with('eloquent.deleted: ' . get_class($address), Mockery::type('Address'));
 
@@ -252,7 +252,7 @@ public function testEmbedsManyDelete()
         $address = $user->addresses->first();
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.deleting: ' . get_class($address), Mockery::type('Address'))->andReturn(true);
         $events->shouldReceive('fire')->once()->with('eloquent.deleted: ' . get_class($address), Mockery::type('Address'));
 
@@ -301,7 +301,7 @@ public function testEmbedsManyCreatingEventReturnsFalse()
         $address = new Address(['city' => 'London']);
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($address), $address)->andReturn(false);
 
@@ -316,7 +316,7 @@ public function testEmbedsManySavingEventReturnsFalse()
         $address->exists = true;
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(false);
 
         $this->assertFalse($user->addresses()->save($address));
@@ -330,7 +330,7 @@ public function testEmbedsManyUpdatingEventReturnsFalse()
         $user->addresses()->save($address);
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.updating: ' . get_class($address), $address)->andReturn(false);
 
@@ -348,7 +348,7 @@ public function testEmbedsManyDeletingEventReturnsFalse()
         $address = $user->addresses->first();
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.deleting: ' . get_class($address), Mockery::mustBe($address))->andReturn(false);
 
         $this->assertEquals(0, $user->addresses()->destroy($address));
@@ -452,7 +452,7 @@ public function testEmbedsOne()
         $father = new User(['name' => 'Mark Doe']);
 
         $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($father), $father)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($father), $father)->andReturn(true);
         $events->shouldReceive('fire')->once()->with('eloquent.created: ' . get_class($father), $father);
@@ -472,7 +472,7 @@ public function testEmbedsOne()
         $this->assertInstanceOf('MongoDB\BSON\ObjectID', $raw['_id']);
 
         $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($father), $father)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.updating: ' . get_class($father), $father)->andReturn(true);
         $events->shouldReceive('fire')->once()->with('eloquent.updated: ' . get_class($father), $father);
@@ -488,7 +488,7 @@ public function testEmbedsOne()
         $father = new User(['name' => 'Jim Doe']);
 
         $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($father), $father)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($father), $father)->andReturn(true);
         $events->shouldReceive('fire')->once()->with('eloquent.created: ' . get_class($father), $father);
@@ -507,7 +507,7 @@ public function testEmbedsOneAssociate()
         $father = new User(['name' => 'Mark Doe']);
 
         $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), anything());
+        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
         $events->shouldReceive('until')->times(0)->with('eloquent.saving: ' . get_class($father), $father);
 
         $father = $user->father()->associate($father);

tests/config/database.php

@@ -7,15 +7,15 @@
         'mongodb' => [
             'name'       => 'mongodb',
             'driver'     => 'mongodb',
-            'host'       => '127.0.0.1',
+            'host'       => 'mongodb',
             'database'   => 'unittest',
         ],
 
         'mysql' => [
             'driver'    => 'mysql',
-            'host'      => '127.0.0.1',
+            'host'      => 'mysql',
             'database'  => 'unittest',
-            'username'  => 'travis',
+            'username'  => 'root',
             'password'  => '',
             'charset'   => 'utf8',
             'collation' => 'utf8_unicode_ci',

tests/models/User.php

@@ -1,14 +1,15 @@
 <?php
 
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\HybridRelations;
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 
 class User extends Eloquent implements AuthenticatableContract, CanResetPasswordContract
 {
-    use Authenticatable, CanResetPassword;
+    use Authenticatable, CanResetPassword, HybridRelations;
 
     protected $connection = 'mongodb';
     protected $dates = ['birthday', 'entry.date'];