From 0300683bfc30d5bd5e8ab2a052ac76fe320f0ea6 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sat, 10 Jan 2015 22:08:42 +0100
Subject: [PATCH] improved db test, avoid error by accessing db directlry
always use getConnection()
---
tests/unit/framework/db/DatabaseTestCase.php | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/unit/framework/db/DatabaseTestCase.php b/tests/unit/framework/db/DatabaseTestCase.php
index 64675fa..1449f68 100644
--- a/tests/unit/framework/db/DatabaseTestCase.php
+++ b/tests/unit/framework/db/DatabaseTestCase.php
@@ -11,7 +11,7 @@ abstract class DatabaseTestCase extends TestCase
/**
* @var Connection
*/
- protected $db;
+ private $_db;
protected function setUp()
{
@@ -28,8 +28,8 @@ abstract class DatabaseTestCase extends TestCase
protected function tearDown()
{
- if ($this->db) {
- $this->db->close();
+ if ($this->_db) {
+ $this->_db->close();
}
$this->destroyApplication();
}
@@ -41,8 +41,8 @@ abstract class DatabaseTestCase extends TestCase
*/
public function getConnection($reset = true, $open = true)
{
- if (!$reset && $this->db) {
- return $this->db;
+ if (!$reset && $this->_db) {
+ return $this->_db;
}
$config = $this->database;
if (isset($config['fixture'])) {
@@ -52,11 +52,11 @@ abstract class DatabaseTestCase extends TestCase
$fixture = null;
}
try {
- $this->db = $this->prepareDatabase($config, $fixture, $open);
+ $this->_db = $this->prepareDatabase($config, $fixture, $open);
} catch (\Exception $e) {
$this->markTestSkipped("Something wrong when preparing database: " . $e->getMessage());
}
- return $this->db;
+ return $this->_db;
}
public function prepareDatabase($config, $fixture, $open = true)
--
libgit2 0.27.1