RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 22:23:14 +03:00
Code Issues Projects Releases Wiki Activity

moved configuration

Browse Source
This commit is contained in:
romanb 2008-09-12 10:58:33 +00:00
parent b6642e2dce
commit aea6a947c8
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/Configuration.php → lib/Doctrine/Common/Configuration.php
View File

@ -33,7 +33,7 @@
* @author Roman Borschel <roman@code-factory.org>
* @since 2.0
*/
class Doctrine_Configuration
class Doctrine_Common_Configuration
{
private $_nullObject;

2
lib/Doctrine/Connection.php
View File

@ -172,7 +172,7 @@ class Doctrine_Connection
// Create default config and event manager if none given
if ( ! $config) {
$this->_config = new Doctrine_Configuration();
$this->_config = new Doctrine_Common_Configuration();
}
if ( ! $eventManager) {
$this->_eventManager = new Doctrine_Common_EventManager();

4
lib/Doctrine/ConnectionFactory.php
View File

@ -58,12 +58,12 @@ class Doctrine_ConnectionFactory
* @param array $params
* @return Connection
*/
public function createConnection(array $params, Doctrine_Configuration $config = null,
public function createConnection(array $params, Doctrine_Common_Configuration $config = null,
Doctrine_Common_EventManager $eventManager = null)
{
// create default config and event manager, if not set
if ( ! $config) {
$config = new Doctrine_Configuration();
$config = new Doctrine_Common_Configuration();
}
if ( ! $eventManager) {
$eventManager = new Doctrine_Common_EventManager();

2
lib/Doctrine/EntityManager.php
View File

@ -148,7 +148,7 @@ class Doctrine_EntityManager
* @param Doctrine_Connection $conn
* @param string $name
*/
protected function __construct(Doctrine_Connection $conn, $name, Doctrine_Configuration $config,
protected function __construct(Doctrine_Connection $conn, $name, Doctrine_Common_Configuration $config,
Doctrine_Common_EventManager $eventManager)
{
$this->_conn = $conn;

2
tests/lib/Doctrine_OrmTestSuite.php
View File

@ -10,7 +10,7 @@ class Doctrine_OrmTestSuite extends Doctrine_TestSuite
{
protected function setUp()
{
$config = new Doctrine_Configuration();
$config = new Doctrine_Common_Configuration();
$eventManager = new Doctrine_Common_EventManager();
$connectionOptions = array(
'driverClass' => 'Doctrine_ConnectionMock',

4
tests/lib/mocks/Doctrine_EntityManagerMock.php
View File

@ -33,11 +33,11 @@ class Doctrine_EntityManagerMock extends Doctrine_EntityManager
* @param Doctrine_EventManager $eventManager
* @return unknown
*/
public static function create($conn, $name, Doctrine_Configuration $config = null,
public static function create($conn, $name, Doctrine_Common_Configuration $config = null,
Doctrine_Common_EventManager $eventManager = null)
{
if (is_null($config)) {
$config = new Doctrine_Configuration();
$config = new Doctrine_Common_Configuration();
}
if (is_null($eventManager)) {
$eventManager = new Doctrine_Common_EventManager();