Commit 7592967c authored by Jens Segers's avatar Jens Segers

Support for laravel 6

parent 47398ff4
{ {
"name": "jenssegers/mongodb", "name": "jenssegers/mongodb",
"description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)", "description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)",
"keywords": ["laravel","eloquent","mongodb","mongo","database","model","moloquent"], "keywords": [
"homepage": "https://github.com/jenssegers/laravel-mongodb", "laravel",
"authors": [ "eloquent",
{ "mongodb",
"name": "Jens Segers", "mongo",
"homepage": "https://jenssegers.com" "database",
} "model",
], "moloquent"
"license" : "MIT", ],
"require": { "homepage": "https://github.com/jenssegers/laravel-mongodb",
"illuminate/support": "^5.8", "authors": [
"illuminate/container": "^5.8", {
"illuminate/database": "^5.8", "name": "Jens Segers",
"illuminate/events": "^5.8", "homepage": "https://jenssegers.com"
"mongodb/mongodb": "^1.4" }
}, ],
"require-dev": { "license": "MIT",
"phpunit/phpunit": "^6.0|^7.0", "require": {
"orchestra/testbench": "^3.1", "illuminate/support": "^5.8|^6.0",
"mockery/mockery": "^1.0", "illuminate/container": "^5.8|^6.0",
"satooshi/php-coveralls": "^2.0", "illuminate/database": "^5.8|^6.0",
"doctrine/dbal": "^2.5" "illuminate/events": "^5.8|^6.0",
}, "mongodb/mongodb": "^1.4"
"autoload": { },
"psr-0": { "require-dev": {
"Jenssegers\\Mongodb": "src/" "phpunit/phpunit": "^6.0|^7.0|^8.0",
} "orchestra/testbench": "^3.1|^4.0",
}, "mockery/mockery": "^1.0",
"autoload-dev": { "satooshi/php-coveralls": "^2.0",
"classmap": [ "doctrine/dbal": "^2.5"
"tests/TestCase.php", },
"tests/models", "autoload": {
"tests/seeds" "psr-0": {
] "Jenssegers\\Mongodb": "src/"
}, }
"suggest": { },
"jenssegers/mongodb-session": "Add MongoDB session support to Laravel-MongoDB", "autoload-dev": {
"jenssegers/mongodb-sentry": "Add Sentry support to Laravel-MongoDB" "classmap": [
}, "tests/TestCase.php",
"extra": { "tests/models",
"laravel": { "tests/seeds"
"providers": [ ]
"Jenssegers\\Mongodb\\MongodbServiceProvider", },
"Jenssegers\\Mongodb\\MongodbQueueServiceProvider" "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"
]
}
}
}
...@@ -67,9 +67,10 @@ class Connection extends BaseConnection ...@@ -67,9 +67,10 @@ class Connection extends BaseConnection
* Begin a fluent query against a database collection. * Begin a fluent query against a database collection.
* *
* @param string $table * @param string $table
* @param string|null $as
* @return Query\Builder * @return Query\Builder
*/ */
public function table($table) public function table($table, $as = null)
{ {
return $this->collection($table); return $this->collection($table);
} }
......
...@@ -690,7 +690,7 @@ class Builder extends BaseBuilder ...@@ -690,7 +690,7 @@ class Builder extends BaseBuilder
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function from($collection) public function from($collection, $as = null)
{ {
if ($collection) { if ($collection) {
$this->collection = $this->connection->getCollection($collection); $this->collection = $this->connection->getCollection($collection);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment