Skip to content

Commit

Permalink
Improve error message for invalid configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
GromNaN committed May 23, 2024
1 parent 390c9ec commit 51bee37
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
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
12 changes: 9 additions & 3 deletions src/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,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

0 comments on commit 51bee37

Please sign in to comment.