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
0112caa8
Unverified
Commit
0112caa8
authored
Aug 19, 2020
by
Sergei Morozov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use empty string instead of NULL for mysqli SSL parameters by default
parent
c70832a8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
Driver.php
src/Driver/Mysqli/Driver.php
+5
-5
Secure.php
src/Driver/Mysqli/Initializer/Secure.php
+6
-6
No files found.
src/Driver/Mysqli/Driver.php
View file @
0112caa8
...
@@ -89,11 +89,11 @@ final class Driver extends AbstractMySQLDriver
...
@@ -89,11 +89,11 @@ final class Driver extends AbstractMySQLDriver
isset
(
$params
[
'ssl_cipher'
])
isset
(
$params
[
'ssl_cipher'
])
)
{
)
{
$initializers
[]
=
new
Secure
(
$initializers
[]
=
new
Secure
(
$params
[
'ssl_key'
]
??
null
,
$params
[
'ssl_key'
]
??
''
,
$params
[
'ssl_cert'
]
??
null
,
$params
[
'ssl_cert'
]
??
''
,
$params
[
'ssl_ca'
]
??
null
,
$params
[
'ssl_ca'
]
??
''
,
$params
[
'ssl_capath'
]
??
null
,
$params
[
'ssl_capath'
]
??
''
,
$params
[
'ssl_cipher'
]
??
null
$params
[
'ssl_cipher'
]
??
''
);
);
}
}
...
...
src/Driver/Mysqli/Initializer/Secure.php
View file @
0112caa8
...
@@ -9,22 +9,22 @@ use mysqli;
...
@@ -9,22 +9,22 @@ use mysqli;
final
class
Secure
implements
Initializer
final
class
Secure
implements
Initializer
{
{
/** @var string
|null
*/
/** @var string */
private
$key
;
private
$key
;
/** @var string
|null
*/
/** @var string */
private
$cert
;
private
$cert
;
/** @var string
|null
*/
/** @var string */
private
$ca
;
private
$ca
;
/** @var string
|null
*/
/** @var string */
private
$capath
;
private
$capath
;
/** @var string
|null
*/
/** @var string */
private
$cipher
;
private
$cipher
;
public
function
__construct
(
?
string
$key
,
?
string
$cert
,
?
string
$ca
,
?
string
$capath
,
?
string
$cipher
)
public
function
__construct
(
string
$key
,
string
$cert
,
string
$ca
,
string
$capath
,
string
$cipher
)
{
{
$this
->
key
=
$key
;
$this
->
key
=
$key
;
$this
->
cert
=
$cert
;
$this
->
cert
=
$cert
;
...
...
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