Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# https://github.com/actions/labeler
docs:
- changed-files:
- any-glob-to-any-file: 'docs/**'
github:
- changed-files:
- any-glob-to-any-file: '.github/**'
12 changes: 12 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: "Pull Request Labeler"
on:
- pull_request_target

jobs:
labeler:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.

* Fix memory leak when filling nested fields using dot notation by @GromNaN in [#2962](https://github.com/mongodb/laravel-mongodb/pull/2962)
* Fix PHP error when accessing the connection after disconnect by @SanderMuller in [#2967](https://github.com/mongodb/laravel-mongodb/pull/2967)
* Improve error message for invalid configuration by @GromNaN in [#2975](https://github.com/mongodb/laravel-mongodb/pull/2975)

## [4.3.0] - 2024-04-26

Expand Down
14 changes: 11 additions & 3 deletions src/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ public function disconnect()

/**
* Determine if the given configuration array has a dsn string.
*
* @deprecated
*/
protected function hasDsnString(array $config): bool
{
Expand Down Expand Up @@ -261,9 +263,15 @@ protected function getHostDsn(array $config): string
*/
protected function getDsn(array $config): string
{
return $this->hasDsnString($config)
? $this->getDsnString($config)
: $this->getHostDsn($config);
if (! empty($config['dsn'])) {
return $this->getDsnString($config);
}

if (! empty($config['host'])) {
return $this->getHostDsn($config);
}

throw new InvalidArgumentException('MongoDB connection configuration requires "dsn" or "host" key.');
}

/** @inheritdoc */
Expand Down
8 changes: 8 additions & 0 deletions tests/ConnectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,14 @@ public function testConnectionWithoutConfiguredDatabase(): void
new Connection(['dsn' => 'mongodb://some-host']);
}

public function testConnectionWithoutConfiguredDsnOrHost(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('MongoDB connection configuration requires "dsn" or "host" key.');

new Connection(['database' => 'hello']);
}

public function testCollection()
{
$collection = DB::connection('mongodb')->getCollection('unittest');
Expand Down