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
9565d848
Commit
9565d848
authored
Nov 16, 2014
by
David Zuelke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix return values
parent
567235fd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
DriverManager.php
lib/Doctrine/DBAL/DriverManager.php
+3
-1
No files found.
lib/Doctrine/DBAL/DriverManager.php
View file @
9565d848
...
@@ -226,7 +226,7 @@ final class DriverManager
...
@@ -226,7 +226,7 @@ final class DriverManager
private
static
function
_parseDatabaseUrl
(
array
$params
)
private
static
function
_parseDatabaseUrl
(
array
$params
)
{
{
if
(
!
isset
(
$params
[
'url'
]))
{
if
(
!
isset
(
$params
[
'url'
]))
{
return
;
return
$params
;
}
}
// (pdo_)?sqlite3?:///... => (pdo_)?sqlite3?://localhost/... or else the URL will be invalid
// (pdo_)?sqlite3?:///... => (pdo_)?sqlite3?://localhost/... or else the URL will be invalid
...
@@ -272,5 +272,7 @@ final class DriverManager
...
@@ -272,5 +272,7 @@ final class DriverManager
parse_str
(
$url
[
'query'
],
$query
);
// simply ingest query as extra params, e.g. charset or sslmode
parse_str
(
$url
[
'query'
],
$query
);
// simply ingest query as extra params, e.g. charset or sslmode
$params
=
array_merge
(
$params
,
$query
);
// parse_str wipes existing array elements
$params
=
array_merge
(
$params
,
$query
);
// parse_str wipes existing array elements
}
}
return
$params
;
}
}
}
}
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