Commit b5864f4

authored

Merge 5.4 into 5.x (#3370)

2 parents 0125031 + d56aefa commit b5864f4Copy full SHA for b5864f4

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function testDisconnectAndCreateNewConnection()`
`63`	`63`	`public function testDb()`
`64`	`64`	`{`
`65`	`65`	`$connection = DB::connection('mongodb');`
`66`		`- $this->assertInstanceOf(Database::class, $connection->getMongoDB());`
	`66`	`+ $this->assertInstanceOf(Database::class, $connection->getDatabase());`
`67`	`67`	`$this->assertInstanceOf(Client::class, $connection->getClient());`
`68`	`68`	`}`
`69`	`69`
`@@ -199,7 +199,7 @@ public function testConnectionConfig(string $expectedUri, string $expectedDataba`
`199`	`199`	`$client = $connection->getClient();`
`200`	`200`
`201`	`201`	`$this->assertSame($expectedUri, (string) $client);`
`202`		`- $this->assertSame($expectedDatabaseName, $connection->getMongoDB()->getDatabaseName());`
	`202`	`+ $this->assertSame($expectedDatabaseName, $connection->getDatabase()->getDatabaseName());`
`203`	`203`	`$this->assertSame('foo', $connection->getCollection('foo')->getCollectionName());`
`204`	`204`	`$this->assertSame('foo', $connection->table('foo')->raw()->getCollectionName());`
`205`	`205`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public static function provideValidOptions(): Generator`
`56`	`56`	`'driver' => 'gridfs',`
`57`	`57`	`'bucket' => static fn (Application $app) => $app['db']`
`58`	`58`	`->connection('mongodb')`
`59`		`- ->getMongoDB()`
	`59`	`+ ->getDatabase()`
`60`	`60`	`->selectGridFSBucket(),`
`61`	`61`	`],`
`62`	`62`	`];`
`@@ -68,7 +68,7 @@ public function testValidOptions(array $options)`
`68`	`68`	`// Service used by "bucket-service"`
`69`	`69`	`$this->app->singleton('bucket', static fn (Application $app) => $app['db']`
`70`	`70`	`->connection('mongodb')`
`71`		`- ->getMongoDB()`
	`71`	`+ ->getDatabase()`
`72`	`72`	`->selectGridFSBucket());`
`73`	`73`
`74`	`74`	`$this->app['config']->set('filesystems.disks.' . $this->dataName(), $options);`
`@@ -145,6 +145,6 @@ public function testPrefix()`
`145`	`145`
`146`	`146`	`private function getBucket(): Bucket`
`147`	`147`	`{`
`148`		`- return DB::connection('mongodb')->getMongoDB()->selectGridFSBucket();`
	`148`	`+ return DB::connection('mongodb')->getDatabase()->selectGridFSBucket();`
`149`	`149`	`}`
`150`	`150`	`}`

Comments

(0)