Commit c122953a authored by Steven Surowiec's avatar Steven Surowiec

Changed privates to protected and updated setUp to use late static binding....

Changed privates to protected and updated setUp to use late static binding. This allows projects using Doctrine2 to use its test cases for testing their own entities.
parent 3a8d6360
...@@ -15,7 +15,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase ...@@ -15,7 +15,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
private static $_queryCacheImpl = null; private static $_queryCacheImpl = null;
/* Shared connection when a TestCase is run alone (outside of it's functional suite) */ /* Shared connection when a TestCase is run alone (outside of it's functional suite) */
private static $_sharedConn; protected static $_sharedConn;
/** /**
* @var \Doctrine\ORM\EntityManager * @var \Doctrine\ORM\EntityManager
...@@ -33,13 +33,13 @@ abstract class OrmFunctionalTestCase extends OrmTestCase ...@@ -33,13 +33,13 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
protected $_sqlLoggerStack; protected $_sqlLoggerStack;
/** The names of the model sets used in this testcase. */ /** The names of the model sets used in this testcase. */
private $_usedModelSets = array(); protected $_usedModelSets = array();
/** Whether the database schema has already been created. */ /** Whether the database schema has already been created. */
private static $_tablesCreated = array(); protected static $_tablesCreated = array();
/** List of model sets and their classes. */ /** List of model sets and their classes. */
private static $_modelSets = array( protected static $_modelSets = array(
'cms' => array( 'cms' => array(
'Doctrine\Tests\Models\CMS\CmsUser', 'Doctrine\Tests\Models\CMS\CmsUser',
'Doctrine\Tests\Models\CMS\CmsPhonenumber', 'Doctrine\Tests\Models\CMS\CmsPhonenumber',
...@@ -170,11 +170,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase ...@@ -170,11 +170,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
$forceCreateTables = false; $forceCreateTables = false;
if ( ! isset($this->sharedFixture['conn'])) { if ( ! isset($this->sharedFixture['conn'])) {
if ( ! isset(self::$_sharedConn)) { if ( ! isset(static::$_sharedConn)) {
self::$_sharedConn = TestUtil::getConnection(); static::$_sharedConn = TestUtil::getConnection();
} }
$this->sharedFixture['conn'] = self::$_sharedConn; $this->sharedFixture['conn'] = static::$_sharedConn;
if ($this->sharedFixture['conn']->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) { if ($this->sharedFixture['conn']->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
$forceCreateTables = true; $forceCreateTables = true;
...@@ -189,12 +189,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase ...@@ -189,12 +189,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
$classes = array(); $classes = array();
foreach ($this->_usedModelSets as $setName => $bool) { foreach ($this->_usedModelSets as $setName => $bool) {
if ( ! isset(self::$_tablesCreated[$setName])/* || $forceCreateTables*/) { if ( ! isset(static::$_tablesCreated[$setName])/* || $forceCreateTables*/) {
foreach (self::$_modelSets[$setName] as $className) { foreach (static::$_modelSets[$setName] as $className) {
$classes[] = $this->_em->getClassMetadata($className); $classes[] = $this->_em->getClassMetadata($className);
} }
self::$_tablesCreated[$setName] = true; static::$_tablesCreated[$setName] = true;
} }
} }
......
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