Merge pull request #3 from jenssegers/master

update fro, master fork to our build

Author: shopapps

.github/FUNDING.yml

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

.github/workflows/build-ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4']
+        php: ['7.2', '7.3', '7.4']
         os: ['ubuntu-latest']
         mongodb: ['3.6', '4.0', '4.2']
     services:
@@ -30,9 +30,16 @@ jobs:
     name: PHP v${{ matrix.php }} with Mongo v${{ matrix.mongodb }}
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
+    - name: "Installing php"
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        extensions: curl,mbstring,xdebug
+        coverage: xdebug
+        tools: composer
     - name: Show PHP version
-      run: php${{ matrix.php }} -v && composer -V
+      run: php -v && composer -V
     - name: Show Docker version
       run: if [[ "$DEBUG" == "true" ]]; then docker version && env; fi
       env:

LICENSE renamed to LICENSE.md

@@ -22,6 +22,7 @@ This package adds functionalities to the Eloquent model and Query builder for Mo
     - [Extending the base model](#extending-the-base-model)
     - [Soft Deletes](#soft-deletes)
     - [Dates](#dates)
+    - [Guarding attributes](#guarding-attributes)
     - [Basic Usage](#basic-usage)
     - [MongoDB-specific operators](#mongodb-specific-operators)
     - [MongoDB-specific Geo operations](#mongodb-specific-geo-operations)
@@ -42,6 +43,8 @@ This package adds functionalities to the Eloquent model and Query builder for Mo
     - [Cross-Database Relationships](#cross-database-relationships)
     - [Authentication](#authentication)
     - [Queues](#queues)
+      - [Laravel specific](#laravel-specific)
+      - [Lumen specific](#Lumen-specific)
   - [Upgrading](#upgrading)
       - [Upgrading from version 2 to 3](#upgrading-from-version-2-to-3)
 
@@ -63,7 +66,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:
 
@@ -230,6 +233,18 @@ class Book extends Model
 }
 ```
 
+### Extending the Authenticable base model
+This package includes a MongoDB Authenticatable Eloquent class `Jenssegers\Mongodb\Auth\User` that you can use to replace the default Authenticatable class `Illuminate\Foundation\Auth\User` for your `User` model.
+
+```php
+use Jenssegers\Mongodb\Auth\User as Authenticatable;
+
+class User extends Authenticatable
+{
+
+}
+```
+
 ### Soft Deletes
 
 When soft deleting a model, it is not actually removed from your database. Instead, a deleted_at timestamp is set on the record.
@@ -249,6 +264,13 @@ class User extends Model
 
 For more information check [Laravel Docs about Soft Deleting](http://laravel.com/docs/eloquent#soft-deleting).
 
+### Guarding attributes
+
+When choosing between guarding attributes or marking some as fillable, Taylor Otwell prefers the fillable route.
+This is in light of [recent security issues described here](https://blog.laravel.com/security-release-laravel-61835-7240).
+
+Keep in mind guarding still works, but you may experience unexpected behavior.
+
 ### Dates
 
 Eloquent allows you to work with Carbon or DateTime objects instead of MongoDate objects. Internally, these dates will be converted to MongoDate objects when saved to the database.
@@ -1067,6 +1089,8 @@ If you want to use MongoDB as your database backend, change the driver in `confi
 'connections' => [
     'database' => [
         'driver' => 'mongodb',
+        // You can also specify your jobs specific database created on config/database.php
+        'connection' => 'mongodb-job',
         'table' => 'jobs',
         'queue' => 'default',
         'expire' => 60,
@@ -1078,23 +1102,31 @@ If you want to use MongoDB to handle failed jobs, change the database in `config
 
 ```php
 'failed' => [
-    'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
-    'database' => env('DB_CONNECTION', 'mongodb'),
+    'driver' => 'mongodb',
+    // You can also specify your jobs specific database created on config/database.php
+    'database' => 'mongodb-job',
     'table' => 'failed_jobs',
 ],
 ```
 
-Or simply set your own `QUEUE_FAILED_DRIVER` environment variable to `mongodb`
-```env
-QUEUE_FAILED_DRIVER=mongodb
-```
+#### Laravel specific
 
-Last, add the service provider in `config/app.php`:
+Add the service provider in `config/app.php`:
 
 ```php
 Jenssegers\Mongodb\MongodbQueueServiceProvider::class,
 ```
 
+#### Lumen specific
+
+With [Lumen](http://lumen.laravel.com), add the service provider in `bootstrap/app.php`. You must however ensure that you add the following **after** the `MongodbServiceProvider` registration.
+
+```php
+$app->make('queue');
+
+$app->register(Jenssegers\Mongodb\MongodbQueueServiceProvider::class);
+```
+
 Upgrading
 ---------
 
@@ -1134,3 +1166,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).

README.md

@@ -41,34 +41,32 @@ public function __call($method, $parameters)
         $start = microtime(true);
         $result = call_user_func_array([$this->collection, $method], $parameters);
 
-        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.
-            $time = $this->connection->getElapsedTime($start);
+        // 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.
+        $time = $this->connection->getElapsedTime($start);
 
-            $query = [];
+        $query = [];
 
-            // Convert the query parameters to a json string.
-            array_walk_recursive($parameters, function (&$item, $key) {
-                if ($item instanceof ObjectID) {
-                    $item = (string) $item;
-                }
-            });
+        // Convert the query parameters to a json string.
+        array_walk_recursive($parameters, function (&$item, $key) {
+            if ($item instanceof ObjectID) {
+                $item = (string) $item;
+            }
+        });
 
-            // Convert the query parameters to a json string.
-            foreach ($parameters as $parameter) {
-                try {
-                    $query[] = json_encode($parameter);
-                } catch (Exception $e) {
-                    $query[] = '{...}';
-                }
+        // Convert the query parameters to a json string.
+        foreach ($parameters as $parameter) {
+            try {
+                $query[] = json_encode($parameter);
+            } catch (Exception $e) {
+                $query[] = '{...}';
             }
+        }
 
-            $queryString = $this->collection->getCollectionName() . '.' . $method . '(' . implode(',', $query) . ')';
+        $queryString = $this->collection->getCollectionName() . '.' . $method . '(' . implode(',', $query) . ')';
 
-            $this->connection->logQuery($queryString, [], $time);
-        }
+        $this->connection->logQuery($queryString, [], $time);
 
         return $result;
     }

src/Jenssegers/Mongodb/Collection.php

@@ -99,7 +99,13 @@ protected function asDateTime($value)
     {
         // Convert UTCDateTime instances.
         if ($value instanceof UTCDateTime) {
-            return Date::createFromTimestampMs($value->toDateTime()->format('Uv'));
+            $date = $value->toDateTime();
+
+            $seconds = $date->format('U');
+            $milliseconds = abs($date->format('v'));
+            $timestampMs = sprintf('%d%03d', $seconds, $milliseconds);
+
+            return Date::createFromTimestampMs($timestampMs);
         }
 
         return parent::asDateTime($value);
@@ -468,6 +474,17 @@ protected function getRelationsWithoutParent()
         return $relations;
     }
 
+    /**
+     * Checks if column exists on a table.  As this is a document model, just return true.  This also
+     * prevents calls to non-existent function Grammar::compileColumnListing()
+     * @param string $key
+     * @return bool
+     */
+    protected function isGuardableColumn($key)
+    {
+        return true;
+    }
+
     /**
      * @inheritdoc
      */

src/Jenssegers/Mongodb/Eloquent/Model.php

@@ -8,19 +8,24 @@
 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
 {
     /**
      * The database collection.
-     * @var MongoCollection
+     * @var \MongoDB\Collection
      */
     protected $collection;
 
@@ -209,12 +214,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
@@ -402,6 +420,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;
@@ -698,15 +724,11 @@ public function from($collection, $as = null)
     /**
      * @inheritdoc
      */
-    public function truncate()
+    public function truncate(): bool
     {
-        $options = [
-            'typeMap' => ['root' => 'object', 'document' => 'object'],
-        ];
-
-        $result = $this->collection->drop($options);
+        $result = $this->collection->deleteMany([]);
 
-        return (1 == (int) $result->ok);
+        return (1 === (int) $result->isAcknowledged());
     }
 
     /**
@@ -993,6 +1015,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 +1027,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 +1061,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/Query/Builder.php

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