Merge pull request mongodb#1 from jenssegers/master

merge from upstream
mnphpexpert · Nov 9, 2019 · 3b0c8d1 · 3b0c8d1
2 parents 3bd21fc + 2f564ce
commit 3b0c8d1
Show file tree

Hide file tree

Showing 68 changed files with 1,468 additions and 967 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: jenssegers
+open_collective: laravel-mongodb
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ composer.lock
 *.sublime-workspace
 *.project
 .idea/
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,27 @@
-sudo: required
-dist: trusty
-language: php
-php:
-  - "7.2"
-  - "7.1"
+language: minimal
+
+matrix:
+  include:
+    - name: "7.1"
+      env: PHP_VERSION=7.1
+    - name: "7.2"
+      env: PHP_VERSION=7.2
+    - name: "7.3"
+      env: PHP_VERSION=7.3
 
 services:
   - docker
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 install:
   - docker version
   - sudo pip install docker-compose
   - docker-compose version
-  - sed -i -e "s/php:cli/php:${TRAVIS_PHP_VERSION}-cli/g" Dockerfile
-  - cat Dockerfile
-  - docker-compose build
+  - docker-compose build --build-arg PHP_VERSION=${PHP_VERSION}
+  - docker-compose run --rm tests composer install --no-interaction
 
 script:
-  - docker-compose up --exit-code-from php
+  - docker-compose run --rm tests ./vendor/bin/phpunit --coverage-clover ./clover.xml
diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,15 @@
-FROM php:cli
+ARG PHP_VERSION=7.2
+ARG COMPOSER_VERSION=1.8
 
-RUN pecl install xdebug
+FROM composer:${COMPOSER_VERSION}
+FROM php:${PHP_VERSION}-cli
 
 RUN apt-get update && \
-    apt-get install -y autoconf pkg-config libssl-dev git && \
-    pecl install mongodb git zlib1g-dev && docker-php-ext-enable mongodb && \
-    docker-php-ext-install -j$(nproc) pdo pdo_mysql zip && docker-php-ext-enable xdebug
+    apt-get install -y autoconf pkg-config libssl-dev git libzip-dev zlib1g-dev && \
+    pecl install mongodb && docker-php-ext-enable mongodb && \
+    pecl install xdebug && docker-php-ext-enable xdebug && \
+    docker-php-ext-install -j$(nproc) pdo_mysql zip
 
-RUN curl -sS https://getcomposer.org/installer | php \
-    && mv composer.phar /usr/local/bin/ \
-    && ln -s /usr/local/bin/composer.phar /usr/local/bin/composer
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 
-ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
+WORKDIR /code
diff --git a/README.md b/README.md
@@ -43,6 +43,9 @@ composer require jenssegers/mongodb
  5.4.x    | 3.2.x
  5.5.x    | 3.3.x
  5.6.x    | 3.4.x
+ 5.7.x    | 3.4.x
+ 5.8.x    | 3.5.x
+ 6.0.x    | 3.6.x
 
 And add the service provider in `config/app.php`:
 
@@ -63,8 +66,10 @@ The service provider will register a mongodb database extension with the origina
 For usage outside Laravel, check out the [Capsule manager](https://github.com/illuminate/database/blob/master/README.md) and add:
 
 ```php
-$capsule->getDatabaseManager()->extend('mongodb', function($config)
+$capsule->getDatabaseManager()->extend('mongodb', function($config, $name)
 {
+    $config['name'] = $name;
+
     return new Jenssegers\Mongodb\Connection($config);
 });
 ```
@@ -298,7 +303,7 @@ This service provider will slightly modify the internal DatabaseReminderReposito
 
 ### Queues
 
-If you want to use MongoDB as your database backend, change the the driver in `config/queue.php`:
+If you want to use MongoDB as your database backend, change the driver in `config/queue.php`:
 
 ```php
 'connections' => [
@@ -480,7 +485,7 @@ User::where('name', 'Jaques')->decrement('weight', 50);
 The number of updated objects is returned:
 
 ```php
-$count = User->increment('age');
+$count = User::increment('age');
 ```
 
 You may also specify additional columns to update:
@@ -545,13 +550,13 @@ User::where('name', 'regex', new \MongoDB\BSON\Regex("/.*doe/i"))->get();
 **NOTE:** you can also use the Laravel regexp operations. These are a bit more flexible and will automatically convert your regular expression string to a MongoDB\BSON\Regex object.
 
 ```php
-User::where('name', 'regexp', '/.*doe/i'))->get();
+User::where('name', 'regexp', '/.*doe/i')->get();
 ```
 
 And the inverse:
 
 ```php
