8000 [9.x] Bump DBAL to 2.12 by driesvints · Pull Request #35974 · laravel/framework · GitHub
[go: up one dir, main page]
Skip to content

[9.x] Bump DBAL to 2.12 #35974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 21, 2021
Merged

[9.x] Bump DBAL to 2.12 #35974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55befcc
Bump DBAL to 2.12
driesvints Jan 21, 2021
c478b26
Fix invalid signatures
driesvints Jan 21, 2021
36d80b7
Remove conflict
driesvints Jan 21, 2021
3793a33
inheritdoc
driesvints Jan 21, 2021
0ad8e63
DocBlocks
driesvints Jan 21, 2021
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
Prev Previous commit
DocBlocks
  • Loading branch information
@driesvints
driesvints committed Jan 21, 2021
commit 0ad8e63aebe7b5e5df9fd7872b16de8213fbf72a
5 changes: 4 additions & 1 deletion src/Illuminate/Database/PDO/Concerns/ConnectsToDatabase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ trait ConnectsToDatabase
/**
* Create a new database connection.
*
* @param array $params
* @param mixed[] $params
* @param string|null $username
* @param string|null $password
* @param mixed[] $driverOptions
* @return \Illuminate\Database\PDO\Connection
*/
public function connect(array $params, $username = null, $password = null, array $driverOptions = [])
Expand Down
9 changes: 9 additions & 0 deletions src/Illuminate/Database/PDO/SqlServerDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@

class SqlServerDriver extends AbstractSQLServerDriver
{
/**
* Create a new database connection.
*
* @param mixed[] $params
* @param string|null $username
* @param string|null $password
* @param mixed[] $driverOptions
* @return \Illuminate\Database\PDO\Connection
*/
public function connect(array $params, $username = null, $password = null, array $driverOptions = [])
{
return new SqlServerConnection(
Expand Down
0