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
18fb5028
Commit
18fb5028
authored
Oct 31, 2010
by
Benjamin Eberlei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Testsuite to be PHPUnit 3.5 compatible
parent
22ecf03f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
25 deletions
+4
-25
DbalFunctionalTestCase.php
tests/Doctrine/Tests/DbalFunctionalTestCase.php
+3
-11
DbalFunctionalTestSuite.php
tests/Doctrine/Tests/DbalFunctionalTestSuite.php
+1
-12
TestInit.php
tests/Doctrine/Tests/TestInit.php
+0
-2
No files found.
tests/Doctrine/Tests/DbalFunctionalTestCase.php
View file @
18fb5028
...
@@ -18,10 +18,6 @@ class DbalFunctionalTestCase extends DbalTestCase
...
@@ -18,10 +18,6 @@ class DbalFunctionalTestCase extends DbalTestCase
protected
function
resetSharedConn
()
protected
function
resetSharedConn
()
{
{
if
(
isset
(
$this
->
sharedFixture
[
'conn'
]))
{
$this
->
sharedFixture
[
'conn'
]
->
close
();
$this
->
sharedFixture
[
'conn'
]
=
null
;
}
if
(
self
::
$_sharedConn
)
{
if
(
self
::
$_sharedConn
)
{
self
::
$_sharedConn
->
close
();
self
::
$_sharedConn
->
close
();
self
::
$_sharedConn
=
null
;
self
::
$_sharedConn
=
null
;
...
@@ -30,13 +26,9 @@ class DbalFunctionalTestCase extends DbalTestCase
...
@@ -30,13 +26,9 @@ class DbalFunctionalTestCase extends DbalTestCase
protected
function
setUp
()
protected
function
setUp
()
{
{
if
(
isset
(
$this
->
sharedFixture
[
'conn'
]))
{
$this
->
_conn
=
$this
->
sharedFixture
[
'conn'
];
}
else
{
if
(
!
isset
(
self
::
$_sharedConn
))
{
if
(
!
isset
(
self
::
$_sharedConn
))
{
self
::
$_sharedConn
=
TestUtil
::
getConnection
();
self
::
$_sharedConn
=
TestUtil
::
getConnection
();
}
}
$this
->
_conn
=
self
::
$_sharedConn
;
$this
->
_conn
=
self
::
$_sharedConn
;
}
}
}
}
}
tests/Doctrine/Tests/DbalFunctionalTestSuite.php
View file @
18fb5028
...
@@ -4,16 +4,5 @@ namespace Doctrine\Tests;
...
@@ -4,16 +4,5 @@ namespace Doctrine\Tests;
class
DbalFunctionalTestSuite
extends
DbalTestSuite
class
DbalFunctionalTestSuite
extends
DbalTestSuite
{
{
protected
function
setUp
()
{
if
(
!
isset
(
$this
->
sharedFixture
[
'conn'
]))
{
$this
->
sharedFixture
[
'conn'
]
=
TestUtil
::
getConnection
();
}
}
protected
function
tearDown
()
{
$this
->
sharedFixture
[
'conn'
]
->
close
();
$this
->
sharedFixture
=
null
;
}
}
}
\ No newline at end of file
tests/Doctrine/Tests/TestInit.php
View file @
18fb5028
...
@@ -6,8 +6,6 @@ namespace Doctrine\Tests;
...
@@ -6,8 +6,6 @@ namespace Doctrine\Tests;
error_reporting
(
E_ALL
|
E_STRICT
);
error_reporting
(
E_ALL
|
E_STRICT
);
require_once
'PHPUnit/Framework.php'
;
require_once
'PHPUnit/TextUI/TestRunner.php'
;
require_once
__DIR__
.
'/../../../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php'
;
require_once
__DIR__
.
'/../../../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php'
;
$classLoader
=
new
\Doctrine\Common\ClassLoader
(
'Doctrine\Common'
,
__DIR__
.
'/../../../lib/vendor/doctrine-common/lib'
);
$classLoader
=
new
\Doctrine\Common\ClassLoader
(
'Doctrine\Common'
,
__DIR__
.
'/../../../lib/vendor/doctrine-common/lib'
);
...
...
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