Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
f9706971
Unverified
Commit
f9706971
authored
Aug 19, 2020
by
Sergei Morozov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert the accidental rename of `driverOptions` to `driver_options`
parent
0112caa8
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
13 additions
and
13 deletions
+13
-13
Driver.php
src/Driver/IBMDB2/Driver.php
+1
-1
Driver.php
src/Driver/Mysqli/Driver.php
+2
-2
Driver.php
src/Driver/PDO/MySQL/Driver.php
+1
-1
Driver.php
src/Driver/PDO/OCI/Driver.php
+1
-1
Driver.php
src/Driver/PDO/PgSQL/Driver.php
+1
-1
Driver.php
src/Driver/PDO/SQLSrv/Driver.php
+2
-2
Driver.php
src/Driver/PDO/SQLite/Driver.php
+1
-1
Driver.php
src/Driver/SQLSrv/Driver.php
+1
-1
DriverTest.php
tests/Driver/PDO/PgSQL/DriverTest.php
+1
-1
ConnectionTest.php
tests/Functional/Driver/Mysqli/ConnectionTest.php
+1
-1
DriverTest.php
tests/Functional/Driver/PDO/SQLSrv/DriverTest.php
+1
-1
No files found.
src/Driver/IBMDB2/Driver.php
View file @
f9706971
...
...
@@ -16,7 +16,7 @@ final class Driver extends AbstractDB2Driver
isset
(
$params
[
'persistent'
])
&&
$params
[
'persistent'
]
===
true
,
$params
[
'user'
]
??
''
,
$params
[
'password'
]
??
''
,
$params
[
'driver
_o
ptions'
]
??
[]
$params
[
'driver
O
ptions'
]
??
[]
);
}
}
src/Driver/Mysqli/Driver.php
View file @
f9706971
...
...
@@ -31,8 +31,8 @@ final class Driver extends AbstractMySQLDriver
$preInitializers
=
$postInitializers
=
[];
if
(
isset
(
$params
[
'driver
_o
ptions'
]))
{
$driverOptions
=
$params
[
'driver
_o
ptions'
];
if
(
isset
(
$params
[
'driver
O
ptions'
]))
{
$driverOptions
=
$params
[
'driver
O
ptions'
];
if
(
isset
(
$driverOptions
[
Connection
::
OPTION_FLAGS
]))
{
$flags
=
$driverOptions
[
Connection
::
OPTION_FLAGS
];
...
...
src/Driver/PDO/MySQL/Driver.php
View file @
f9706971
...
...
@@ -13,7 +13,7 @@ final class Driver extends AbstractMySQLDriver
*/
public
function
connect
(
array
$params
)
{
$driverOptions
=
$params
[
'driver
_o
ptions'
]
??
[];
$driverOptions
=
$params
[
'driver
O
ptions'
]
??
[];
if
(
!
empty
(
$params
[
'persistent'
]))
{
$driverOptions
[
PDO
::
ATTR_PERSISTENT
]
=
true
;
...
...
src/Driver/PDO/OCI/Driver.php
View file @
f9706971
...
...
@@ -13,7 +13,7 @@ final class Driver extends AbstractOracleDriver
*/
public
function
connect
(
array
$params
)
{
$driverOptions
=
$params
[
'driver
_o
ptions'
]
??
[];
$driverOptions
=
$params
[
'driver
O
ptions'
]
??
[];
if
(
!
empty
(
$params
[
'persistent'
]))
{
$driverOptions
[
PDO
::
ATTR_PERSISTENT
]
=
true
;
...
...
src/Driver/PDO/PgSQL/Driver.php
View file @
f9706971
...
...
@@ -15,7 +15,7 @@ final class Driver extends AbstractPostgreSQLDriver
*/
public
function
connect
(
array
$params
)
{
$driverOptions
=
$params
[
'driver
_o
ptions'
]
??
[];
$driverOptions
=
$params
[
'driver
O
ptions'
]
??
[];
if
(
!
empty
(
$params
[
'persistent'
]))
{
$driverOptions
[
PDO
::
ATTR_PERSISTENT
]
=
true
;
...
...
src/Driver/PDO/SQLSrv/Driver.php
View file @
f9706971
...
...
@@ -20,8 +20,8 @@ final class Driver extends AbstractSQLServerDriver
{
$pdoOptions
=
$dsnOptions
=
[];
if
(
isset
(
$params
[
'driver
_o
ptions'
]))
{
foreach
(
$params
[
'driver
_o
ptions'
]
as
$option
=>
$value
)
{
if
(
isset
(
$params
[
'driver
O
ptions'
]))
{
foreach
(
$params
[
'driver
O
ptions'
]
as
$option
=>
$value
)
{
if
(
is_int
(
$option
))
{
$pdoOptions
[
$option
]
=
$value
;
}
else
{
...
...
src/Driver/PDO/SQLite/Driver.php
View file @
f9706971
...
...
@@ -22,7 +22,7 @@ final class Driver extends AbstractSQLiteDriver
*/
public
function
connect
(
array
$params
)
{
$driverOptions
=
$params
[
'driver
_o
ptions'
]
??
[];
$driverOptions
=
$params
[
'driver
O
ptions'
]
??
[];
if
(
isset
(
$driverOptions
[
'userDefinedFunctions'
]))
{
$this
->
_userDefinedFunctions
=
array_merge
(
...
...
src/Driver/SQLSrv/Driver.php
View file @
f9706971
...
...
@@ -27,7 +27,7 @@ final class Driver extends AbstractSQLServerDriver
throw
PortWithoutHost
::
new
();
}
$driverOptions
=
$params
[
'driver
_o
ptions'
]
??
[];
$driverOptions
=
$params
[
'driver
O
ptions'
]
??
[];
if
(
isset
(
$params
[
'dbname'
]))
{
$driverOptions
[
'Database'
]
=
$params
[
'dbname'
];
...
...
tests/Driver/PDO/PgSQL/DriverTest.php
View file @
f9706971
...
...
@@ -71,7 +71,7 @@ class DriverTest extends AbstractPostgreSQLDriverTest
return
$this
->
createDriver
()
->
connect
(
array_merge
(
TestUtil
::
getConnectionParams
(),
[
'driver
_o
ptions'
=>
$driverOptions
]
[
'driver
O
ptions'
=>
$driverOptions
]
)
);
}
...
...
tests/Functional/Driver/Mysqli/ConnectionTest.php
View file @
f9706971
...
...
@@ -64,7 +64,7 @@ class ConnectionTest extends FunctionalTestCase
return
(
new
Driver
())
->
connect
(
array_merge
(
$params
,
[
'driver
_o
ptions'
=>
$driverOptions
]
[
'driver
O
ptions'
=>
$driverOptions
]
)
);
}
...
...
tests/Functional/Driver/PDO/SQLSrv/DriverTest.php
View file @
f9706971
...
...
@@ -45,7 +45,7 @@ class DriverTest extends AbstractDriverTest
return
$this
->
connection
->
getDriver
()
->
connect
(
array_merge
(
TestUtil
::
getConnectionParams
(),
[
'driver
_o
ptions'
=>
$driverOptions
]
[
'driver
O
ptions'
=>
$driverOptions
]
)
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment