Merge pull request #1976 from PartechGSS/partech-bugfixes

divine · web-flow · commit 01dfe3c07d57 · 2020-03-03T18:38:40.000+03:00
Fix getDefaultDatabaseName to handle +srv URLs.
diff --git a/src/Jenssegers/Mongodb/Connection.php b/src/Jenssegers/Mongodb/Connection.php
@@ -128,7 +128,7 @@ public function getDatabaseName()
     protected function getDefaultDatabaseName($dsn, $config)
     {
         if (empty($config['database'])) {
-            if (preg_match('/^mongodb:\\/\\/.+\\/([^?&]+)/s', $dsn, $matches)) {
+            if (preg_match('/^mongodb(?:[+]srv)?:\\/\\/.+\\/([^?&]+)/s', $dsn, $matches)) {
                 $config['database'] = $matches[1];
             } else {
                 throw new InvalidArgumentException("Database is not properly configured.");

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public function getDatabaseName()`
`128`	`128`	`protected function getDefaultDatabaseName($dsn, $config)`
`129`	`129`	`{`
`130`	`130`	`if (empty($config['database'])) {`
`131`		`- if (preg_match('/^mongodb:\\/\\/.+\\/([^?&]+)/s', $dsn, $matches)) {`
	`131`	`+ if (preg_match('/^mongodb(?:[+]srv)?:\\/\\/.+\\/([^?&]+)/s', $dsn, $matches)) {`
`132`	`132`	`$config['database'] = $matches[1];`
`133`	`133`	`} else {`
`134`	`134`	`throw new InvalidArgumentException("Database is not properly configured.");`