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
acacc990
Commit
acacc990
authored
Jun 29, 2016
by
Kim Hemsø Rasmussen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed nearly all call_user_* from core( not drivers )
parent
b3ffe1db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
14 deletions
+4
-14
Connection.php
lib/Doctrine/DBAL/Connection.php
+1
-11
MasterSlaveConnection.php
lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php
+2
-2
Connection.php
lib/Doctrine/DBAL/Portability/Connection.php
+1
-1
No files found.
lib/Doctrine/DBAL/Connection.php
View file @
acacc990
...
...
@@ -923,17 +923,7 @@ class Connection implements DriverConnection
}
try
{
switch
(
func_num_args
())
{
case
1
:
$statement
=
$this
->
_conn
->
query
(
$args
[
0
]);
break
;
case
2
:
$statement
=
$this
->
_conn
->
query
(
$args
[
0
],
$args
[
1
]);
break
;
default
:
$statement
=
call_user_func_array
(
array
(
$this
->
_conn
,
'query'
),
$args
);
break
;
}
$statement
=
$this
->
_conn
->
query
(
...
$args
);
}
catch
(
Exception
$ex
)
{
throw
DBALException
::
driverExceptionDuringQuery
(
$this
->
_driver
,
$ex
,
$args
[
0
]);
}
...
...
lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php
View file @
acacc990
...
...
@@ -368,8 +368,8 @@ class MasterSlaveConnection extends Connection
if
(
$logger
)
{
$logger
->
startQuery
(
$args
[
0
]);
}
$statement
=
call_user_func_array
(
array
(
$this
->
_conn
,
'query'
),
$args
);
$statement
=
$this
->
_conn
->
query
(
...
$args
);
if
(
$logger
)
{
$logger
->
stopQuery
();
...
...
lib/Doctrine/DBAL/Portability/Connection.php
View file @
acacc990
...
...
@@ -141,7 +141,7 @@ class Connection extends \Doctrine\DBAL\Connection
{
$this
->
connect
();
$stmt
=
call_user_func_array
(
array
(
$this
->
_conn
,
'query'
),
func_get_args
());
$stmt
=
$this
->
_conn
->
query
(
...
func_get_args
());
$stmt
=
new
Statement
(
$stmt
,
$this
);
$stmt
->
setFetchMode
(
$this
->
defaultFetchMode
);
...
...
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