Merge branch 'master' into add_test_for_negative_dates

Author: Giacomo Fabbian

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: jenssegers
-open_collective: laravel-mongodb
+tidelift: "packagist/jenssegers/mongodb"

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Jens Segers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -63,7 +63,7 @@ Make sure you have the MongoDB PHP driver installed. You can find installation i
  5.6.x    | 3.4.x
  5.7.x    | 3.4.x
  5.8.x    | 3.5.x
- 6.0.x    | 3.6.x
+ 6.x      | 3.6.x
 
 Install the package via Composer:
 
@@ -751,7 +751,7 @@ The belongsToMany relation will not use a pivot "table" but will push id's to a
 If you want to define custom keys for your relation, set it to `null`:
 
 ```php
-use Jenssegers\Mongodb\Eloquent\Mode;
+use Jenssegers\Mongodb\Eloquent\Model;
 
 class User extends Model
 {
@@ -1134,3 +1134,7 @@ Embedded relations now return an `Illuminate\Database\Eloquent\Collection` rathe
 ```php
 $books = $user->books()->sortBy('title')->get();
 ```
+
+## Security contact information
+
+To report a security vulnerability, follow [these steps](https://tidelift.com/security).

src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php

@@ -5,6 +5,7 @@
 use DateTime;
 use DateTimeZone;
 use Illuminate\Auth\Passwords\DatabaseTokenRepository as BaseDatabaseTokenRepository;
+use Illuminate\Support\Facades\Date;
 use MongoDB\BSON\UTCDateTime;
 
 class DatabaseTokenRepository extends BaseDatabaseTokenRepository
@@ -17,7 +18,7 @@ protected function getPayload($email, $token)
         return [
             'email' => $email,
             'token' => $this->hasher->make($token),
-            'created_at' => new UTCDateTime(time() * 1000),
+            'created_at' => new UTCDateTime(Date::now()->format('Uv')),
         ];
     }
 
@@ -37,7 +38,7 @@ protected function tokenExpired($createdAt)
     protected function tokenRecentlyCreated($createdAt)
     {
         $createdAt = $this->convertDateTime($createdAt);
-        
+
         return parent::tokenRecentlyCreated($createdAt);
     }
 

src/Jenssegers/Mongodb/Connection.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Connection as BaseConnection;
 use Illuminate\Support\Arr;
+use InvalidArgumentException;
 use MongoDB\Client;
 
 class Connection extends BaseConnection
@@ -37,8 +38,11 @@ public function __construct(array $config)
         // Create the connection
         $this->connection = $this->createConnection($dsn, $config, $options);
 
+        // Get default database name
+        $default_db = $this->getDefaultDatabaseName($dsn, $config);
+
         // Select database
-        $this->db = $this->connection->selectDatabase($this->getDatabaseDsn($dsn, $config['database']));
+        $this->db = $this->connection->selectDatabase($default_db);
 
         $this->useDefaultPostProcessor();
 
@@ -114,6 +118,26 @@ public function getDatabaseName()
         return $this->getMongoDB()->getDatabaseName();
     }
 
+    /**
+     * Get the name of the default database based on db config or try to detect it from dsn
+     * @param string $dsn
+     * @param array $config
+     * @return string
+     * @throws InvalidArgumentException
+     */
+    protected function getDefaultDatabaseName($dsn, $config)
+    {
+        if (empty($config['database'])) {
+            if (preg_match('/^mongodb(?:[+]srv)?:\\/\\/.+\\/([^?&]+)/s', $dsn, $matches)) {
+                $config['database'] = $matches[1];
+            } else {
+                throw new InvalidArgumentException("Database is not properly configured.");
+            }
+        }
+
+        return $config['database'];
+    }
+
     /**
      * Create a new MongoDB connection.
      * @param string $dsn
@@ -191,18 +215,6 @@ protected function getHostDsn(array $config)
         return 'mongodb://' . implode(',', $hosts) . ($auth_database ? '/' . $auth_database : '');
     }
 
-    /**
-     * Get database name from DSN string, if there is no database in DSN path - returns back $database argument.
-     * @param string $dsn
-     * @param $database
-     * @return string
-     */
-    protected function getDatabaseDsn($dsn, $database)
-    {
-        $dsnDatabase = trim(parse_url($dsn, PHP_URL_PATH), '/');
-        return trim($dsnDatabase) ? $dsnDatabase : $database;
-    }
-
     /**
      * Create a DSN string from a configuration.
      * @param array $config

src/Jenssegers/Mongodb/Eloquent/Model.php

@@ -2,13 +2,13 @@
 
 namespace Jenssegers\Mongodb\Eloquent;
 
-use Illuminate\Support\Carbon;
 use DateTime;
 use Illuminate\Contracts\Queue\QueueableCollection;
 use Illuminate\Contracts\Queue\QueueableEntity;
 use Illuminate\Database\Eloquent\Model as BaseModel;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Date;
 use Illuminate\Support\Str;
 use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
 use MongoDB\BSON\Binary;
@@ -89,7 +89,7 @@ public function fromDateTime($value)
             $value = parent::asDateTime($value);
         }
 
-        return new UTCDateTime($value->getTimestamp() * 1000);
+        return new UTCDateTime($value->format('Uv'));
     }
 
     /**
@@ -99,7 +99,7 @@ protected function asDateTime($value)
     {
         // Convert UTCDateTime instances.
         if ($value instanceof UTCDateTime) {
-            return Carbon::createFromTimestamp($value->toDateTime()->getTimestamp());
+            return Date::createFromTimestampMs($value->toDateTime()->format('Uv'));
         }
 
         return parent::asDateTime($value);
@@ -118,7 +118,7 @@ public function getDateFormat()
      */
     public function freshTimestamp()
     {
-        return new UTCDateTime(Carbon::now());
+        return new UTCDateTime(Date::now()->format('Uv'));
     }
 
     /**

src/Jenssegers/Mongodb/MongodbQueueServiceProvider.php

@@ -2,7 +2,7 @@
 
 namespace Jenssegers\Mongodb;
 
-use DB;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Queue\QueueServiceProvider;
 use Jenssegers\Mongodb\Queue\Failed\MongoFailedJobProvider;
 

src/Jenssegers/Mongodb/Query/Builder.php

@@ -8,14 +8,20 @@
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
 use Illuminate\Support\Str;
 use Jenssegers\Mongodb\Connection;
 use MongoCollection;
 use MongoDB\BSON\Binary;
 use MongoDB\BSON\ObjectID;
 use MongoDB\BSON\Regex;
 use MongoDB\BSON\UTCDateTime;
+use RuntimeException;
 
+/**
+ * Class Builder
+ * @package Jenssegers\Mongodb\Query
+ */
 class Builder extends BaseBuilder
 {
     /**
@@ -209,12 +215,25 @@ public function get($columns = [])
         return $this->getFresh($columns);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function cursor($columns = [])
+    {
+        $result =  $this->getFresh($columns, true);
+        if ($result instanceof LazyCollection) {
+            return $result;
+        }
+        throw new RuntimeException("Query not compatible with cursor");
+    }
+
     /**
      * Execute the query as a fresh "select" statement.
      * @param array $columns
-     * @return array|static[]|Collection
+     * @param bool $returnLazy
+     * @return array|static[]|Collection|LazyCollection
      */
-    public function getFresh($columns = [])
+    public function getFresh($columns = [], $returnLazy = false)
     {
         // If no columns have been specified for the select statement, we will set them
         // here to either the passed columns, or the standard default of retrieving
@@ -294,7 +313,7 @@ public function getFresh($columns = [])
                     }
                 }
             }
-            
+
             // The _id field is mandatory when using grouping.
             if ($group && empty($group['_id'])) {
                 $group['_id'] = null;
@@ -402,6 +421,14 @@ public function getFresh($columns = [])
             // Execute query and get MongoCursor
             $cursor = $this->collection->find($wheres, $options);
 
+            if ($returnLazy) {
+                return LazyCollection::make(function () use ($cursor) {
+                    foreach ($cursor as $item) {
+                        yield $item;
+                    }
+                });
+            }
+
             // Return results as an array with numeric keys
             $results = iterator_to_array($cursor, false);
             return $this->useCollections ? new Collection($results) : $results;
@@ -930,18 +957,18 @@ protected function compileWheres()
                 if (is_array($where['value'])) {
                     array_walk_recursive($where['value'], function (&$item, $key) {
                         if ($item instanceof DateTime) {
-                            $item = new UTCDateTime($item->getTimestamp() * 1000);
+                            $item = new UTCDateTime($item->format('Uv'));
                         }
                     });
                 } else {
                     if ($where['value'] instanceof DateTime) {
-                        $where['value'] = new UTCDateTime($where['value']->getTimestamp() * 1000);
+                        $where['value'] = new UTCDateTime($where['value']->format('Uv'));
                     }
                 }
             } elseif (isset($where['values'])) {
                 array_walk_recursive($where['values'], function (&$item, $key) {
                     if ($item instanceof DateTime) {
-                        $item = new UTCDateTime($item->getTimestamp() * 1000);
+                        $item = new UTCDateTime($item->format('Uv'));
                     }
                 });
             }
@@ -993,6 +1020,7 @@ protected function compileWhereAll(array $where)
     protected function compileWhereBasic(array $where)
     {
         extract($where);
+        $is_numeric = false;
 
         // Replace like or not like with a Regex instance.
         if (in_array($operator, ['like', 'not like'])) {
@@ -1004,15 +1032,21 @@ protected function compileWhereBasic(array $where)
 
             // Convert to regular expression.
             $regex = preg_replace('#(^|[^\\\])%#', '$1.*', preg_quote($value));
+            $plain_value = $value;
 
             // Convert like to regular expression.
             if (!Str::startsWith($value, '%')) {
                 $regex = '^' . $regex;
+            } else {
+                $plain_value = Str::replaceFirst('%', null, $plain_value);
             }
             if (!Str::endsWith($value, '%')) {
                 $regex .= '$';
+            } else {
+                $plain_value = Str::replaceLast('%', null, $plain_value);
             }
 
+            $is_numeric = is_numeric($plain_value);
             $value = new Regex($regex, 'i');
         } // Manipulate regexp operations.
         elseif (in_array($operator, ['regexp', 'not regexp', 'regex', 'not regex'])) {
@@ -1032,7 +1066,11 @@ protected function compileWhereBasic(array $where)
         }
 
         if (!isset($operator) || $operator == '=') {
-            $query = [$column => $value];
+            if ($is_numeric) {
+                $query = ['$where' => '/^'.$value->getPattern().'/.test(this.'.$column.')'];
+            } else {
+                $query = [$column => $value];
+            }
         } elseif (array_key_exists($operator, $this->conversion)) {
             $query = [$column => [$this->conversion[$operator] => $value]];
         } else {

src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php

@@ -12,12 +12,15 @@ class MongoFailedJobProvider extends DatabaseFailedJobProvider
      * @param string $connection
      * @param string $queue
      * @param string $payload
+     * @param  \Exception  $exception
      * @return void
      */
     public function log($connection, $queue, $payload, $exception)
     {
         $failed_at = Carbon::now()->getTimestamp();
 
+        $exception = (string) $exception;
+
         $this->getTable()->insert(compact('connection', 'queue', 'payload', 'failed_at', 'exception'));
     }
 

src/Jenssegers/Mongodb/Relations/BelongsToMany.php

@@ -265,7 +265,7 @@ protected function buildDictionary(Collection $results)
     /**
      * @inheritdoc
      */
-    protected function newPivotQuery()
+    public function newPivotQuery()
     {
         return $this->newRelatedQuery();
     }