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
6f346ad0
Commit
6f346ad0
authored
Oct 22, 2014
by
Marco Pivetta
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hotfix/#685-DBAL-997-undefined-_conn-property'
Close #685 Close #688 Close #691
parents
fbd49846
f08d7a21
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
Connection.php
lib/Doctrine/DBAL/Connection.php
+1
-1
ConnectionTest.php
tests/Doctrine/Tests/DBAL/ConnectionTest.php
+7
-0
No files found.
lib/Doctrine/DBAL/Connection.php
View file @
6f346ad0
...
@@ -597,7 +597,7 @@ class Connection implements DriverConnection
...
@@ -597,7 +597,7 @@ class Connection implements DriverConnection
*/
*/
public
function
close
()
public
function
close
()
{
{
unset
(
$this
->
_conn
)
;
$this
->
_conn
=
null
;
$this
->
_isConnected
=
false
;
$this
->
_isConnected
=
false
;
}
}
...
...
tests/Doctrine/Tests/DBAL/ConnectionTest.php
View file @
6f346ad0
...
@@ -403,6 +403,13 @@ SQLSTATE[HY000]: General error: 1 near \"MUUHAAAAHAAAA\"");
...
@@ -403,6 +403,13 @@ SQLSTATE[HY000]: General error: 1 near \"MUUHAAAAHAAAA\"");
$this
->
assertSame
(
$result
,
$conn
->
fetchColumn
(
$statement
,
$params
,
$column
,
$types
));
$this
->
assertSame
(
$result
,
$conn
->
fetchColumn
(
$statement
,
$params
,
$column
,
$types
));
}
}
public
function
testConnectionIsClosed
()
{
$this
->
setExpectedException
(
'Doctrine\\DBAL\\Exception\\DriverException'
);
$this
->
_conn
->
close
();
$this
->
_conn
->
quoteIdentifier
(
'Bug'
);
}
public
function
testFetchAll
()
public
function
testFetchAll
()
{
{
$statement
=
'SELECT * FROM foo WHERE bar = ?'
;
$statement
=
'SELECT * FROM foo WHERE bar = ?'
;
...
...
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