Commit 0d76c6e9 authored by Tobias Schultze's avatar Tobias Schultze

setUp and tearDown are meant to be protected

parent bd9b9882
...@@ -39,7 +39,7 @@ class ConfigurationTest extends DbalTestCase ...@@ -39,7 +39,7 @@ class ConfigurationTest extends DbalTestCase
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function setUp() protected function setUp()
{ {
$this->config = new Configuration(); $this->config = new Configuration();
} }
......
...@@ -24,7 +24,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase ...@@ -24,7 +24,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase
'port' => '1234' 'port' => '1234'
); );
public function setUp() protected function setUp()
{ {
$this->_conn = \Doctrine\DBAL\DriverManager::getConnection($this->params); $this->_conn = \Doctrine\DBAL\DriverManager::getConnection($this->params);
} }
......
...@@ -4,7 +4,7 @@ namespace Doctrine\Tests\DBAL; ...@@ -4,7 +4,7 @@ namespace Doctrine\Tests\DBAL;
class OCI8StatementTest extends \Doctrine\Tests\DbalTestCase class OCI8StatementTest extends \Doctrine\Tests\DbalTestCase
{ {
public function setUp() protected function setUp()
{ {
if (!extension_loaded('oci8')) { if (!extension_loaded('oci8')) {
$this->markTestSkipped('oci8 is not installed.'); $this->markTestSkipped('oci8 is not installed.');
......
...@@ -10,7 +10,7 @@ use PDO; ...@@ -10,7 +10,7 @@ use PDO;
*/ */
class BlobTest extends \Doctrine\Tests\DbalFunctionalTestCase class BlobTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -8,13 +8,13 @@ use Doctrine\DBAL\Types\Type; ...@@ -8,13 +8,13 @@ use Doctrine\DBAL\Types\Type;
class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
public function setUp() protected function setUp()
{ {
$this->resetSharedConn(); $this->resetSharedConn();
parent::setUp(); parent::setUp();
} }
public function tearDown() protected function tearDown()
{ {
parent::tearDown(); parent::tearDown();
$this->resetSharedConn(); $this->resetSharedConn();
......
...@@ -11,7 +11,7 @@ class DataAccessTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -11,7 +11,7 @@ class DataAccessTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
static private $generated = false; static private $generated = false;
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -3,7 +3,7 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\Mysqli; ...@@ -3,7 +3,7 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\Mysqli;
class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
public function setUp() protected function setUp()
{ {
if (!extension_loaded('mysqli')) { if (!extension_loaded('mysqli')) {
$this->markTestSkipped('mysqli is not installed.'); $this->markTestSkipped('mysqli is not installed.');
...@@ -16,7 +16,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -16,7 +16,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
} }
} }
public function tearDown() protected function tearDown()
{ {
parent::tearDown(); parent::tearDown();
} }
......
...@@ -10,7 +10,7 @@ use Doctrine\Tests\DbalFunctionalTestCase; ...@@ -10,7 +10,7 @@ use Doctrine\Tests\DbalFunctionalTestCase;
*/ */
class MasterSlaveConnectionTest extends DbalFunctionalTestCase class MasterSlaveConnectionTest extends DbalFunctionalTestCase
{ {
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -6,7 +6,7 @@ class ModifyLimitQueryTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -6,7 +6,7 @@ class ModifyLimitQueryTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
private static $tableCreated = false; private static $tableCreated = false;
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -101,7 +101,7 @@ class NamedParametersTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -101,7 +101,7 @@ class NamedParametersTest extends \Doctrine\Tests\DbalFunctionalTestCase
); );
} }
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -14,7 +14,7 @@ class PortabilityTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -14,7 +14,7 @@ class PortabilityTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
private $portableConnection; private $portableConnection;
public function tearDown() protected function tearDown()
{ {
if ($this->portableConnection) { if ($this->portableConnection) {
$this->portableConnection->close(); $this->portableConnection->close();
......
...@@ -12,7 +12,7 @@ class ResultCacheTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -12,7 +12,7 @@ class ResultCacheTest extends \Doctrine\Tests\DbalFunctionalTestCase
private $expectedResult = array(array('test_int' => 100, 'test_string' => 'foo'), array('test_int' => 200, 'test_string' => 'bar'), array('test_int' => 300, 'test_string' => 'baz')); private $expectedResult = array(array('test_int' => 100, 'test_string' => 'foo'), array('test_int' => 200, 'test_string' => 'bar'), array('test_int' => 300, 'test_string' => 'baz'));
private $sqlLogger; private $sqlLogger;
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -7,7 +7,7 @@ use Doctrine\Tests\TestUtil; ...@@ -7,7 +7,7 @@ use Doctrine\Tests\TestUtil;
class OracleSchemaManagerTest extends SchemaManagerFunctionalTestCase class OracleSchemaManagerTest extends SchemaManagerFunctionalTestCase
{ {
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -9,7 +9,7 @@ use Doctrine\DBAL\Types\Type; ...@@ -9,7 +9,7 @@ use Doctrine\DBAL\Types\Type;
class PostgreSqlSchemaManagerTest extends SchemaManagerFunctionalTestCase class PostgreSqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
{ {
public function tearDown() protected function tearDown()
{ {
parent::tearDown(); parent::tearDown();
......
...@@ -11,7 +11,7 @@ class TableGeneratorTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -11,7 +11,7 @@ class TableGeneratorTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
private $generator; private $generator;
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -7,7 +7,7 @@ use Doctrine\DBAL\Types\Type; ...@@ -7,7 +7,7 @@ use Doctrine\DBAL\Types\Type;
class TemporaryTableTest extends \Doctrine\Tests\DbalFunctionalTestCase class TemporaryTableTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
try { try {
...@@ -17,7 +17,7 @@ class TemporaryTableTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -17,7 +17,7 @@ class TemporaryTableTest extends \Doctrine\Tests\DbalFunctionalTestCase
} }
} }
public function tearDown() protected function tearDown()
{ {
if ($this->_conn) { if ($this->_conn) {
try { try {
......
...@@ -10,7 +10,7 @@ use Doctrine\DBAL\Schema\Table; ...@@ -10,7 +10,7 @@ use Doctrine\DBAL\Schema\Table;
*/ */
class DBAL510Test extends \Doctrine\Tests\DbalFunctionalTestCase class DBAL510Test extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -8,7 +8,7 @@ class TypeConversionTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -8,7 +8,7 @@ class TypeConversionTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
static private $typeCounter = 0; static private $typeCounter = 0;
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -6,7 +6,7 @@ use PDO; ...@@ -6,7 +6,7 @@ use PDO;
class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
......
...@@ -4,12 +4,12 @@ namespace Doctrine\Tests\DBAL\Logging; ...@@ -4,12 +4,12 @@ namespace Doctrine\Tests\DBAL\Logging;
class DebugStackTest extends \Doctrine\Tests\DbalTestCase class DebugStackTest extends \Doctrine\Tests\DbalTestCase
{ {
public function setUp() protected function setUp()
{ {
$this->logger = new \Doctrine\DBAL\Logging\DebugStack(); $this->logger = new \Doctrine\DBAL\Logging\DebugStack();
} }
public function tearDown() protected function tearDown()
{ {
unset($this->logger); unset($this->logger);
} }
......
...@@ -23,7 +23,7 @@ abstract class AbstractPlatformTestCase extends \Doctrine\Tests\DbalTestCase ...@@ -23,7 +23,7 @@ abstract class AbstractPlatformTestCase extends \Doctrine\Tests\DbalTestCase
abstract public function createPlatform(); abstract public function createPlatform();
public function setUp() protected function setUp()
{ {
$this->_platform = $this->createPlatform(); $this->_platform = $this->createPlatform();
} }
......
...@@ -12,7 +12,7 @@ class ReservedKeywordsValidatorTest extends \Doctrine\Tests\DbalTestCase ...@@ -12,7 +12,7 @@ class ReservedKeywordsValidatorTest extends \Doctrine\Tests\DbalTestCase
*/ */
private $validator; private $validator;
public function setUp() protected function setUp()
{ {
$this->validator = new ReservedKeywordsValidator(array( $this->validator = new ReservedKeywordsValidator(array(
new \Doctrine\DBAL\Platforms\Keywords\MySQLKeywords() new \Doctrine\DBAL\Platforms\Keywords\MySQLKeywords()
......
...@@ -11,7 +11,7 @@ class SQLAzurePlatformTest extends DbalTestCase ...@@ -11,7 +11,7 @@ class SQLAzurePlatformTest extends DbalTestCase
{ {
private $platform; private $platform;
public function setUp() protected function setUp()
{ {
$this->platform = new \Doctrine\DBAL\Platforms\SQLAzurePlatform(); $this->platform = new \Doctrine\DBAL\Platforms\SQLAzurePlatform();
} }
......
...@@ -25,7 +25,7 @@ class StatementTest extends \Doctrine\Tests\DbalTestCase ...@@ -25,7 +25,7 @@ class StatementTest extends \Doctrine\Tests\DbalTestCase
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function setUp() protected function setUp()
{ {
$this->wrappedStmt = $this->createWrappedStatement(); $this->wrappedStmt = $this->createWrappedStatement();
$this->conn = $this->createConnection(); $this->conn = $this->createConnection();
......
...@@ -12,7 +12,7 @@ class ExpressionBuilderTest extends \Doctrine\Tests\DbalTestCase ...@@ -12,7 +12,7 @@ class ExpressionBuilderTest extends \Doctrine\Tests\DbalTestCase
{ {
protected $expr; protected $expr;
public function setUp() protected function setUp()
{ {
$conn = $this->getMock('Doctrine\DBAL\Connection', array(), array(), '', false); $conn = $this->getMock('Doctrine\DBAL\Connection', array(), array(), '', false);
......
...@@ -12,7 +12,7 @@ class QueryBuilderTest extends \Doctrine\Tests\DbalTestCase ...@@ -12,7 +12,7 @@ class QueryBuilderTest extends \Doctrine\Tests\DbalTestCase
{ {
protected $conn; protected $conn;
public function setUp() protected function setUp()
{ {
$this->conn = $this->getMock('Doctrine\DBAL\Connection', array(), array(), '', false); $this->conn = $this->getMock('Doctrine\DBAL\Connection', array(), array(), '', false);
......
...@@ -14,7 +14,7 @@ class MySqlSchemaManagerTest extends \PHPUnit_Framework_TestCase ...@@ -14,7 +14,7 @@ class MySqlSchemaManagerTest extends \PHPUnit_Framework_TestCase
*/ */
private $manager; private $manager;
public function setUp() protected function setUp()
{ {
$eventManager = new EventManager(); $eventManager = new EventManager();
$driverMock = $this->getMock('Doctrine\DBAL\Driver'); $driverMock = $this->getMock('Doctrine\DBAL\Driver');
......
...@@ -16,7 +16,7 @@ class MySQLSchemaTest extends \PHPUnit_Framework_TestCase ...@@ -16,7 +16,7 @@ class MySQLSchemaTest extends \PHPUnit_Framework_TestCase
*/ */
private $platform; private $platform;
public function setUp() protected function setUp()
{ {
$this->comparator = new \Doctrine\DBAL\Schema\Comparator; $this->comparator = new \Doctrine\DBAL\Schema\Comparator;
$this->platform = new \Doctrine\DBAL\Platforms\MySqlPlatform; $this->platform = new \Doctrine\DBAL\Platforms\MySqlPlatform;
......
...@@ -28,7 +28,7 @@ class SingleDatabaseSynchronizerTest extends \PHPUnit_Framework_TestCase ...@@ -28,7 +28,7 @@ class SingleDatabaseSynchronizerTest extends \PHPUnit_Framework_TestCase
private $conn; private $conn;
private $synchronizer; private $synchronizer;
public function setUp() protected function setUp()
{ {
$this->conn = DriverManager::getConnection(array( $this->conn = DriverManager::getConnection(array(
'driver' => 'pdo_sqlite', 'driver' => 'pdo_sqlite',
......
...@@ -11,7 +11,7 @@ abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase ...@@ -11,7 +11,7 @@ abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
protected $conn; protected $conn;
protected $sm; protected $sm;
public function setUp() protected function setUp()
{ {
if (!isset($GLOBALS['db_type']) || strpos($GLOBALS['db_type'], "sqlsrv") === false) { if (!isset($GLOBALS['db_type']) || strpos($GLOBALS['db_type'], "sqlsrv") === false) {
$this->markTestSkipped('No driver or sqlserver driver specified.'); $this->markTestSkipped('No driver or sqlserver driver specified.');
......
...@@ -23,7 +23,7 @@ class StatementTest extends \Doctrine\Tests\DbalTestCase ...@@ -23,7 +23,7 @@ class StatementTest extends \Doctrine\Tests\DbalTestCase
*/ */
private $pdoStatement; private $pdoStatement;
public function setUp() protected function setUp()
{ {
$this->pdoStatement = $this->getMock('\PDOStatement', array('execute', 'bindParam', 'bindValue')); $this->pdoStatement = $this->getMock('\PDOStatement', array('execute', 'bindParam', 'bindValue'));
$platform = new \Doctrine\Tests\DBAL\Mocks\MockPlatform(); $platform = new \Doctrine\Tests\DBAL\Mocks\MockPlatform();
......
...@@ -17,7 +17,7 @@ class ArrayTest extends \Doctrine\Tests\DbalTestCase ...@@ -17,7 +17,7 @@ class ArrayTest extends \Doctrine\Tests\DbalTestCase
$this->_type = Type::getType('array'); $this->_type = Type::getType('array');
} }
public function tearDown() protected function tearDown()
{ {
error_reporting(-1); // reactive all error levels error_reporting(-1); // reactive all error levels
} }
......
...@@ -17,7 +17,7 @@ class ObjectTest extends \Doctrine\Tests\DbalTestCase ...@@ -17,7 +17,7 @@ class ObjectTest extends \Doctrine\Tests\DbalTestCase
$this->_type = Type::getType('object'); $this->_type = Type::getType('object');
} }
public function tearDown() protected function tearDown()
{ {
error_reporting(-1); // reactive all error levels error_reporting(-1); // reactive all error levels
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment