Skip to content

Commit 7592967

Browse files
committed
⬆️ Support for laravel 6
1 parent 47398ff commit 7592967

File tree

3 files changed

+62
-53
lines changed

3 files changed

+62
-53
lines changed

composer.json

Lines changed: 59 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,59 @@
1-
{
2-
"name": "jenssegers/mongodb",
3-
"description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)",
4-
"keywords": ["laravel","eloquent","mongodb","mongo","database","model","moloquent"],
5-
"homepage": "https://github.com/jenssegers/laravel-mongodb",
6-
"authors": [
7-
{
8-
"name": "Jens Segers",
9-
"homepage": "https://jenssegers.com"
10-
}
11-
],
12-
"license" : "MIT",
13-
"require": {
14-
"illuminate/support": "^5.8",
15-
"illuminate/container": "^5.8",
16-
"illuminate/database": "^5.8",
17-
"illuminate/events": "^5.8",
18-
"mongodb/mongodb": "^1.4"
19-
},
20-
"require-dev": {
21-
"phpunit/phpunit": "^6.0|^7.0",
22-
"orchestra/testbench": "^3.1",
23-
"mockery/mockery": "^1.0",
24-
"satooshi/php-coveralls": "^2.0",
25-
"doctrine/dbal": "^2.5"
26-
},
27-
"autoload": {
28-
"psr-0": {
29-
"Jenssegers\\Mongodb": "src/"
30-
}
31-
},
32-
"autoload-dev": {
33-
"classmap": [
34-
"tests/TestCase.php",
35-
"tests/models",
36-
"tests/seeds"
37-
]
38-
},
39-
"suggest": {
40-
"jenssegers/mongodb-session": "Add MongoDB session support to Laravel-MongoDB",
41-
"jenssegers/mongodb-sentry": "Add Sentry support to Laravel-MongoDB"
42-
},
43-
"extra": {
44-
"laravel": {
45-
"providers": [
46-
"Jenssegers\\Mongodb\\MongodbServiceProvider",
47-
"Jenssegers\\Mongodb\\MongodbQueueServiceProvider"
48-
]
49-
}
50-
}
51-
}
1+
{
2+
"name": "jenssegers/mongodb",
3+
"description": "A MongoDB based Eloquent model and Query builder for Laravel (Moloquent)",
4+
"keywords": [
5+
"laravel",
6+
"eloquent",
7+
"mongodb",
8+
"mongo",
9+
"database",
10+
"model",
11+
"moloquent"
12+
],
13+
"homepage": "https://github.com/jenssegers/laravel-mongodb",
14+
"authors": [
15+
{
16+
"name": "Jens Segers",
17+
"homepage": "https://jenssegers.com"
18+
}
19+
],
20+
"license": "MIT",
21+
"require": {
22+
"illuminate/support": "^5.8|^6.0",
23+
"illuminate/container": "^5.8|^6.0",
24+
"illuminate/database": "^5.8|^6.0",
25+
"illuminate/events": "^5.8|^6.0",
26+
"mongodb/mongodb": "^1.4"
27+
},
28+
"require-dev": {
29+
"phpunit/phpunit": "^6.0|^7.0|^8.0",
30+
"orchestra/testbench": "^3.1|^4.0",
31+
"mockery/mockery": "^1.0",
32+
"satooshi/php-coveralls": "^2.0",
33+
"doctrine/dbal": "^2.5"
34+
},
35+
"autoload": {
36+
"psr-0": {
37+
"Jenssegers\\Mongodb": "src/"
38+
}
39+
},
40+
"autoload-dev": {
41+
"classmap": [
42+
"tests/TestCase.php",
43+
"tests/models",
44+
"tests/seeds"
45+
]
46+
},
47+
"suggest": {
48+
"jenssegers/mongodb-session": "Add MongoDB session support to Laravel-MongoDB",
49+
"jenssegers/mongodb-sentry": "Add Sentry support to Laravel-MongoDB"
50+
},
51+
"extra": {
52+
"laravel": {
53+
"providers": [
54+
"Jenssegers\\Mongodb\\MongodbServiceProvider",
55+
"Jenssegers\\Mongodb\\MongodbQueueServiceProvider"
56+
]
57+
}
58+
}
59+
}

src/Jenssegers/Mongodb/Connection.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ public function collection($collection)
6767
* Begin a fluent query against a database collection.
6868
*
6969
* @param string $table
70+
* @param string|null $as
7071
* @return Query\Builder
7172
*/
72-
public function table($table)
73+
public function table($table, $as = null)
7374
{
7475
return $this->collection($table);
7576
}

src/Jenssegers/Mongodb/Query/Builder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ public function delete($id = null)
690690
/**
691691
* @inheritdoc
692692
*/
693-
public function from($collection)
693+
public function from($collection, $as = null)
694694
{
695695
if ($collection) {
696696
$this->collection = $this->connection->getCollection($collection);

0 commit comments

Comments
 (0)