-User::where('name', 'not regexp', '/.*doe/i'))->get();
+User::where('name', 'not regexp', '/.*doe/i')->get();
 ```
 
 **Type**
@@ -689,7 +694,7 @@ For more information about model manipulation, check http://laravel.com/docs/elo
 
 ### Dates
 
-Eloquent allows you to work with Carbon/DateTime objects instead of MongoDate objects. Internally, these dates will be converted to MongoDate objects when saved to the database. If you wish to use this functionality on non-default date fields you will need to manually specify them as described here: http://laravel.com/docs/eloquent#date-mutators
+Eloquent allows you to work with Carbon/DateTime objects instead of MongoDate objects. Internally, these dates will be converted to MongoDate objects when saved to the database. If you wish to use this functionality on non-default date fields, you will need to manually specify them as described here: http://laravel.com/docs/eloquent#date-mutators
 
 Example:
 
@@ -787,7 +792,7 @@ class User extends Eloquent {
 }
 ```
 
-You access the embedded models through the dynamic property:
+You can access the embedded models through the dynamic property:
 
 ```php
 $books = User::first()->books;
@@ -849,7 +854,7 @@ Embedded relations will return a Collection of embedded items instead of a query
 
 ### EmbedsOne Relations
 
-The embedsOne relation is similar to the EmbedsMany relation, but only embeds a single model.
+The embedsOne relation is similar to the embedsMany relation, but only embeds a single model.
 
 ```php
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
@@ -864,7 +869,7 @@ class Book extends Eloquent {
 }
 ```
 
-You access the embedded models through the dynamic property:
+You can access the embedded models through the dynamic property:
 
 ```php
 $author = Book::first()->author;
@@ -1014,7 +1019,7 @@ DB::collection('items')->paginate($limit, $projections);
 
 **Push**
 
-Add an items to an array.
+Add items to an array.
 
 ```php
 DB::collection('users')->where('name', 'John')->push('items', 'boots');

diff --git a/composer.json b/composer.json
@@ -1,51 +1,59 @@
-{
-    "name": "jenssegers/mongodb",
-    "description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)",
-    "keywords": ["laravel","eloquent","mongodb","mongo","database","model","moloquent"],
-    "homepage": "https://github.com/jenssegers/laravel-mongodb",
-    "authors": [
-        {
-            "name": "Jens Segers",
-            "homepage": "https://jenssegers.com"
-        }
-    ],
-    "license" : "MIT",
-    "require": {
-        "illuminate/support": "^5.6",
-        "illuminate/container": "^5.6",
-        "illuminate/database": "^5.6",
-        "illuminate/events": "^5.6",
-        "mongodb/mongodb": "^1.0.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^6.0|^7.0",
-        "orchestra/testbench": "^3.1",
-        "mockery/mockery": "^1.0",
-        "satooshi/php-coveralls": "^2.0",
-        "doctrine/dbal": "^2.5"
-    },
-    "autoload": {
-        "psr-0": {
-            "Jenssegers\\Mongodb": "src/"
-        }
-    },
-    "autoload-dev": {
-        "classmap": [
-            "tests/TestCase.php",
-            "tests/models",
-            "tests/seeds"
-        ]
-    },
-    "suggest": {
-        "jenssegers/mongodb-session": "Add MongoDB session support to Laravel-MongoDB",
-        "jenssegers/mongodb-sentry": "Add Sentry support to Laravel-MongoDB"
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "Jenssegers\\Mongodb\\MongodbServiceProvider",
-                "Jenssegers\\Mongodb\\MongodbQueueServiceProvider"
-            ]
-        }
-    }
-}
+{
+    "name": "jenssegers/mongodb",
+    "description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)",
+    "keywords": [
+        "laravel",
+        "eloquent",
+        "mongodb",
+        "mongo",
+        "database",
+        "model",
+        "moloquent"
+    ],
+    "homepage": "https://github.com/jenssegers/laravel-mongodb",
+    "authors": [
+        {
+            "name": "Jens Segers",
+            "homepage": "https://jenssegers.com"
+        }
+    ],
+    "license": "MIT",
+    "require": {
+        "illuminate/support": "^5.8|^6.0",
+        "illuminate/container": "^5.8|^6.0",
+        "illuminate/database": "^5.8|^6.0",
+        "illuminate/events": "^5.8|^6.0",
+        "mongodb/mongodb": "^1.4"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^6.0|^7.0|^8.0",
+        "orchestra/testbench": "^3.1|^4.0",
+        "mockery/mockery": "^1.0",
+        "satooshi/php-coveralls": "^2.0",
+        "doctrine/dbal": "^2.5"
+    },
+    "autoload": {
+        "psr-0": {
+            "Jenssegers\\Mongodb": "src/"
+        }
+    },
+    "autoload-dev": {
+        "classmap": [
+            "tests/TestCase.php",
+            "tests/models",
+            "tests/seeds"
+        ]
+    },
+    "suggest": {
+        "jenssegers/mongodb-session": "Add MongoDB session support to Laravel-MongoDB",
+        "jenssegers/mongodb-sentry": "Add Sentry support to Laravel-MongoDB"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Jenssegers\\Mongodb\\MongodbServiceProvider",
+                "Jenssegers\\Mongodb\\MongodbQueueServiceProvider"
+            ]
+        }
+    }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,23 +1,21 @@
 version: '3'
 
 services:
-
-    php:
-        container_name: php
+    tests:
+        container_name: tests
         build:
             context: .
             dockerfile: Dockerfile
         volumes:
             - .:/code
         working_dir: /code
-        command: bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit"
         depends_on:
-          - mysql
           - mongodb
+          - mysql
 
     mysql:
         container_name: mysql
-        image: mysql
+        image: mysql:5.7
         environment:
             MYSQL_ROOT_PASSWORD:
             MYSQL_DATABASE: unittest
@@ -28,5 +26,7 @@ services:
     mongodb:
         container_name: mongodb
         image: mongo
+        ports:
+            - 27017:27017
         logging:
             driver: none
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -7,42 +7,46 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         verbose="true"
->
+         stopOnFailure="false">
     <testsuites>
         <testsuite name="all">
             <directory>tests/</directory>
-            <exclude>tests/MysqlRelationsTest.php</exclude>
         </testsuite>
         <testsuite name="schema">
-            <directory>tests/SchemaTest.php</directory>
+            <file>tests/SchemaTest.php</file>
         </testsuite>
         <testsuite name="seeder">
-            <directory>tests/SeederTest.php</directory>
+            <file>tests/SeederTest.php</file>
         </testsuite>
         <testsuite name="cache">
-            <directory>tests/CacheTest.php</directory>
+            <file>tests/CacheTest.php</file>
         </testsuite>
         <testsuite name="builder">
-            <directory>tests/QueryBuilderTest.php</directory>
-            <directory>tests/QueryTest.php</directory>
+            <file>tests/QueryBuilderTest.php</file>
+            <file>tests/QueryTest.php</file>
         </testsuite>
         <testsuite name="model">
-            <directory>tests/ModelTest.php</directory>
-            <directory>tests/RelationsTest.php</directory>
+            <file>tests/ModelTest.php</file>
+            <file>tests/RelationsTest.php</file>
         </testsuite>
         <testsuite name="relations">
-            <directory>tests/RelationsTest.php</directory>
-            <directory>tests/EmbeddedRelationsTest.php</directory>
+            <file>tests/RelationsTest.php</file>
+            <file>tests/EmbeddedRelationsTest.php</file>
         </testsuite>
         <testsuite name="mysqlrelations">
-            <directory>tests/RelationsTest.php</directory>
-            <directory>tests/MysqlRelationsTest.php</directory>
+            <file>tests/RelationsTest.php</file>
         </testsuite>
         <testsuite name="validation">
-            <directory>tests/ValidationTest.php</directory>
+            <file>tests/ValidationTest.php</file>
         </testsuite>
     </testsuites>
+    <php>
+        <env name="MONGO_HOST" value="mongodb"/>
+        <env name="MONGO_DATABASE" value="unittest"/>
+        <env name="MONGO_PORT" value="27017"/>
+        <env name="MYSQL_HOST" value="mysql"/>
+        <env name="MYSQL_DATABASE" value="unittest"/>
+        <env name="MYSQL_USERNAME" value="root"/>
+        <env name="QUEUE_CONNECTION" value="database"/>
+    </php>
 </phpunit>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github: jenssegers
		open_collective: laravel-mongodb